use CKSEL=1 for XPA

merge-requests/1/head
Stphane Voltz 2012-01-02 22:09:54 +01:00
rodzic 562c301059
commit c90128efff
2 zmienionych plików z 3 dodań i 2 usunięć

Wyświetl plik

@ -1177,7 +1177,7 @@ gl843_init_optical_regs_scan (Genesys_Device * dev,
/* sensor parameters */
gl843_setup_sensor (dev, reg, dpihw, flags);
/* resolution is divided according to CKSEL which is known once sensor is set up*/
/* resolution is divided according to CKSEL which is known once sensor is set up */
r = sanei_genesys_get_address (reg, REG18);
cksel= (r->value & REG18_CKSEL)+1;
DBG (DBG_io2, "%s: cksel=%d\n", __FUNCTION__, cksel);
@ -2811,6 +2811,7 @@ gl843_init_regs_for_coarse_calibration (Genesys_Device * dev)
dev->settings.yres,
0,
0,
/* XXX STEF XXX dpi instead of pixels !*/
dev->sensor.optical_res / cksel,
20,
16,

Wyświetl plik

@ -613,7 +613,7 @@ typedef struct {
*/
static Sensor_Profile xpa_sensors[]={
{CCD_G4050 , 600, 15624, 0x001c7f, 0x03ffff, 0x03ffff, 5168, 0, 0x2a, 0, 0, 0, 0x00, 0x00, 0x02, 0x00, 0x00,
{0x2c, 0x09, 0x22, 0xb8, 0x10, 0xf0, 0x33, 0x4c, 0x00, 0x2a, 0x30, 0x00, 0x00, 0x08} ,
{0x2c, 0x09, 0x22, 0xb8, 0x10, 0xf0, 0x33, 0x4c, 0x01, 0x2a, 0x30, 0x00, 0x00, 0x08} ,
{0x0e, 0x11, 0x02, 0x05, 0x08, 0x0b, 0x6b, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x6f},
},
};