diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
| commit | ee770c2346eb37e0dcb8b6cf3eaacf3d8efd6bbc (patch) | |
| tree | 58f05092be1a17a939e861f8cadcda1b6ca2ecef /backend/plustek-usb.h | |
| parent | 0da9e21872802cfc6e975b1ebaf9efb9e5934d84 (diff) | |
| parent | fef76e17ed4c607ea73b81279f9ef1d7121be900 (diff) | |
Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1
Diffstat (limited to 'backend/plustek-usb.h')
| -rw-r--r-- | backend/plustek-usb.h | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/backend/plustek-usb.h b/backend/plustek-usb.h index 0f001c9..d989749 100644 --- a/backend/plustek-usb.h +++ b/backend/plustek-usb.h @@ -297,17 +297,14 @@ enum _BUTTONS _PORT2 = ((_MIO5 | _MIO6) << _BUTTON_SHIFT) }; -enum _PAPER_SENSE -{ - _PS_INP1 = (0x01 << _PSENSE_SHIFT), - _PS_INP2 = (0x02 << _PSENSE_SHIFT), - _PS_INP_MIO1 = (_MIO1 << (_PSENSE_SHIFT+2)), - _PS_INP_MIO2 = (_MIO2 << (_PSENSE_SHIFT+2)), - _PS_INP_MIO3 = (_MIO3 << (_PSENSE_SHIFT+2)), - _PS_INP_MIO4 = (_MIO4 << (_PSENSE_SHIFT+2)), - _PS_INP_MIO5 = (_MIO5 << (_PSENSE_SHIFT+2)), - _PS_INP_MIO6 = (_MIO6 << (_PSENSE_SHIFT+2)) -}; +#define _PS_INP1 (0x01 << _PSENSE_SHIFT) +#define _PS_INP2 (0x02 << _PSENSE_SHIFT) +#define _PS_INP_MIO1 (_MIO1 << (_PSENSE_SHIFT+2)) +#define _PS_INP_MIO2 (_MIO2 << (_PSENSE_SHIFT+2)) +#define _PS_INP_MIO3 (_MIO3 << (_PSENSE_SHIFT+2)) +#define _PS_INP_MIO4 (_MIO4 << (_PSENSE_SHIFT+2)) +#define _PS_INP_MIO5 (_MIO5 << (_PSENSE_SHIFT+2)) +#define _PS_INP_MIO6 (_MIO6 << (_PSENSE_SHIFT+2)) /** for encoding a misc I/O register as TPA */ #define _TPA(register) ((u_long)(register << _TPA_SHIFT)) @@ -381,7 +378,7 @@ enum SCANFLAG SCANFLAG_BottomUp = 0x00008000, SCANFLAG_DWORDBoundary = 0x00020000, SCANFLAG_RightAlign = 0x00040000, - SCANFLAG_StillModule = 0x00080000, + SCANFLAG_StillModule = 0x00080000, SCANFLAG_Pseudo48 = 0x08000000, SCANFLAG_SampleY = 0x04000000, SCANFLAG_Calibration = 0x10000000, @@ -469,10 +466,10 @@ typedef struct HWDefault u_char bReg_0x0f_Mono [10]; /* 0x0f to 0x18 */ u_char bReg_0x0f_Color [10]; /* 0x0f to 0x18 */ - /* color mode settings */ + /* color mode settings */ u_char bReg_0x26; u_char bReg_0x27; - + /* illumination mode reg 0x29 (runtime) */ u_char bReg_0x29; @@ -484,7 +481,7 @@ typedef struct HWDefault * format, you have to pay your attention when you * write this value to register. */ - u_short StepperPhaseCorrection; + u_short StepperPhaseCorrection; /* Sensor Pixel Configuration * Actually, the wActivePixelsStart will be set to 0 for shading purpose. @@ -656,11 +653,11 @@ typedef struct ScanDef AnyPtr Green; AnyPtr Red; AnyPtr Blue; - + long lBufAdjust; /**< bytes to adjust buffer pointer */ /* after a image line processed */ u_short wSumY; /**< for line sampling */ - + u_char bLineDistance; /**< Color offset in specific dpi y */ int fGrayFromColor; /**< channel to use for gray mode */ |