kopia lustrzana https://gitlab.com/sane-project/backends
rts8891: resume work on Umax Astra 4400/4450
Resume work on Umax Astra 4400/4450 support from 2015.734-support-for-canon-i-sensys-mf657cdw-mf650c-series
Ondrej Zary
Ralph Little
rodzic
836a33c3c4
commit
8bbf8d5a5a
Plik diff jest za duży
Load Diff
|
|
@ -177,11 +177,25 @@ static Rts8891_Model astra4400_model = {
|
|||
"Astra 4400", /* Device model name */
|
||||
"flatbed scanner", /* Device type */
|
||||
|
||||
{1200, 600, 300, 150, 75, 0}, /* possible x-resolutions */
|
||||
{600, 300, 150, 0}, /* possible y-resolutions */
|
||||
/* Some resolutions supported by Windows driver are emulated:
|
||||
driver dpi real dpi
|
||||
-------------------------
|
||||
75 (+preview) 200x100 very fast
|
||||
100 200x100 very fast
|
||||
150 150x150
|
||||
200 200x200
|
||||
300 300x300
|
||||
400 600x400
|
||||
600 600x600
|
||||
800 1200x1200
|
||||
1200 1200x1200
|
||||
*/
|
||||
|
||||
{1200, 600, 300, 150, 100, 0}, /* possible x-resolutions */
|
||||
{1200, 600, 400, 300, 150, 100, 0}, /* possible y-resolutions */
|
||||
1200, /* max physical x dpi */
|
||||
600, /* max physical y dpi */
|
||||
150, /* min physical y dpi */
|
||||
1200, /* max physical y dpi */
|
||||
100, /* min physical y dpi */
|
||||
|
||||
SANE_FIX (8.3), /* Start of scan area in mm (x) */
|
||||
SANE_FIX (3.0), /* Start of scan area in mm (y) */
|
||||
|
|
@ -196,42 +210,40 @@ static Rts8891_Model astra4400_model = {
|
|||
24, 12, 0, /* R, G, and B CCD Line-distance correction in lines at
|
||||
max motor resolution */
|
||||
/* default sensor */
|
||||
SENSOR_TYPE_XPA,
|
||||
SENSOR_TYPE_UMAX,
|
||||
|
||||
/* default gamma table */
|
||||
{0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, 0x18, 0x1c, 0x20, 0x24, 0x28, 0x2c,
|
||||
0x30, 0x34, 0x38, 0x3c, 0x40, 0x44, 0x48, 0x4c, 0x50, 0x52, 0x53, 0x55,
|
||||
0x57, 0x58, 0x5a, 0x5c, 0x5d, 0x5f, 0x60, 0x62, 0x63, 0x64, 0x66, 0x67,
|
||||
0x68, 0x6a, 0x6b, 0x6c, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x74, 0x75, 0x76,
|
||||
0x77, 0x78, 0x79, 0x7a, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
|
||||
0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8d, 0x8e,
|
||||
0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x96, 0x97, 0x98, 0x99,
|
||||
0x9a, 0x9b, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3,
|
||||
0xa3, 0xa4, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa9, 0xa9, 0xaa, 0xab, 0xac,
|
||||
0xac, 0xad, 0xae, 0xaf, 0xaf, 0xb0, 0xb1, 0xb1, 0xb2, 0xb3, 0xb4, 0xb4,
|
||||
0xb5, 0xb6, 0xb6, 0xb7, 0xb8, 0xb8, 0xb9, 0xba, 0xba, 0xbb, 0xbc, 0xbc,
|
||||
0xbd, 0xbe, 0xbe, 0xbf, 0xc0, 0xc0, 0xc1, 0xc1, 0xc2, 0xc3, 0xc3, 0xc4,
|
||||
0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc8, 0xc8, 0xc9, 0xc9, 0xca, 0xcb, 0xcb,
|
||||
0xcc, 0xcc, 0xcd, 0xce, 0xce, 0xcf, 0xcf, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2,
|
||||
0xd3, 0xd3, 0xd4, 0xd5, 0xd5, 0xd6, 0xd6, 0xd7, 0xd7, 0xd8, 0xd9, 0xd9,
|
||||
0xda, 0xda, 0xdb, 0xdb, 0xdc, 0xdc, 0xdd, 0xdd, 0xde, 0xdf, 0xdf, 0xe0,
|
||||
0xe0, 0xe1, 0xe1, 0xe2, 0xe2, 0xe3, 0xe3, 0xe4, 0xe4, 0xe5, 0xe5, 0xe6,
|
||||
0xe6, 0xe7, 0xe7, 0xe8, 0xe8, 0xe9, 0xe9, 0xea, 0xea, 0xeb, 0xeb, 0xec,
|
||||
0xec, 0xed, 0xed, 0xee, 0xee, 0xef, 0xef, 0xf0, 0xf0, 0xf1, 0xf1, 0xf2,
|
||||
0xf2, 0xf3, 0xf3, 0xf4, 0xf4, 0xf5, 0xf5, 0xf6, 0xf6, 0xf7, 0xf7, 0xf8,
|
||||
0xf8, 0xf9, 0xf9, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfc, 0xfd, 0xfd,
|
||||
0xfe, 0xfe, 0xff, 0xff},
|
||||
{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c,
|
||||
0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
|
||||
0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24,
|
||||
0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
|
||||
0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c,
|
||||
0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
|
||||
0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54,
|
||||
0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60,
|
||||
0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
|
||||
0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
|
||||
0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84,
|
||||
0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90,
|
||||
0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c,
|
||||
0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8,
|
||||
0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
|
||||
0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0,
|
||||
0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc,
|
||||
0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
|
||||
0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4,
|
||||
0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0,
|
||||
0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
|
||||
0xfd, 0xfe, 0xff},
|
||||
|
||||
/* number of buttons */
|
||||
11,
|
||||
4,
|
||||
|
||||
/* button names */
|
||||
{"plus", "minus", "copy", "mail", "image-copy", "www", "scan", "power",
|
||||
"cancel", "options", "toggle-mode"},
|
||||
{"scan", "copy", "mail", "custom"},
|
||||
|
||||
/* button titles */
|
||||
{"plus", "minus", "copy", "mail", "image copy", "www", "scan", "power",
|
||||
"cancel", "options", "toggle color/gray mode"},
|
||||
{"scan", "copy", "mail", "custom"},
|
||||
|
||||
/* flags */
|
||||
RTS8891_FLAG_EMULATED_GRAY_MODE
|
||||
|
|
|
|||
|
|
@ -132,10 +132,16 @@ rts8891_write_all (SANE_Int devnum, SANE_Byte * regs, SANE_Int count)
|
|||
buffer[1] = 0xb4;
|
||||
buffer[2] = 0x00;
|
||||
buffer[3] = size;
|
||||
for (i = 0; i < size; i++)
|
||||
buffer[i + 4] = regs[0xb4 + i];
|
||||
j = 0;
|
||||
for (i = 0; i < size; i++) {
|
||||
buffer[i + 4 + j] = regs[0xb4 + i];
|
||||
if (buffer[i + 4 + j] == 0xaa) {
|
||||
j++;
|
||||
buffer[i + 4 + j] = 0x00;
|
||||
}
|
||||
}
|
||||
/* the USB block is size + 4 bytes of header long */
|
||||
size += 4;
|
||||
size += 4 + j;
|
||||
if (sanei_usb_write_bulk (devnum, buffer, &size) != SANE_STATUS_GOOD)
|
||||
{
|
||||
DBG (DBG_error,
|
||||
|
|
@ -368,6 +374,28 @@ rts8891_data_format (SANE_Int dpi, int sensor)
|
|||
break;
|
||||
}
|
||||
}
|
||||
if (sensor == SENSOR_TYPE_UMAX)
|
||||
{
|
||||
switch (dpi)
|
||||
{
|
||||
case 100: /* emulated */
|
||||
case 200:
|
||||
reg = 0x0b;
|
||||
break;
|
||||
case 150:
|
||||
reg = 0x17;
|
||||
break;
|
||||
case 300:
|
||||
reg = 0x17;
|
||||
break;
|
||||
case 600:
|
||||
reg = 0x03;
|
||||
break;
|
||||
case 1200:
|
||||
reg = 0x12;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return reg;
|
||||
}
|
||||
|
||||
|
|
@ -423,6 +451,11 @@ rts8891_move (struct Rts8891_Device *device, SANE_Byte * regs,
|
|||
|
||||
/* prepare scan */
|
||||
rts8891_set_default_regs (regs);
|
||||
if (device->sensor == SENSOR_TYPE_UMAX)
|
||||
{
|
||||
regs10 = 0x20;
|
||||
regs11 = 0x3b;
|
||||
}
|
||||
if (device->sensor != SENSOR_TYPE_4400
|
||||
&& device->sensor != SENSOR_TYPE_4400_BARE)
|
||||
{
|
||||
|
|
@ -509,6 +542,29 @@ rts8891_move (struct Rts8891_Device *device, SANE_Byte * regs,
|
|||
regs[0xe5] = 0xf3; /* 0xf9 */
|
||||
regs[0xe6] = 0x01; /* 0x00 */
|
||||
}
|
||||
if (device->sensor == SENSOR_TYPE_UMAX)
|
||||
{
|
||||
regs[0x14] = 0xf0;
|
||||
regs[0x16] = 0x0f;
|
||||
regs[0x23] = 0x00;
|
||||
regs[0x40] = 0xa0;
|
||||
/* regs[0x7a] = 0x02; */
|
||||
regs[0x80] = 0x83;
|
||||
regs[0x81] = 0x01;
|
||||
regs[0x82] = 0x84;
|
||||
regs[0x83] = 0x01;
|
||||
regs[0x85] = 0x10;
|
||||
regs[0x86] = 0x14;
|
||||
regs[0x87] = 0x20;
|
||||
regs[0x88] = 0x22;
|
||||
regs[0x89] = 0x85;
|
||||
regs[0x8a] = 0x01;
|
||||
regs[0x8d] = 0x4f;
|
||||
regs[0xd9] = 0x2d;
|
||||
regs[0xda] = 0x00;
|
||||
regs[0xe5] = 0x1b;
|
||||
regs[0xe6] = 0x01;
|
||||
}
|
||||
|
||||
/* disable CCD */
|
||||
regs[0] = 0xf5;
|
||||
|
|
@ -661,11 +717,13 @@ read_data (struct Rts8891_Session *session, SANE_Byte * dest, SANE_Int length)
|
|||
/* come yet */
|
||||
if (session->non_blocking && count == 0)
|
||||
{
|
||||
|
||||
dev->regs[LAMP_REG] = 0x8d;
|
||||
sanei_rts88xx_write_reg (dev->devnum, LAMP_REG,
|
||||
if (dev->sensor != SENSOR_TYPE_UMAX)
|
||||
{
|
||||
dev->regs[LAMP_REG] = 0x8d;
|
||||
sanei_rts88xx_write_reg (dev->devnum, LAMP_REG,
|
||||
&(dev->regs[LAMP_REG]));
|
||||
DBG (DBG_io, "read_data: no data available\n");
|
||||
}
|
||||
DBG (DBG_io, "read_data: no data vailable\n");
|
||||
DBG (DBG_proc, "read_data: end\n");
|
||||
return SANE_STATUS_DEVICE_BUSY;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,8 @@
|
|||
#define SENSOR_TYPE_XPA 1 /* sensor for hp4470 sold with XPA */
|
||||
#define SENSOR_TYPE_4400 2 /* sensor for hp4400 */
|
||||
#define SENSOR_TYPE_4400_BARE 3 /* sensor for hp4400 */
|
||||
#define SENSOR_TYPE_MAX 3 /* maximum sensor number value */
|
||||
#define SENSOR_TYPE_UMAX 4 /* sensor for Umax Astra 4400/4450 */
|
||||
#define SENSOR_TYPE_MAX 4 /* maximum sensor number value */
|
||||
|
||||
/* Forward typedefs */
|
||||
typedef struct Rts8891_Device Rts8891_Device;
|
||||
|
|
@ -173,6 +174,7 @@ struct Rts8891_Device
|
|||
SANE_Bool initialized; /* true if device has been initialized */
|
||||
SANE_Bool needs_warming; /* true if device needs warming up */
|
||||
SANE_Bool parking; /* true if device is parking head */
|
||||
SANE_Bool has_uta; /* true if UTA is connected */
|
||||
|
||||
/* values detected during find origin */
|
||||
/* TODO these are currently unused after detection */
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue