From 150f001b0a13a7887730ff7230d2532a4b9f9e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
Date: Fri, 12 Feb 2010 14:43:59 +0100
Subject: [PATCH] hp3670 support tuning

---
 ChangeLog                     |  6 ++++++
 backend/genesys_devices.c     |  3 +--
 backend/genesys_gl646.h       | 12 +++++++-----
 doc/descriptions/genesys.desc |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 15ff818e1..43834d2b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-12 Stéphane Voltz <stef.dev ar free.fr>
+	* doc/descriptions/genesys.desc backend/genesys.c
+	backend/genesys_devices.c backend/genesys_gl646.c
+	backend/genesys_gl646.h: added support for hp3670, uncalibrated scans
+	only
+
 2010-02-10 m. allan noah <kitno455 at gmail dot com>
 	* include/sane/saneopts.h: add three new SANE_VALUE macros
 	* backend/*.[ch]: use mode name macros from saneopts.h by Robert Ancell
diff --git a/backend/genesys_devices.c b/backend/genesys_devices.c
index 759f643fa..70dbba1c2 100644
--- a/backend/genesys_devices.c
+++ b/backend/genesys_devices.c
@@ -1048,8 +1048,7 @@ static Genesys_Model hp3670c_model = {
   {16, 8, 0},			/* possible depths in color mode */
 
   SANE_FIX (8.5),		/* Start of scan area in mm  (x) */
-  SANE_FIX (0.0),		/* Start of scan area in mm (y) */
-  /* SANE_FIX (14.0),		 Start of scan area in mm (y) */
+  SANE_FIX (12.0),		/* Start of scan area in mm (y) */
   SANE_FIX (215.9),		/* Size of scan area in mm (x) */
   SANE_FIX (300.0),		/* Size of scan area in mm (y) */
 
diff --git a/backend/genesys_gl646.h b/backend/genesys_gl646.h
index 98929659b..eb2448103 100644
--- a/backend/genesys_gl646.h
+++ b/backend/genesys_gl646.h
@@ -274,6 +274,8 @@ static
 #endif
 SANE_Status gl646_set_fe (Genesys_Device * dev, uint8_t set, int dpi);
 
+SANE_Status gl646_public_set_fe (Genesys_Device * dev, uint8_t set);
+
 /**
  * sets up the scanner for a scan, registers, gamma tables, shading tables
  * and slope tables, based on the parameter struct.
@@ -509,14 +511,14 @@ static Sensor_Master sensor_master[] = {
  */
 static Motor_Master motor_master[] = {
   /* HP3670 motor settings */
-  {MOTOR_HP3670,  75, SANE_TRUE ,  75, FULL_STEP, SANE_FALSE, SANE_TRUE , 1,  73,  3429,  305, 192, 3399, 341, 0.3, 0.4, 192},
-  {MOTOR_HP3670, 100, SANE_TRUE , 100, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 143,  2905,  187, 200, 3399, 337, 0.3, 0.4, 96},
+  {MOTOR_HP3670,  75, SANE_TRUE ,  75, FULL_STEP, SANE_FALSE, SANE_TRUE , 1, 200,  3429,  305, 192, 3399, 337, 0.3, 0.4, 192},
+  {MOTOR_HP3670, 100, SANE_TRUE , 100, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 143,  2905,  187, 192, 3399, 337, 0.3, 0.4, 192},
   {MOTOR_HP3670, 150, SANE_TRUE , 150, HALF_STEP, SANE_FALSE, SANE_TRUE , 1,  73,  3429,  305, 192, 3399, 341, 0.3, 0.4, 192},
   {MOTOR_HP3670, 300, SANE_TRUE , 300, HALF_STEP, SANE_FALSE, SANE_TRUE , 1,  11,  1055,  563, 192, 3399, 341, 0.3, 0.4, 192},
   {MOTOR_HP3670, 600, SANE_TRUE , 600, FULL_STEP, SANE_FALSE, SANE_TRUE , 0,   3, 10687, 5126, 192, 3399, 341, 0.3, 0.4, 192},
-  {MOTOR_HP3670,1200, SANE_TRUE ,1200, HALF_STEP, SANE_FALSE, SANE_TRUE , 0,   3, 15937, 7968, 200, 3399, 337, 0.3, 0.4, 8},
-  {MOTOR_HP3670,  75, SANE_FALSE,  75, FULL_STEP, SANE_FALSE, SANE_TRUE , 1,  73,  3429,  305, 192, 3399, 341, 0.3, 0.4, 192},
-  {MOTOR_HP3670, 100, SANE_FALSE, 100, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 143,  2905,  187, 200, 3399, 337, 0.3, 0.4, 96},
+  {MOTOR_HP3670,1200, SANE_TRUE ,1200, HALF_STEP, SANE_FALSE, SANE_TRUE , 0,   3, 15937, 7968, 192, 3399, 337, 0.3, 0.4, 192},
+  {MOTOR_HP3670,  75, SANE_FALSE,  75, FULL_STEP, SANE_FALSE, SANE_TRUE , 1, 200,  3429,  305, 192, 3399, 337, 0.3, 0.4, 192},
+  {MOTOR_HP3670, 100, SANE_FALSE, 100, HALF_STEP, SANE_FALSE, SANE_TRUE , 1, 143,  2905,  187, 192, 3399, 337, 0.3, 0.4, 192},
   {MOTOR_HP3670, 150, SANE_FALSE, 150, HALF_STEP, SANE_FALSE, SANE_TRUE , 1,  73,  3429,  305, 192, 3399, 341, 0.3, 0.4, 192},
   {MOTOR_HP3670, 300, SANE_FALSE, 300, HALF_STEP, SANE_FALSE, SANE_TRUE , 1,  11,  1055,  563, 192, 3399, 341, 0.3, 0.4, 192},
   {MOTOR_HP3670, 600, SANE_FALSE, 600, FULL_STEP, SANE_FALSE, SANE_TRUE , 0,   3, 10687, 5126, 192, 3399, 341, 0.3, 0.4, 192},
diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc
index bca4ebf6f..8fa81e053 100644
--- a/doc/descriptions/genesys.desc
+++ b/doc/descriptions/genesys.desc
@@ -55,8 +55,8 @@
 :model "ScanJet 3670C"
 :interface "USB"
 :usbid "0x03f0" "0x1405"
-:status :untested
-:comment "1200x1200 dpi max"
+:status :basic
+:comment "1200x1200 dpi max, all mode supported but uncalibrated"
 
 ; -----------------------------------------------------------------------------