Fujitsu backend v109

ChangeLog

@@ -1,3 +1,9 @@
+2011-12-20 m. allan noah <kitno455 at gmail dot com>
+	* backend/fujitsu*, doc/descriptions/fujitsu.desc: backend v109
+	- added some MS and INQ information
+	- increased default buffer size for later machines in config file
+	- renamed new fi-6xx0Z models
+
 2011-12-18 Chris Bagwell <chris at cnpbagwell dot com>
 	* doc/descriptions-external/epkowa.desc: update for new iScan
 	2.28.1 release from Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>.

backend/fujitsu-scsi.h

@@ -245,7 +245,10 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 #define get_IN_has_cmd_subwindow(in)       getbitfield(in+0x2b, 1, 0) 
 #define get_IN_has_cmd_endorser(in)        getbitfield(in+0x2b, 1, 1)
 #define get_IN_has_cmd_hw_status(in)       getbitfield(in+0x2b, 1, 2)
+#define get_IN_has_cmd_hw_status_2(in)     getbitfield(in+0x2b, 1, 3)
+#define get_IN_has_cmd_hw_status_3(in)     getbitfield(in+0x2b, 1, 4)
 #define get_IN_has_cmd_scanner_ctl(in)     getbitfield(in+0x31, 1, 1)
+#define get_IN_has_cmd_device_restart(in)  getbitfield(in+0x31, 1, 2)
 
 #define get_IN_brightness_steps(in)        getnbyte(in+0x52, 1)
 #define get_IN_threshold_steps(in)         getnbyte(in+0x53, 1)
@@ -330,7 +333,9 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 
 /* ==================================================================== */
 /* page codes used by mode_sense and mode_select */
-#define MS_pc_unknown 0x32 /* unknown mode? */
+#define MS_pc_patch   0x2e /* Patch code scanning */
+#define MS_pc_counter 0x2f /* Page number and counter reset */
+#define MS_pc_autocolor 0x32 /* Automatic color detection */
 #define MS_pc_prepick 0x33 /* Prepick next adf page */
 #define MS_pc_sleep   0x34 /* Sleep mode */
 #define MS_pc_duplex  0x35 /* ADF duplex transfer mode */

backend/fujitsu.c

@@ -497,6 +497,10 @@
          - moved page width/height to start of geometry group
          - use mode to pick resolution list v/s range
          - improved M3091 resolution choices
+      v109 2011-12-20, MAN
+         - added some MS and INQ information
+         - increased default buffer size for later machines in config file
+         - renamed new fi-6xx0Z models
 
    SANE FLOW DIAGRAM
 
@@ -546,7 +550,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define BUILD 108
+#define BUILD 109
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -1339,6 +1343,8 @@ init_vpd (struct fujitsu *s)
           s->buffer_bytes = get_IN_buffer_bytes(in);
           DBG (15, "  buffer bytes: %d\n",s->buffer_bytes);
 
+          DBG (15, "Standard commands\n");
+
           /* std scsi command support byte 26*/
           s->has_cmd_msen10 = get_IN_has_cmd_msen10(in);
           DBG (15, "  mode_sense_10 cmd: %d\n", s->has_cmd_msen10);
@@ -1423,6 +1429,8 @@ init_vpd (struct fujitsu *s)
 
           /* vendor added scsi command support */
           /* FIXME: there are more of these... */
+          DBG (15, "Vendor commands\n");
+
           s->has_cmd_subwindow = get_IN_has_cmd_subwindow(in);
           DBG (15, "  subwindow cmd: %d\n", s->has_cmd_subwindow);
 
@@ -1432,9 +1440,18 @@ init_vpd (struct fujitsu *s)
           s->has_cmd_hw_status = get_IN_has_cmd_hw_status (in);
           DBG (15, "  hardware status cmd: %d\n", s->has_cmd_hw_status);
 
+          s->has_cmd_hw_status_2 = get_IN_has_cmd_hw_status_2 (in);
+          DBG (15, "  hardware status 2 cmd: %d\n", s->has_cmd_hw_status_2);
+
+          s->has_cmd_hw_status_3 = get_IN_has_cmd_hw_status_3 (in);
+          DBG (15, "  hardware status 3 cmd: %d\n", s->has_cmd_hw_status_3);
+
           s->has_cmd_scanner_ctl = get_IN_has_cmd_scanner_ctl(in);
           DBG (15, "  scanner control cmd: %d\n", s->has_cmd_scanner_ctl);
 
+          s->has_cmd_device_restart = get_IN_has_cmd_device_restart(in);
+          DBG (15, "  device restart cmd: %d\n", s->has_cmd_device_restart);
+
           /* get threshold, brightness and contrast ranges. */
           s->brightness_steps = get_IN_brightness_steps(in);
           DBG (15, "  brightness steps: %d\n", s->brightness_steps);
@@ -1555,6 +1572,10 @@ init_vpd (struct fujitsu *s)
               DBG (15, "  vertical overscan: %d\n", s->os_y_basic);
           }
 
+          if (get_IN_page_length (in) > 0x68) {
+              /*lots of additional params here*/
+          }
+
           ret = SANE_STATUS_GOOD;
       }
       /*FIXME no vendor vpd, set some defaults? */
@@ -1607,8 +1628,8 @@ init_ms(struct fujitsu *s)
   set_SCSI_opcode(cmd, MODE_SENSE_code);
   set_MSEN_xfer_length (cmd, inLen);
 
-  DBG (35, "init_ms: 32 unknown)\n");
-  set_MSEN_pc(cmd, MS_pc_unknown);
+  DBG (35, "init_ms: autocolor )\n");
+  set_MSEN_pc(cmd, MS_pc_autocolor);
   ret = do_cmd (
     s, 1, 0,
     cmd, cmdLen,
@@ -1616,7 +1637,7 @@ init_ms(struct fujitsu *s)
     in, &inLen
   );
   if(ret == SANE_STATUS_GOOD){
-    s->has_MS_unknown=1;
+    s->has_MS_autocolor=1;
   }
 
   DBG (35, "init_ms: prepick\n");
@@ -1764,7 +1785,7 @@ init_ms(struct fujitsu *s)
 
   IF_DBG (DBG_LEVEL = oldDbg;)
 
-  DBG (15, "  unknown: %d\n", s->has_MS_unknown);
+  DBG (15, "  autocolor: %d\n", s->has_MS_autocolor);
   DBG (15, "  prepick: %d\n", s->has_MS_prepick);
   DBG (15, "  sleep: %d\n", s->has_MS_sleep);
   DBG (15, "  duplex: %d\n", s->has_MS_duplex);

backend/fujitsu.conf.in

@@ -3,8 +3,10 @@
 
 # to set data buffer size, in bytes
 # the value ranges from 4096 - infinity
-# but you may have scanning problems with
-# a value larger than 65536 (the default)
+# but old scanners may have scanning problems
+# with a value larger than 65536 (the default)
+# NOTE: this option is set to a larger value
+# later in this file, for more recent scanners
 option buffer-size 65536
 
 # To search for all FUJITSU scsi devices
@@ -74,6 +76,9 @@ usb 0x04c5 0x1135
 #fi-5530C2
 usb 0x04c5 0x114a
 
+# More recent scanners need a larger buffer for maximum speed
+option buffer-size 262144
+
 #fi-6140
 usb 0x04c5 0x114d
 
@@ -128,16 +133,16 @@ usb 0x04c5 0x11ee
 #fi-6225
 usb 0x04c5 0x11ef
 
-#fi-6145
+#fi-6140Z
 usb 0x04c5 0x11f1
 
-#fi-6245
+#fi-6240Z
 usb 0x04c5 0x11f2
 
-#fi-6135
+#fi-6130Z
 usb 0x04c5 0x11f3
 
-#fi-6235
+#fi-6230Z
 usb 0x04c5 0x11f4
 
 #fi-6110

backend/fujitsu.h

@@ -221,7 +221,10 @@ struct fujitsu
   int has_cmd_subwindow;
   int has_cmd_endorser;
   int has_cmd_hw_status;
+  int has_cmd_hw_status_2;
+  int has_cmd_hw_status_3;
   int has_cmd_scanner_ctl;
+  int has_cmd_device_restart;
 
   /*FIXME: do we need the vendor window param list? */
 
@@ -268,7 +271,7 @@ struct fujitsu
   /* --------------------------------------------------------------------- */
   /* immutable values which are gathered by mode_sense command     */
 
-  int has_MS_unknown;
+  int has_MS_autocolor;
   int has_MS_prepick;
   int has_MS_sleep;
   int has_MS_duplex;

doc/descriptions/fujitsu.desc

@@ -12,9 +12,9 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www.thebility.com/fujitsu/" 
-:version "106"                   ; version of backend
+:version "109"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.22, see sane-fujitsu manpage"
+:comment "Backend updated for SANE release 1.0.23, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
@@ -168,25 +168,25 @@
 :usbid "0x04c5" "0x11ef"
 :comment "small, unreleased"
 
-:model "fi-6145"
+:model "fi-6140Z"
 :interface "USB"
 :status :untested
 :usbid "0x04c5" "0x11f1"
 :comment "small, unreleased"
 
-:model "fi-6245"
+:model "fi-6240Z"
 :interface "USB"
 :status :untested
 :usbid "0x04c5" "0x11f2"
 :comment "small, unreleased"
 
-:model "fi-6135"
+:model "fi-6130Z"
 :interface "USB"
 :status :untested
 :usbid "0x04c5" "0x11f3"
 :comment "small, unreleased"
 
-:model "fi-6235"
+:model "fi-6230Z"
 :interface "USB"
 :status :untested
 :usbid "0x04c5" "0x11f4"