From c5117ed0f1b522eab10fd2248f140b2acad2a708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Voltz?= Date: Wed, 24 Feb 2016 21:43:29 +0100 Subject: [PATCH] doc and version update --- backend/genesys.c | 2 +- backend/genesys_gl124.c | 6 +++--- doc/descriptions/genesys.desc | 2 +- doc/sane-genesys.man | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/backend/genesys.c b/backend/genesys.c index 1cb544e87..1ba1d82a9 100644 --- a/backend/genesys.c +++ b/backend/genesys.c @@ -58,7 +58,7 @@ * SANE backend for Genesys Logic GL646/GL841/GL842/GL843/GL846/GL847/GL124 based scanners */ -#define BUILD 2508 +#define BUILD 2510 #define BACKEND_NAME genesys #include "genesys.h" diff --git a/backend/genesys_gl124.c b/backend/genesys_gl124.c index bc01edc95..a6a67a9e7 100644 --- a/backend/genesys_gl124.c +++ b/backend/genesys_gl124.c @@ -1084,7 +1084,7 @@ gl124_setup_sensor (Genesys_Device * dev, Genesys_Register_Set * regs, int dpi, } } - /* skip writing 5d,51 which is AFE address because + /* skip writing 5d,5e which is AFE address because * they are not deifned in register set */ for (i = 0; i < 11; i++) { @@ -2059,11 +2059,11 @@ uint8_t val; /* 120 : <=300 => 0x53 */ else { /* base_ydpi is 4800 */ - if(resolution<=dev->motor.base_ydpi/4) + if((resolution<=dev->motor.base_ydpi/4)||(resolution>=dev->motor.base_ydpi/2)) { val &= 0xf7; } - if(resolution<=dev->motor.base_ydpi/4) + else if(resolution<=dev->motor.base_ydpi/2) { val |= 0x08; } diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc index 6d400f29a..f6fb8a3ed 100644 --- a/doc/descriptions/genesys.desc +++ b/doc/descriptions/genesys.desc @@ -148,7 +148,7 @@ :model "CanoScan LiDE 120" :interface "USB" :usbid "0x04a9" "0x190e" -:status :unsupported +:status :complete :comment "GL124+ based, resolution from 75 to 2400 dpi" :model "CanoScan LiDE 200" diff --git a/doc/sane-genesys.man b/doc/sane-genesys.man index ee3e0af15..bbd35a764 100644 --- a/doc/sane-genesys.man +++ b/doc/sane-genesys.man @@ -10,7 +10,7 @@ access to USB flatbed scanners based on the Genesys GL646, GL841, GL843, GL847 a At present, the following scanners are known to work with this backend: .PP .RS -Canon LiDE 35/40/50/60/100/110/200/210/220/700 +Canon LiDE 35/40/50/60/100/110/120/200/210/220/700 .br Hewlett-Packard HP2300C/HP2400/HP3670/HP3690/G4010/G4050 .br @@ -285,6 +285,9 @@ Brian Paavo from Benthic Science Limited for donating a Canoscan LiDE 700F. .TP Dany Qumsiyeh for donating a Canoscan LiDE 210 and a LiDE 220. .br +.TP +Luc Verhaegen for donating a Canoscan LiDE 120. +.br .SH "SEE ALSO" .BR sane (7),