Merge branch 'genesys-debug-cleanup' into 'master'

genesys: Use the same debug identifier for the whole backend

See merge request sane-project/backends!67

backend/genesys.c

@@ -58,8 +58,7 @@
  * SANE backend for Genesys Logic GL646/GL841/GL842/GL843/GL846/GL847/GL124 based scanners
  */
 
-#define BUILD 2511
+#define DEBUG_NOT_STATIC
-#define BACKEND_NAME genesys
 
 #include "genesys.h"
 #include "../include/sane/sanei_config.h"
@@ -6450,8 +6449,8 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   SANE_Status status;
 
   DBG_INIT ();
-  DBG(DBG_init, "SANE Genesys backend version %d.%d build %d from %s\n",
+  DBG(DBG_init, "SANE Genesys backend version %d.%d from %s\n",
-      SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
+      SANE_CURRENT_MAJOR, V_MINOR, PACKAGE_STRING);
 #ifdef HAVE_LIBUSB
   DBG(DBG_init, "SANE Genesys backend built with libusb-1.0\n");
 #endif
@@ -6460,7 +6459,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
 #endif
 
   if (version_code)
-    *version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BUILD);
+    *version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, 0);
 
   DBG(DBG_proc, "%s: authorize %s null\n", __func__, authorize ? "!=" : "==");
 

backend/genesys.h

@@ -47,6 +47,10 @@
 #ifndef GENESYS_H
 #define GENESYS_H
 
+#ifndef BACKEND_NAME
+# define BACKEND_NAME genesys
+#endif
+
 #include "genesys_low.h"
 
 #ifndef PATH_MAX

backend/genesys_gl124.c

@@ -42,8 +42,7 @@
    If you do not wish that, delete this exception notice.
 */
 
-#undef BACKEND_NAME
+#define DEBUG_DECLARE_ONLY
-#define BACKEND_NAME genesys_gl124
 
 #include "genesys_gl124.h"
 

backend/genesys_gl646.c

@@ -48,8 +48,7 @@
    If you do not wish that, delete this exception notice.
 */
 
-#undef BACKEND_NAME
+#define DEBUG_DECLARE_ONLY
-#define BACKEND_NAME genesys_gl646
 
 #include "genesys_gl646.h"
 

backend/genesys_gl841.c

@@ -50,8 +50,7 @@
    If you do not wish that, delete this exception notice.
 */
 
-#undef BACKEND_NAME
+#define DEBUG_DECLARE_ONLY
-#define BACKEND_NAME genesys_gl841
 
 #include "genesys_gl841.h"
 

backend/genesys_gl843.c

@@ -42,8 +42,7 @@
    If you do not wish that, delete this exception notice.
 */
 
-#undef BACKEND_NAME
+#define DEBUG_DECLARE_ONLY
-#define BACKEND_NAME genesys_gl843
 
 #include "genesys_gl843.h"
 

backend/genesys_gl843.h

@@ -43,9 +43,6 @@
 
 #include "genesys.h"
 
-#define DBGSTART DBG (DBG_proc, "%s start\n", __func__);
-#define DBGCOMPLETED DBG (DBG_proc, "%s completed\n", __func__);
-
 #define REG01           0x01
 #define REG01_CISSET	0x80
 #define REG01_DOGENB	0x40

backend/genesys_gl846.c

@@ -46,8 +46,8 @@
  *
  * This file handles GL846 and GL845 ASICs since they are really close to each other.
  */
-#undef BACKEND_NAME
+
-#define BACKEND_NAME genesys_gl846
+#define DEBUG_DECLARE_ONLY
 
 #include "genesys_gl846.h"
 

backend/genesys_gl847.c

@@ -42,8 +42,7 @@
    If you do not wish that, delete this exception notice.
 */
 
-#undef BACKEND_NAME
+#define DEBUG_DECLARE_ONLY
-#define BACKEND_NAME genesys_gl847
 
 #include "genesys_gl847.h"
 

backend/genesys_low.c

@@ -41,8 +41,8 @@
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.
 */
-#undef BACKEND_NAME
+
-#define BACKEND_NAME genesys_low
+#define DEBUG_DECLARE_ONLY
 
 #include "genesys_low.h"
 #include "assert.h"