Merge branch 'genesys'

merge-requests/1/head
Stphane Voltz 2009-08-07 06:58:41 +02:00
commit 694491da9d
2 zmienionych plików z 10 dodań i 4 usunięć

Wyświetl plik

@ -1024,10 +1024,11 @@ static Genesys_Model hp3670c_model = {
GPO_HP3670,
MOTOR_HP3670,
GENESYS_FLAG_14BIT_GAMMA
| GENESYS_FLAG_SEARCH_START
| GENESYS_FLAG_SKIP_WARMUP
| GENESYS_FLAG_NO_CALIBRATION /* until fully supported */
/* | GENESYS_FLAG_SEARCH_START
| GENESYS_FLAG_DARK_CALIBRATION
| GENESYS_FLAG_OFFSET_CALIBRATION
| GENESYS_FLAG_OFFSET_CALIBRATION until fully supported */
| GENESYS_FLAG_SKIP_WARMUP
| GENESYS_FLAG_CUSTOM_GAMMA,
GENESYS_HAS_NO_BUTTONS, /* no buttons supported */
20,

Wyświetl plik

@ -1484,11 +1484,16 @@ gl646_init_regs (Genesys_Device * dev)
dev->reg[reg_0x20].value = 0x20;
break;
case CCD_HP2400:
case CCD_HP3670:
dev->reg[reg_0x1e].value = 0x80;
dev->reg[reg_0x1f].value = 0x10;
dev->reg[reg_0x20].value = 0x20;
break;
case CCD_HP3670:
dev->reg[reg_0x19].value = 0x2a;
dev->reg[reg_0x1e].value = 0x80;
dev->reg[reg_0x1f].value = 0x01;
dev->reg[reg_0x20].value = 0x50;
break;
break;
case CIS_XP200:
dev->reg[reg_0x1e].value = 0x10;