diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 | 
| commit | 9f8889f928ce86ba4a78659d378c6ba29bc9f735 (patch) | |
| tree | c9567cb0d015b68ce3da8d03472b6443f1cb1ca9 /backend/epson2.h | |
| parent | 446e9454b8cbe5b689149415d11d36e88442ca88 (diff) | |
| parent | 154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff) | |
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
Diffstat (limited to 'backend/epson2.h')
| -rw-r--r-- | backend/epson2.h | 13 | 
1 files changed, 10 insertions, 3 deletions
| diff --git a/backend/epson2.h b/backend/epson2.h index 773c7de..7fa8f53 100644 --- a/backend/epson2.h +++ b/backend/epson2.h @@ -22,6 +22,9 @@  #define BACKEND_NAME epson2  #define DEBUG_NOT_STATIC +#define mode_params epson2_mode_params +#define source_list epson2_source_list +  #ifdef HAVE_SYS_IOCTL_H  #include <sys/ioctl.h>  #endif @@ -80,6 +83,9 @@  #define SANE_EPSON_MAX_RETRIES	14	/* warmup max retry */  #define CMD_SIZE_EXT_STATUS	42 +#define FOCUS_ON_GLASS 64 +#define FOCUS_ABOVE_25MM (64 + 25) +  /* NOTE: you can find these codes with "man ascii". */  #define STX	0x02  #define ACK	0x06 @@ -172,7 +178,7 @@  #define EPSON_LEVEL_D7		12  #define EPSON_LEVEL_D8		13 -/* there is also a function level "A5", which I'm igoring here until somebody can +/* there is also a function level "A5", which I'm ignoring here until somebody can   * convince me that this is still needed. The A5 level was for the GT-300, which   * was (is) a monochrome only scanner. So if somebody really wants to use this   * scanner with SANE get in touch with me and we can work something out - khk @@ -253,11 +259,13 @@ enum {  	OPT_TL_Y,  	OPT_BR_X,  	OPT_BR_Y, +	OPT_FOCUS_GROUP, +	OPT_AUTOFOCUS, +	OPT_FOCUS_POS,  	OPT_EQU_GROUP,  	OPT_SOURCE,  	OPT_AUTO_EJECT,  	OPT_FILM_TYPE, -	OPT_FOCUS,  	OPT_BAY,  	OPT_EJECT,  	OPT_ADF_MODE, @@ -387,7 +395,6 @@ struct Epson_Scanner  	SANE_Int lines_written;		/* debug variable */  	SANE_Int left, top, lcount; -	SANE_Bool focusOnGlass;  	SANE_Byte currentFocusPosition;  	/* network buffers */ | 
