merge-requests/1/head
Stphane Voltz 2010-05-19 21:36:12 +02:00
rodzic b02acbd283
commit 55d5ef6fd9
2 zmienionych plików z 5 dodań i 15 usunięć

Wyświetl plik

@ -439,7 +439,7 @@ static Genesys_Sensor Sensor[] = {
/* reg 0x10 - 0x15 */
{0x03, 0x00, 0x02, 0x00, 0x01, 0x80, /* EXPR/EXPG/EXPB */
/* reg 0x16 - 0x1d */
0x10, 0x08, 0x00, 0xff, 0x34, 0x00, 0x02, 0x04 },
0x10, 0x08, 0x00, 0x50, 0x34, 0x00, 0x02, 0x04 },
/* reg 0x52 - 0x5e */
{0x03, 0x07,
0x00, 0x00, 0x00, 0x00,
@ -966,13 +966,12 @@ static Genesys_Model canon_lide_100_model = {
GPO_CANONLIDE200,
MOTOR_CANONLIDE100,
GENESYS_FLAG_LAZY_INIT /* Which flags are needed for this scanner? */
/* | GENESYS_FLAG_NO_CALIBRATION */
| GENESYS_FLAG_SKIP_WARMUP
| GENESYS_FLAG_OFFSET_CALIBRATION
| GENESYS_FLAG_DARK_CALIBRATION
| GENESYS_FLAG_CUSTOM_GAMMA,
GENESYS_HAS_SCAN_SW | GENESYS_HAS_COPY_SW | GENESYS_HAS_EMAIL_SW | GENESYS_HAS_FILE_SW,
150,
50,
400
};

Wyświetl plik

@ -1484,6 +1484,7 @@ gl847_init_optical_regs_scan (Genesys_Device * dev,
r = sanei_genesys_get_address (reg, 0x19);
r->value = 0xff;
r->value = 0x50; /* XXX STEF XXX */
/* BW threshold */
r = sanei_genesys_get_address (reg, 0x2e);
@ -2325,6 +2326,7 @@ gl847_set_lamp_power (Genesys_Device * dev,
}
r = sanei_genesys_get_address (regs, 0x19);
r->value = 0x50;
r->value = 0x50; /* XXX STEF XXX */
}
else
{
@ -2340,6 +2342,7 @@ gl847_set_lamp_power (Genesys_Device * dev,
}
r = sanei_genesys_get_address (regs, 0x19);
r->value = 0xff;
r->value = 0x50; /* XXX STEF XXX */
}
}
@ -3654,18 +3657,6 @@ gl847_led_calibration (Genesys_Device * dev)
DBG (DBG_proc, "gl847_led_calibration\n");
/* move to white strip */
/* XXX STEF XXX
status = gl847_feed (dev, 280); */
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
"gl847_led_calibration: failed to feed: %s\n",
sane_strstatus (status));
return status;
}
/* offset calibration is always done in color mode */
channels = 3;