From b4d76b6923f2eb03b83fdf955479cbb44233d24d Mon Sep 17 00:00:00 2001
From: "m. allan noah" <kitno455@gmail.com>
Date: Sat, 24 Jun 2006 17:48:53 +0000
Subject: [PATCH] update to backend v 1.0.33, add fi-5900 usb id, print sane
 version during sane_init.

---
 ChangeLog                     |  5 +++++
 backend/fujitsu.c             | 35 ++++++++++++++++++++++++++++++++---
 backend/fujitsu.conf.in       |  2 ++
 doc/descriptions/fujitsu.desc |  3 ++-
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 182bc7371..d54f85970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-24  m. allan noah <anoah AT pfeiffer DOT edu>
+
+	* backend/fujitsu.c: update to v1.0.33, add 5900 usb id
+	* doc/descriptions/fujitsu.desc: usb id and version update
+
 2006-06-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* doc/descriptions/epson.desc: Fixed USB id of CX6600 (patch from
diff --git a/backend/fujitsu.c b/backend/fujitsu.c
index 218ef2d40..c048a0789 100644
--- a/backend/fujitsu.c
+++ b/backend/fujitsu.c
@@ -200,6 +200,8 @@
          - run ghs/rs every second instead of every other
       V 1.0.32 2006-06-14, MAN
          - add 4220C2 usb id
+      V 1.0.33 2006-06-14, MAN
+         - add Fi-5900 usb id and init_model section
 
    SANE FLOW DIAGRAM
 
@@ -259,7 +261,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define FUJITSU_V_POINT 32 
+#define BUILD 33 
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -327,9 +329,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   sanei_usb_init();
 
   if (version_code)
-    *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, FUJITSU_V_POINT);
+    *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD);
 
-  DBG (5, "sane_init: backend version %d.%d.%d\n", V_MAJOR, V_MINOR, FUJITSU_V_POINT);
+  DBG (5, "sane_init: fujitsu backend %d.%d.%d, from %s\n",
+    V_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
 
   DBG (10, "sane_init: finish\n");
 
@@ -496,6 +499,9 @@ find_scanners ()
       DBG (15, "find_scanners: looking for 'usb 0x04c5 0x10e1'\n");
       sanei_usb_attach_matching_devices("usb 0x04c5 0x10e1", attach_one_usb);
 
+      DBG (15, "find_scanners: looking for 'usb 0x04c5 0x10e7'\n");
+      sanei_usb_attach_matching_devices("usb 0x04c5 0x10e7", attach_one_usb);
+
   }
 
   for (dev = fujitsu_devList; dev; dev=dev->next) {
@@ -1096,6 +1102,7 @@ init_model (struct fujitsu *s)
 
   if (strstr (s->product_name, "M3091")
    || strstr (s->product_name, "M3092")) {
+
     s->gamma = 0;
     s->has_rif=1;
 
@@ -1114,6 +1121,7 @@ init_model (struct fujitsu *s)
   }
   else if (strstr (s->product_name, "M309")
    || strstr (s->product_name, "M409")){
+
     s->gamma = 0;
   
     s->has_back = s->has_duplex;
@@ -1131,6 +1139,7 @@ init_model (struct fujitsu *s)
   }
   else if (strstr (s->product_name, "fi-4750")
    || strstr (s->product_name, "fi-4340") ) {
+
     s->gamma = 0x00;
 
     s->has_back = s->has_duplex;
@@ -1146,7 +1155,27 @@ init_model (struct fujitsu *s)
     s->reverse_by_mode[MODE_GRAYSCALE] = 1;
     s->reverse_by_mode[MODE_COLOR] = 1;
   }
+  /* some firmware versions use capital f? */
+  else if (strstr (s->product_name, "Fi-5900")
+   || strstr (s->product_name, "fi-5900") ) {
+
+    s->gamma = 0x00;
+
+    s->has_back = s->has_duplex;
+    s->color_interlace = COLOR_INTERLACE_BGR;
+    s->duplex_interlace = DUPLEX_INTERLACE_NONE;
+    s->has_MS_dropout = 1;
+    s->has_SW_dropout = 0;
+    s->window_vid = 0;
+    s->ghs_in_rs = 0;
+  
+    s->reverse_by_mode[MODE_LINEART] = 0;
+    s->reverse_by_mode[MODE_HALFTONE] = 0;
+    s->reverse_by_mode[MODE_GRAYSCALE] = 1;
+    s->reverse_by_mode[MODE_COLOR] = 1;
+  }
   else{
+
     s->gamma = 0x80;
 
     s->has_back = s->has_duplex;
diff --git a/backend/fujitsu.conf.in b/backend/fujitsu.conf.in
index 5428e4a03..e231c947d 100644
--- a/backend/fujitsu.conf.in
+++ b/backend/fujitsu.conf.in
@@ -39,3 +39,5 @@ usb 0x04c5 0x10af
 usb 0x04c5 0x10e0
 usb 0x04c5 0x10e1
 
+#fi-5900C
+usb 0x04c5 0x10e7
diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc
index 1bd01955c..74d6e4ec3 100644
--- a/doc/descriptions/fujitsu.desc
+++ b/doc/descriptions/fujitsu.desc
@@ -11,7 +11,7 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www2.pfeiffer.edu/~anoah/fujitsu/" 
-:version "1.0.32"                ; version of backend
+:version "1.0.33"                ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
 :comment "Backend re-written for SANE release 1.0.18, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -301,6 +301,7 @@
 
 :model "fi-5900C"
 :interface "SCSI USB"
+:usbid "0x04c5" "0x10e7"
 :status :basic
 :comment "production, current"