From 11ff6cfaa69c2ee1f01ad1001920f7f4e9080a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Voltz?= Date: Thu, 3 Nov 2011 22:47:10 +0100 Subject: [PATCH] includes cleanup - remove uneeded includes from genesys.c - move backend name define to C file for unit testing --- backend/genesys.c | 27 +++------------------------ backend/genesys_gl124.c | 3 +++ backend/genesys_gl124.h | 3 --- backend/genesys_gl646.c | 3 +++ backend/genesys_gl646.h | 3 --- backend/genesys_gl841.c | 5 ++++- backend/genesys_gl841.h | 3 --- backend/genesys_gl843.c | 3 +++ backend/genesys_gl843.h | 3 --- backend/genesys_gl847.c | 3 +++ backend/genesys_gl847.h | 3 --- backend/genesys_low.h | 4 ++++ 12 files changed, 23 insertions(+), 40 deletions(-) diff --git a/backend/genesys.c b/backend/genesys.c index aeee8066a..9ee0cfd2c 100644 --- a/backend/genesys.c +++ b/backend/genesys.c @@ -58,33 +58,12 @@ * SANE backend for Genesys Logic GL646/GL841/GL842/GL843/GL847/GL124 based scanners */ -#include "../include/sane/config.h" - -#define BUILD 64 - -#include -#include -#include -#include -#include -#ifdef HAVE_MKDIR -#include -#include -#endif - -#include "../include/sane/sane.h" -#include "../include/sane/sanei.h" -#include "../include/sane/saneopts.h" - +#define BUILD 65 #define BACKEND_NAME genesys -#include "../include/sane/sanei_backend.h" -#include "../include/sane/sanei_usb.h" -#include "../include/sane/sanei_config.h" -#include "../include/_stdint.h" -#include "../include/sane/sanei_magic.h" - #include "genesys.h" +#include "../include/sane/sanei_config.h" +#include "../include/sane/sanei_magic.h" #include "genesys_devices.c" static SANE_Int num_devices = 0; diff --git a/backend/genesys_gl124.c b/backend/genesys_gl124.c index a4ee4c3b1..c1936c133 100644 --- a/backend/genesys_gl124.c +++ b/backend/genesys_gl124.c @@ -42,6 +42,9 @@ If you do not wish that, delete this exception notice. */ +#undef BACKEND_NAME +#define BACKEND_NAME genesys_gl124 + #include "genesys_gl124.h" /**************************************************************************** diff --git a/backend/genesys_gl124.h b/backend/genesys_gl124.h index 526765157..e16a59ec1 100644 --- a/backend/genesys_gl124.h +++ b/backend/genesys_gl124.h @@ -41,9 +41,6 @@ If you do not wish that, delete this exception notice. */ -#undef BACKEND_NAME -#define BACKEND_NAME genesys_gl124 - #include "genesys.h" #define REG01 0x01 diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c index 8c373aba4..4e9edf5e8 100644 --- a/backend/genesys_gl646.c +++ b/backend/genesys_gl646.c @@ -48,6 +48,9 @@ If you do not wish that, delete this exception notice. */ +#undef BACKEND_NAME +#define BACKEND_NAME genesys_gl646 + #include "genesys_gl646.h" /** diff --git a/backend/genesys_gl646.h b/backend/genesys_gl646.h index c1745e577..77178a42a 100644 --- a/backend/genesys_gl646.h +++ b/backend/genesys_gl646.h @@ -44,9 +44,6 @@ If you do not wish that, delete this exception notice. */ -#undef BACKEND_NAME -#define BACKEND_NAME genesys_gl646 - #include "genesys.h" /* diff --git a/backend/genesys_gl841.c b/backend/genesys_gl841.c index c06cea2c8..6d93c90cf 100644 --- a/backend/genesys_gl841.c +++ b/backend/genesys_gl841.c @@ -3,7 +3,7 @@ Copyright (C) 2003 Oliver Rauch Copyright (C) 2003, 2004 Henning Meier-Geinitz Copyright (C) 2004 Gerhard Jaeger - Copyright (C) 2004-2010 Stephane Voltz + Copyright (C) 2004-2011 Stéphane Voltz Copyright (C) 2005 Philipp Schmid Copyright (C) 2005-2009 Pierre Willenbrock Copyright (C) 2006 Laurent Charpentier @@ -50,6 +50,9 @@ If you do not wish that, delete this exception notice. */ +#undef BACKEND_NAME +#define BACKEND_NAME genesys_gl841 + #include "genesys_gl841.h" /**************************************************************************** diff --git a/backend/genesys_gl841.h b/backend/genesys_gl841.h index 25b8c1aa6..5a766f405 100644 --- a/backend/genesys_gl841.h +++ b/backend/genesys_gl841.h @@ -41,9 +41,6 @@ If you do not wish that, delete this exception notice. */ -#undef BACKEND_NAME -#define BACKEND_NAME genesys_gl841 - #include "genesys.h" /* Individual bits */ diff --git a/backend/genesys_gl843.c b/backend/genesys_gl843.c index 7b8062bb4..0d6ac8a4f 100644 --- a/backend/genesys_gl843.c +++ b/backend/genesys_gl843.c @@ -42,6 +42,9 @@ If you do not wish that, delete this exception notice. */ +#undef BACKEND_NAME +#define BACKEND_NAME genesys_gl843 + #include "genesys_gl843.h" /**************************************************************************** diff --git a/backend/genesys_gl843.h b/backend/genesys_gl843.h index 5d4e71196..7264b8717 100644 --- a/backend/genesys_gl843.h +++ b/backend/genesys_gl843.h @@ -41,9 +41,6 @@ If you do not wish that, delete this exception notice. */ -#undef BACKEND_NAME -#define BACKEND_NAME genesys_gl843 - #include "genesys.h" #ifdef UNIT_TESTING diff --git a/backend/genesys_gl847.c b/backend/genesys_gl847.c index 3bdb7f050..ec720db8a 100644 --- a/backend/genesys_gl847.c +++ b/backend/genesys_gl847.c @@ -42,6 +42,9 @@ If you do not wish that, delete this exception notice. */ +#undef BACKEND_NAME +#define BACKEND_NAME genesys_gl847 + #include "genesys_gl847.h" /**************************************************************************** diff --git a/backend/genesys_gl847.h b/backend/genesys_gl847.h index 1e75c9c10..39909a270 100644 --- a/backend/genesys_gl847.h +++ b/backend/genesys_gl847.h @@ -41,9 +41,6 @@ If you do not wish that, delete this exception notice. */ -#undef BACKEND_NAME -#define BACKEND_NAME genesys_gl847 - #include "genesys.h" #define REG01 0x01 diff --git a/backend/genesys_low.h b/backend/genesys_low.h index 7b3405a54..4fc3c537f 100644 --- a/backend/genesys_low.h +++ b/backend/genesys_low.h @@ -67,6 +67,10 @@ #ifdef HAVE_SYS_TYPES_H #include #endif +#ifdef HAVE_MKDIR +#include +#include +#endif #include "../include/sane/sane.h" #include "../include/sane/sanei.h"