mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Reenable clock register setup from sensor struct, set SCANMOD

merge-requests/1/head
Pierre Willenbrock 2009-01-18 16:51:39 +00:00
rodzic acc563e707
commit 35ea4a1250
3 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -4,8 +4,10 @@
* backend/genesys_gl841.c: Make dpihw depend on sensor pixel count
instead of sensor resolution. Make some Canon LiDE 35 specific
gpio handling conditional, add missing SCANMOD shift. Make
half-ccd mode optional.
half-ccd mode optional. Reenable clock register setup from sensor
struct, set SCANMOD.
* backend/genesys_devices.c: Make half-ccd mode optional.
Reenable clock register setup from sensor struct, set SCANMOD.
2009-01-16 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* .cvsignore, Makefile.in, aclocal.m4, config.sub, configure,

2
backend/genesys_devices.c
Wyświetl plik

@ -207,7 +207,7 @@ static Genesys_Sensor Sensor[] = {
200,
{0x00, 0x00, 0x00, 0x00},
{0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x02, 0x00, 0x50,
0x00, 0x00, 0x00, 0x00 /* TODO(these do no harm, but may be neccessery for CCD) */
0x00, 0x00, 0x00, 0x02 /* TODO(these do no harm, but may be neccessery for CCD) */
},
{0x05, 0x07,
0x00, 0x00, 0x00, 0x00, /*[GB](HI|LOW) not needed for cis */

8
backend/genesys_gl841.c
Wyświetl plik

@ -1156,12 +1156,9 @@ sanei_gl841_setup_sensor (Genesys_Device * dev,
for (i = 0x06; i < 0x0a; i++, r++)
r->value = dev->sensor.regs_0x10_0x1d[i];
/*TODO the ommitted values may be necessary for ccd*/
/* r = sanei_genesys_get_address (regs, 0x);
r = sanei_genesys_get_address (regs, 0x1a);
for (i = 0x0a; i < 0x0e; i++, r++)
r->value = dev->sensor.regs_0x10_0x1d[i];*/
r = sanei_genesys_get_address (regs, 0x1d);
r->value = 0x02;
r->value = dev->sensor.regs_0x10_0x1d[i];
r = sanei_genesys_get_address (regs, 0x52);
for (i = 0; i < 9; i++, r++)
@ -1472,6 +1469,7 @@ gl841_init_registers (Genesys_Device * dev)
dev->reg[reg_0x06].value |= REG06_PWRBIT;
dev->reg[reg_0x06].value |= REG06_GAIN4;
dev->reg[reg_0x06].value |= 0 << REG06S_SCANMOD;
dev->reg[reg_0x09].value |= 1 << REG09S_CLKSET;