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

Make some Canon LiDE 35 specific gpio handling conditional, add missing SCANMOD shift.

merge-requests/1/head
Pierre Willenbrock 2009-01-18 14:03:56 +00:00
rodzic db00e6eaa3
commit e44981a905
2 zmienionych plików z 18 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
ChangeLog
Wyświetl plik

@ -1,7 +1,8 @@
2009-01-18 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_low.h: Fix prototype of update_hardware_sensors
* backend/genesys_gl841.c: Make dpihw depend on sensor pixel count
instead of sensor resolution
instead of sensor resolution. Make some Canon LiDE 35 specific
gpio handling conditional, add missing SCANMOD shift.
2009-01-16 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* .cvsignore, Makefile.in, aclocal.m4, config.sub, configure,

26
backend/genesys_gl841.c
Wyświetl plik

@ -112,6 +112,7 @@
#define REG05_MTLBASE 0x03
#define REG06_SCANMOD 0xe0
#define REG06S_SCANMOD 5
#define REG06_PWRBIT 0x10
#define REG06_GAIN4 0x08
#define REG06_OPTEST 0x07
@ -1524,8 +1525,11 @@ gl841_init_registers (Genesys_Device * dev)
dev->reg[reg_0x6e].value = dev->gpo.enable[0];
dev->reg[reg_0x6f].value = dev->gpo.enable[1];
dev->reg[reg_0x6b].value |= REG6B_GPO18;
dev->reg[reg_0x6b].value &= ~REG6B_GPO17;
if (dev->model->gpo_type == GPO_CANONLIDE35)
{
dev->reg[reg_0x6b].value |= REG6B_GPO18;
dev->reg[reg_0x6b].value &= ~REG6B_GPO17;
}
DBG (DBG_proc, "gl841_init_registers complete\n");
}
@ -2472,14 +2476,16 @@ gl841_init_optical_regs_scan(Genesys_Device * dev,
else
dpiset = used_res;
/* gpio part. here: for canon lide 35 */
r = sanei_genesys_get_address (reg, 0x6c);
if (half_ccd)
r->value &= ~0x80;
else
r->value |= 0x80;
if (dev->model->gpo_type == GPO_CANONLIDE35)
{
/* gpio part.*/
r = sanei_genesys_get_address (reg, 0x6c);
if (half_ccd)
r->value &= ~0x80;
else
r->value |= 0x80;
}
/* enable shading */
/* dev->reg[reg_0x01].value |= REG01_DVDSET | REG01_SCAN;*/
r = sanei_genesys_get_address (reg, 0x01);