From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- backend/genesys_gl846.h | 231 +++--------------------------------------------- 1 file changed, 12 insertions(+), 219 deletions(-) (limited to 'backend/genesys_gl846.h') diff --git a/backend/genesys_gl846.h b/backend/genesys_gl846.h index e1dc711..797c605 100644 --- a/backend/genesys_gl846.h +++ b/backend/genesys_gl846.h @@ -335,239 +335,39 @@ #define REGF8_SMAXSEL 4 #define REGF8_MINSEL 0x0f -/** - * writable scanner registers */ -enum -{ - reg_0x01 = 0, - reg_0x02, - reg_0x03, - reg_0x04, - reg_0x05, - reg_0x06, - reg_0x08, - reg_0x09, - reg_0x0a, - reg_0x0b, - reg_0x0c, - reg_0x0d, - reg_0x0e, - reg_0x0f, - reg_0x10, - reg_0x11, - reg_0x12, - reg_0x13, - reg_0x14, - reg_0x15, - reg_0x16, - reg_0x17, - reg_0x18, - reg_0x19, - reg_0x1a, - reg_0x1b, - reg_0x1c, - reg_0x1d, - reg_0x1e, - reg_0x1f, - reg_0x20, - reg_0x21, - reg_0x22, - reg_0x23, - reg_0x24, - reg_0x25, - reg_0x26, - reg_0x27, - reg_0x2c, - reg_0x2d, - reg_0x2e, - reg_0x2f, - reg_0x30, - reg_0x31, - reg_0x32, - reg_0x33, - reg_0x34, - reg_0x35, - reg_0x36, - reg_0x37, - reg_0x38, - reg_0x39, - reg_0x3a, - reg_0x3b, - reg_0x3d, - reg_0x3e, - reg_0x3f, - reg_0x51, - reg_0x52, - reg_0x53, - reg_0x54, - reg_0x55, - reg_0x56, - reg_0x57, - reg_0x58, - reg_0x59, - reg_0x5a, - reg_0x5e, - reg_0x5f, - reg_0x60, - reg_0x61, - reg_0x62, - reg_0x63, - reg_0x64, - reg_0x65, - reg_0x67, - reg_0x68, - reg_0x69, - reg_0x6a, - reg_0x6b, - reg_0x6c, - reg_0x6d, - reg_0x6e, - reg_0x6f, - reg_0x70, - reg_0x71, - reg_0x72, - reg_0x73, - reg_0x74, - reg_0x75, - reg_0x76, - reg_0x77, - reg_0x78, - reg_0x79, - reg_0x7a, - reg_0x7b, - reg_0x7c, - reg_0x7d, - reg_0x7e, - reg_0x7f, - reg_0x80, - reg_0x87, - reg_0x94, - reg_0x98, - reg_0x99, - reg_0x9a, - reg_0x9b, - reg_0x9d, - reg_0x9e, - reg_0xa1, - reg_0xa2, - reg_0xa3, - reg_0xa4, - reg_0xa5, - reg_0xa6, - reg_0xa7, - reg_0xa8, - reg_0xa9, - reg_0xab, - reg_0xbb, - reg_0xbc, - reg_0xbd, - reg_0xbe, - reg_0xc5, - reg_0xc6, - reg_0xc7, - reg_0xc8, - reg_0xc9, - reg_0xca, - reg_0xd0, - reg_0xd1, - reg_0xd2, - reg_0xdb, - reg_0xe0, - reg_0xe1, - reg_0xe2, - reg_0xe3, - reg_0xe4, - reg_0xe5, - reg_0xe6, - reg_0xe7, - reg_0xe8, - reg_0xe9, - reg_0xea, - reg_0xeb, - reg_0xec, - reg_0xed, - reg_0xee, - reg_0xef, - reg_0xf0, - reg_0xf1, - reg_0xf2, - reg_0xf3, - reg_0xf4, - reg_0xf5, - reg_0xf6, - reg_0xf7, - reg_0xf8, - reg_0xfe, - reg_0xff, - GENESYS_GL846_MAX_REGS -}; - -#define SETREG(adr,val) {dev->reg[reg_##adr].address=adr;dev->reg[reg_##adr].value=val;} +#define SETREG(adr,val) { dev->reg.init_reg(adr, val); } /** set up registers for an actual scan * * this function sets up the scanner to scan in normal or single line mode */ -#ifndef UNIT_TESTING -static -#endif -SANE_Status gl846_init_scan_regs (Genesys_Device * dev, - Genesys_Register_Set * reg, - float xres, /*dpi */ - float yres, /*dpi */ - float startx, /*optical_res, from dummy_pixel+1 */ - float starty, /*base_ydpi, from home! */ - float pixels, - float lines, - unsigned int depth, - unsigned int channels, - int color_filter, - unsigned int flags); +static SANE_Status gl846_init_scan_regs(Genesys_Device * dev, const Genesys_Sensor& sensor, + Genesys_Register_Set * reg, SetupParams& params); /* Send the low-level scan command */ -#ifndef UNIT_TESTING -static -#endif -SANE_Status gl846_begin_scan (Genesys_Device * dev, Genesys_Register_Set * reg, SANE_Bool start_motor); +static SANE_Status gl846_begin_scan (Genesys_Device * dev, const Genesys_Sensor& sensor, + Genesys_Register_Set * reg, SANE_Bool start_motor); /* Send the stop scan command */ -#ifndef UNIT_TESTING -static -#endif -SANE_Status gl846_end_scan (Genesys_Device * dev, Genesys_Register_Set * reg, SANE_Bool check_stop); +static SANE_Status gl846_end_scan (Genesys_Device * dev, Genesys_Register_Set * reg, SANE_Bool check_stop); -#ifndef UNIT_TESTING -static -#endif -SANE_Status gl846_init (Genesys_Device * dev); +static SANE_Status gl846_init (Genesys_Device * dev); /** @brief moves the slider to steps at motor base dpi * @param dev device to work on * @param steps number of steps to move * */ -#ifndef UNIT_TESTING -static -#endif -SANE_Status +static SANE_Status gl846_feed (Genesys_Device * dev, unsigned int steps); -#ifndef UNIT_TESTING -static -#endif -SANE_Status +static SANE_Status gl846_stop_action (Genesys_Device * dev); -#ifndef UNIT_TESTING -static -#endif -SANE_Status +static SANE_Status gl846_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home); -#ifndef UNIT_TESTING -static -#endif -SANE_Status +static SANE_Status gl846_boot (Genesys_Device * dev, SANE_Bool cold); @@ -594,7 +394,7 @@ static Gpio_Profile gpios[]={ typedef struct { - char *model; + const char *model; uint8_t dramsel; /* shading data address */ uint8_t rd0; @@ -667,8 +467,6 @@ typedef struct { uint8_t r17; /**> TG width */ } Sensor_Profile; -/* *INDENT-OFF* */ - /** * order of the scanned pixel */ @@ -681,7 +479,6 @@ static Sensor_Profile sensors[]={ {CCD_IMG101, 1200, 11000, 60, 159, 85, 5136, 255, 0, 0, 0, order_01 , 0x13}, {CCD_PLUSTEK3800, 1200, 11000, 60, 159, 85, 5136, 255, 0, 0, 0, order_01 , 0x13}, }; -/* *INDENT-ON* */ /* base motor slopes in full step unit */ /* target=((exposure * dpi) / base_dpi)>>step_type; */ @@ -691,7 +488,6 @@ static uint32_t img101_high[] = {22000, 22000, 22000, 18450, 15974, 14284, 13054 * database of motor profiles */ -/* *INDENT-OFF* */ static Motor_Profile gl846_motors[]={ /* Image Formula 101 */ {MOTOR_IMG101, 11000, HALF_STEP , img101_high}, @@ -700,6 +496,3 @@ static Motor_Profile gl846_motors[]={ /* end of database entry */ {0, 0, 0, NULL}, }; -/* *INDENT-ON* */ - -/* vim: set sw=2 cino=>2se-1sn-1s{s^-1st0(0u0 smarttab expandtab: */ -- cgit v1.2.3