Bunch more changes

RReverser · Jan 30, 2024 · be435df · be435df
1 parent 3ce7148
commit be435df
Show file tree

Hide file tree

Showing 174 changed files with 85 additions and 297 deletions.
diff --git a/camlibs/Makefile.am b/camlibs/Makefile.am
@@ -66,9 +66,7 @@ camlib_ldflags += -no-undefined
 camlib_ldflags += -avoid-version
 camlib_ldflags += -export-dynamic
 
-EXTRA_DIST          += camlib.sym
-camlib_dependencies += $(top_srcdir)/camlibs/camlib.sym
-camlib_ldflags      += -export-symbols '$(top_srcdir)/camlibs/camlib.sym'
+camlib_ldflags      += -export-symbols-regex _LTX_camera_
 
 camlib_ldflags += -rpath '$(camlibdir)'
 
@@ -79,9 +77,6 @@ camlib_libadd += $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port
 camlib_cflags  =
 
 camlib_cppflags = $(AM_CPPFLAGS)
-camlib_cppflags += -Dcamera_abilities=$(@D)_LTX_camera_abilities
-camlib_cppflags += -Dcamera_id=$(@D)_LTX_camera_id
-camlib_cppflags += -Dcamera_init=$(@D)_LTX_camera_init
 camlib_cppflags += -I$(top_srcdir)
 camlib_cppflags += -I$(top_builddir)
 camlib_cppflags += -I$(top_srcdir)/libgphoto2_port

diff --git a/camlibs/adc65/Makefile-files b/camlibs/adc65/Makefile-files
@@ -13,7 +13,7 @@ EXTRA_LTLIBRARIES     += adc65.la
 adc65_la_SOURCES       = %reldir%/adc65.c
 
 adc65_la_CFLAGS        = $(camlib_cflags)
-adc65_la_CPPFLAGS      = $(camlib_cppflags)
+adc65_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=adc65
 adc65_la_DEPENDENCIES  = $(camlib_dependencies)
 adc65_la_LDFLAGS       = $(camlib_ldflags)
 adc65_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/adc65/adc65.c b/camlibs/adc65/adc65.c
@@ -28,8 +28,6 @@
 #  define N_(String) (String)
 #endif
 
-#define GP_MODULE "adc65"
-
 #define ACK		0x15
 
 #define ADC65_DATA_FIRMWARE	0

diff --git a/camlibs/agfa-cl20/Makefile-files b/camlibs/agfa-cl20/Makefile-files
@@ -18,7 +18,7 @@ EXTRA_LTLIBRARIES         += agfa_cl20.la
 agfa_cl20_la_SOURCES       = %reldir%/agfa_cl20.c
 
 agfa_cl20_la_CFLAGS        = $(camlib_cflags)
-agfa_cl20_la_CPPFLAGS      = $(camlib_cppflags)
+agfa_cl20_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=agfa_cl20
 agfa_cl20_la_DEPENDENCIES  = $(camlib_dependencies)
 agfa_cl20_la_LDFLAGS       = $(camlib_ldflags)
 agfa_cl20_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/aox/Makefile-files b/camlibs/aox/Makefile-files
@@ -14,7 +14,7 @@ aox_la_SOURCES      += %reldir%/aox.c
 aox_la_SOURCES      += %reldir%/aox.h
 
 aox_la_CFLAGS        = $(camlib_cflags)
-aox_la_CPPFLAGS      = $(camlib_cppflags)
+aox_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=aox
 aox_la_DEPENDENCIES  = $(camlib_dependencies)
 aox_la_LDFLAGS       = $(camlib_ldflags)
 aox_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/aox/aox.c b/camlibs/aox/aox.c
@@ -30,8 +30,6 @@
 
 #include "aox.h"
 
-#define GP_MODULE "aox"
-
 #define WRITE gp_port_usb_msg_write
 #define READ  gp_port_usb_msg_read
 

diff --git a/camlibs/aox/library.c b/camlibs/aox/library.c
@@ -48,8 +48,6 @@
 #include "aox.h"
 #include <gphoto2/gphoto2-port.h>
 
-#define GP_MODULE "aox"
-
 struct _CameraPrivateLibrary {
 	Model model;
 	Info info[2];

diff --git a/camlibs/ax203/Makefile-files b/camlibs/ax203/Makefile-files
@@ -24,7 +24,7 @@ ax203_la_SOURCES      += %reldir%/tinyjpeg-internal.h
 ax203_la_SOURCES      += %reldir%/jidctflt.c
 
 ax203_la_CFLAGS        = $(camlib_cflags)
-ax203_la_CPPFLAGS      = $(camlib_cppflags)
+ax203_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=ax203
 ax203_la_DEPENDENCIES  = $(camlib_dependencies)
 ax203_la_LDFLAGS       = $(camlib_ldflags)
 ax203_la_LIBADD        = $(camlib_libadd)

diff --git a/camlibs/ax203/ax203.h b/camlibs/ax203/ax203.h
@@ -30,8 +30,6 @@
 
 #include "tinyjpeg.h"
 
-#define GP_MODULE "ax203"
-
 #define AX203_ABFS_MAGIC		"ABFS"
 #define AX203_ABFS_COUNT_OFFSET		0x05
 #define AX203_ABFS_FILE_OFFSET(idx)     (0x20 + 2 * (idx))

diff --git a/camlibs/barbie/Makefile-files b/camlibs/barbie/Makefile-files
@@ -9,7 +9,7 @@ EXTRA_LTLIBRARIES      += barbie.la
 barbie_la_SOURCES       = %reldir%/barbie.c
 
 barbie_la_CFLAGS        = $(camlib_cflags)
-barbie_la_CPPFLAGS      = $(camlib_cppflags)
+barbie_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=barbie
 barbie_la_DEPENDENCIES  = $(camlib_dependencies)
 barbie_la_LDFLAGS       = $(camlib_ldflags)
 barbie_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c
@@ -50,8 +50,6 @@
 #define BARBIE_DATA_THUMBNAIL	1
 #define BARBIE_DATA_PICTURE	2
 
-#define GP_MODULE "barbie"
-
 /* Some simple packet templates */
 static const char packet_1[4]                = {0x02, 0x01, 0x01, 0x03};
 

diff --git a/camlibs/camlib.sym b/camlibs/camlib.sym
diff --git a/camlibs/canon/Makefile-files b/camlibs/canon/Makefile-files
@@ -39,7 +39,7 @@ canon_la_SOURCES      += %reldir%/util.c
 canon_la_SOURCES      += %reldir%/util.h
 
 canon_la_CFLAGS        = $(camlib_cflags)
-canon_la_CPPFLAGS      = $(camlib_cppflags)
+canon_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=canon
 canon_la_DEPENDENCIES  = $(camlib_dependencies)
 canon_la_LDFLAGS       = $(camlib_ldflags)
 canon_la_LIBADD        = $(camlib_libadd)

diff --git a/camlibs/canon/canon.h b/camlibs/canon/canon.h
@@ -736,8 +736,6 @@ const char *canon_int_filename2audioname (Camera *camera, const char *filename);
 int canon_int_extract_jpeg_thumb (unsigned char *data, const unsigned int datalen, unsigned char **retdata, unsigned int *retdatalen, GPContext *context);
 
 /* for the macros abbreviating gp_log* */
-#define GP_MODULE "canon"
-
 #endif /* !defined(CAMLIBS_CANON_CANON_H) */
 
 /*

diff --git a/camlibs/canon/library.h b/camlibs/canon/library.h
@@ -27,8 +27,6 @@
 
 void clear_readiness(Camera *camera);
 
-#define GP_MODULE "canon"
-
 #endif /* !defined(CAMLIBS_CANON_LIBRARY_H) */
 
 /****************************************************************************

diff --git a/camlibs/casio/Makefile-files b/camlibs/casio/Makefile-files
@@ -18,7 +18,7 @@ casio_qv_la_SOURCES      += %reldir%/ycctoppm.c
 casio_qv_la_SOURCES      += %reldir%/ycctoppm.h
 
 casio_qv_la_CFLAGS        = $(camlib_cflags)
-casio_qv_la_CPPFLAGS      = $(camlib_cppflags)
+casio_qv_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=casio_qv
 casio_qv_la_DEPENDENCIES  = $(camlib_dependencies)
 casio_qv_la_LDFLAGS       = $(camlib_ldflags)
 casio_qv_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/clicksmart310/Makefile-files b/camlibs/clicksmart310/Makefile-files
@@ -13,7 +13,7 @@ clicksmart310_la_SOURCES      += %reldir%/clicksmart.h
 clicksmart310_la_SOURCES      += %reldir%/spca50x-jpeg-header.h
 
 clicksmart310_la_CFLAGS        = $(camlib_cflags)
-clicksmart310_la_CPPFLAGS      = $(camlib_cppflags)
+clicksmart310_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=clicksmart310
 clicksmart310_la_DEPENDENCIES  = $(camlib_dependencies)
 clicksmart310_la_LDFLAGS       = $(camlib_ldflags)
 clicksmart310_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/clicksmart310/clicksmart.c b/camlibs/clicksmart310/clicksmart.c
@@ -34,8 +34,6 @@
 #include "clicksmart.h"
 #include "spca50x-jpeg-header.h"
 
-#define GP_MODULE "clicksmart310"
-
 #define CS_INIT 	0x8000
 #define CS_INIT2 	0xd41
 #define CS_NUM_PICS 	0xd40

diff --git a/camlibs/clicksmart310/library.c b/camlibs/clicksmart310/library.c
@@ -45,8 +45,6 @@
 #endif
 
 #include "clicksmart.h"
-#define GP_MODULE "clicksmart310"
-
 static const struct {
    	char *name;
 	CameraDriverStatus status;

diff --git a/camlibs/digigr8/Makefile-files b/camlibs/digigr8/Makefile-files
@@ -27,7 +27,7 @@ digigr8_la_SOURCES      += %reldir%/digigr8.h
 digigr8_la_SOURCES      += %reldir%/digi_postprocess.c
 
 digigr8_la_CFLAGS        = $(camlib_cflags)
-digigr8_la_CPPFLAGS      = $(camlib_cppflags)
+digigr8_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=digigr8
 digigr8_la_DEPENDENCIES  = $(camlib_dependencies)
 digigr8_la_LDFLAGS       = $(camlib_ldflags)
 digigr8_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/digigr8/digi_postprocess.c b/camlibs/digigr8/digi_postprocess.c
@@ -29,8 +29,6 @@
 #include <libgphoto2/gamma.h>
 #include "digigr8.h"
 
-#define GP_MODULE "digigr8"
-
 #ifndef MAX
 # define MAX(a, b) ((a) > (b) ? (a) : (b))
 #endif

diff --git a/camlibs/digigr8/digigr8.c b/camlibs/digigr8/digigr8.c
@@ -29,8 +29,6 @@
 #include <gphoto2/gphoto2-port.h>
 #include "digigr8.h"
 
-#define GP_MODULE "digigr8"
-
 #define SQWRITE gp_port_usb_msg_write
 #define SQREAD  gp_port_usb_msg_read
 

diff --git a/camlibs/digigr8/library.c b/camlibs/digigr8/library.c
@@ -50,8 +50,6 @@
 
 #include <gphoto2/gphoto2-port.h>
 
-#define GP_MODULE "digigr8"
-
 static const struct {
 	char *name;
 	CameraDriverStatus status;

diff --git a/camlibs/digita/Makefile-files b/camlibs/digita/Makefile-files
@@ -13,7 +13,7 @@ digita_la_SOURCES      += %reldir%/commands.c
 digita_la_SOURCES      += %reldir%/digita.h
 
 digita_la_CFLAGS        = $(camlib_cflags)
-digita_la_CPPFLAGS      = $(camlib_cppflags)
+digita_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=digita
 digita_la_DEPENDENCIES  = $(camlib_dependencies)
 digita_la_LDFLAGS       = $(camlib_ldflags)
 digita_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/digita/commands.c b/camlibs/digita/commands.c
@@ -32,8 +32,6 @@
 #include "digita.h"
 #include "libgphoto2/gphoto2-endian.h"
 
-#define GP_MODULE "digita"
-
 #include <gphoto2/gphoto2-port.h>
 
 static void build_command(struct digita_command *cmd, int length, short command)
@@ -217,4 +215,3 @@ int digita_delete_picture(CameraPrivateLibrary *dev, struct filename *filename)
 
 	return 0;
 }
-
diff --git a/camlibs/digita/digita.c b/camlibs/digita/digita.c
@@ -32,8 +32,6 @@
 #include <limits.h>
 #endif
 
-#define GP_MODULE "digita"
-
 #include <gphoto2/gphoto2.h>
 #include <gphoto2/gphoto2-port.h>
 
@@ -473,4 +471,3 @@ int camera_init(Camera *camera, GPContext *context)
 
 	return GP_OK;
 }
-
diff --git a/camlibs/digita/serial.c b/camlibs/digita/serial.c
@@ -34,8 +34,6 @@
 #include "libgphoto2/gphoto2-endian.h"
 #include "digita.h"
 
-#define GP_MODULE "digita"
-
 #include <gphoto2/gphoto2-port.h>
 
 #define MAX_BEACON_RETRIES	5

diff --git a/camlibs/dimera/Makefile-files b/camlibs/dimera/Makefile-files
@@ -15,7 +15,7 @@ dimera3500_la_SOURCES      += %reldir%/mesalib.h
 dimera3500_la_SOURCES      += %reldir%/dimeratab.h
 
 dimera3500_la_CFLAGS        = $(camlib_cflags)
-dimera3500_la_CPPFLAGS      = $(camlib_cppflags)
+dimera3500_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=dimera3500
 dimera3500_la_DEPENDENCIES  = $(camlib_dependencies)
 dimera3500_la_LDFLAGS       = $(camlib_ldflags)
 dimera3500_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c
@@ -36,8 +36,6 @@
 #include "libgphoto2/i18n.h"
 
 
-#define GP_MODULE "dimera"
-
 #ifndef MAX
 # define MAX(a, b) ((a) > (b) ? (a) : (b))
 #endif

diff --git a/camlibs/dimera/mesalib.c b/camlibs/dimera/mesalib.c
@@ -31,7 +31,6 @@
 #include <gphoto2/gphoto2.h>
 #include "libgphoto2/gphoto2-endian.h"
 
-#define GP_MODULE "dimera"
 #define debuglog(e) GP_DEBUG( "%s", (e))
 
 #ifdef CONVERT_PIXELS

diff --git a/camlibs/directory/Makefile-files b/camlibs/directory/Makefile-files
@@ -8,7 +8,7 @@ EXTRA_LTLIBRARIES         += directory.la
 directory_la_SOURCES       = %reldir%/directory.c
 
 directory_la_CFLAGS        = $(camlib_cflags)
-directory_la_CPPFLAGS      = $(camlib_cppflags)
+directory_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=directory
 directory_la_DEPENDENCIES  = $(camlib_dependencies)
 directory_la_LDFLAGS       = $(camlib_ldflags)
 directory_la_LIBADD        = $(camlib_libadd)

diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c
@@ -119,8 +119,6 @@ static const struct {
 /* #define DEBUG */
 /* #define FOLLOW_LINKS */
 
-#define GP_MODULE "directory"
-
 static const char *
 get_mime_type (const char *filename)
 {

diff --git a/camlibs/docupen/Makefile-files b/camlibs/docupen/Makefile-files
@@ -18,7 +18,7 @@ docupen_la_SOURCES      += %reldir%/huffman.h
 docupen_la_SOURCES      += %reldir%/image.c
 
 docupen_la_CFLAGS        = $(camlib_cflags)
-docupen_la_CPPFLAGS      = $(camlib_cppflags)
+docupen_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=docupen
 docupen_la_DEPENDENCIES  = $(camlib_dependencies)
 docupen_la_LDFLAGS       = $(camlib_ldflags)
 docupen_la_LIBADD        = $(camlib_libadd)

diff --git a/camlibs/enigma13/Makefile-files b/camlibs/enigma13/Makefile-files
@@ -14,7 +14,7 @@ EXTRA_LTLIBRARIES        += enigma13.la
 enigma13_la_SOURCES       = %reldir%/enigma13.c
 
 enigma13_la_CFLAGS        = $(camlib_cflags)
-enigma13_la_CPPFLAGS      = $(camlib_cppflags)
+enigma13_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=enigma13
 enigma13_la_DEPENDENCIES  = $(camlib_dependencies)
 enigma13_la_LDFLAGS       = $(camlib_ldflags)
 enigma13_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/enigma13/enigma13.c b/camlibs/enigma13/enigma13.c
@@ -46,8 +46,6 @@
 #define ENIGMA13_WAIT_FOR_READY_TIMEOUT_S 5
 #define ENIGMA13_WAIT_TOC_DELAY_MS 500
 #define ENIGMA13_WAIT_IMAGE_READY_MS 300
-#define GP_MODULE "enigma13"
-
 
 #define CHECK(result) {int res; res = result; if (res < 0) return (res);}
 #define CHECK_AND_FREE(result, buf) {int res; res = result; if (res < 0) { free(buf); return (res); }}

diff --git a/camlibs/fuji/Makefile-files b/camlibs/fuji/Makefile-files
@@ -12,7 +12,7 @@ fuji_la_SOURCES      += %reldir%/fuji.c
 fuji_la_SOURCES      += %reldir%/fuji.h
 
 fuji_la_CFLAGS        = $(camlib_cflags)
-fuji_la_CPPFLAGS      = $(camlib_cppflags)
+fuji_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=fuji
 fuji_la_DEPENDENCIES  = $(camlib_dependencies)
 fuji_la_LDFLAGS       = $(camlib_ldflags)
 fuji_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/fuji/fuji.c b/camlibs/fuji/fuji.c
@@ -60,8 +60,6 @@
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
 #endif
 
-#define GP_MODULE "fuji"
-
 #define CR(result)    {int __r = (result); if (__r < 0) return (__r);}
 #define CRF(result,d) {int __r = (result); if (__r < 0) {free (d); return (__r);}}
 #define CLEN(buf_len,required)					\

diff --git a/camlibs/fuji/library.c b/camlibs/fuji/library.c
@@ -36,8 +36,6 @@
 #include "fuji.h"
 
 
-#define GP_MODULE "fuji"
-
 #define CR(result) {int __r = (result); if (__r < 0) return (__r);}
 
 static const struct {

diff --git a/camlibs/gsmart300/Makefile-files b/camlibs/gsmart300/Makefile-files
@@ -15,7 +15,7 @@ gsmart300_la_SOURCES      += %reldir%/library.c
 gsmart300_la_SOURCES      += %reldir%/gsmart300-jpeg-header.h
 
 gsmart300_la_CFLAGS        = $(camlib_cflags)
-gsmart300_la_CPPFLAGS      = $(camlib_cppflags)
+gsmart300_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=gsmart300
 gsmart300_la_DEPENDENCIES  = $(camlib_dependencies)
 gsmart300_la_LDFLAGS       = $(camlib_ldflags)
 gsmart300_la_LIBADD        = $(camlib_libadd)
diff --git a/camlibs/gsmart300/gsmart300.c b/camlibs/gsmart300/gsmart300.c
@@ -61,7 +61,6 @@
 #define sleep(x)
 #endif
 
-#define GP_MODULE "gsmart300"
 static int gsmart300_download_data (CameraPrivateLibrary * lib,
 		int data_type, uint16_t index, unsigned int size,
 		uint8_t * buf);

diff --git a/camlibs/gsmart300/library.c b/camlibs/gsmart300/library.c
@@ -51,7 +51,6 @@
 
 #include "gsmart300.h"
 
-#define GP_MODULE "gsmart300"
 #define TIMEOUT	      5000
 
 

diff --git a/camlibs/hp215/Makefile-files b/camlibs/hp215/Makefile-files
@@ -12,7 +12,7 @@ hp215_la_SOURCES      += %reldir%/hp215.h
 hp215_la_SOURCES      += %reldir%/crctab.h
 
 hp215_la_CFLAGS        = $(camlib_cflags)
-hp215_la_CPPFLAGS      = $(camlib_cppflags)
+hp215_la_CPPFLAGS      = $(camlib_cppflags) -DLIBNAME=hp215
 hp215_la_DEPENDENCIES  = $(camlib_dependencies)
 hp215_la_LDFLAGS       = $(camlib_ldflags)
 hp215_la_LIBADD        = $(camlib_libadd)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,7 +51,6 @@

		#include "gsmart300.h"

		#define GP_MODULE "gsmart300"
		#define TIMEOUT 5000


Expand Down