fujitsu backend v129

- br_x and br_y locked to page_width/height until changed
- add USB ID's for fi-6xxxLA and fi-6xxxZLA scanners
- add USB ID's for unsupported SP11xx scanners (genesys based)

backend/fujitsu.c

@@ -579,6 +579,8 @@
          - iX100 has gray and lineart
       v128 2015-11-08, MAN
          - do not ask fi-4340 for serial number
+      v129 2015-11-21, MAN
+         - br_x and br_y locked to page_width/height until changed
 
    SANE FLOW DIAGRAM
 
@@ -628,7 +630,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define BUILD 127
+#define BUILD 129
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -5360,6 +5362,14 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           if (s->page_width == FIXED_MM_TO_SCANNER_UNIT(val_c))
               return SANE_STATUS_GOOD;
 
+          /* if full width image, and paper size is changed,
+             change the image size to match new paper */
+          if (s->tl_x == 0 && s->br_x == s->page_width){
+              DBG (20, "sane_control_option: br_x tracking page_width\n");
+              s->br_x = FIXED_MM_TO_SCANNER_UNIT(val_c);
+              *info |= SANE_INFO_RELOAD_PARAMS;
+          }
+
           s->page_width = FIXED_MM_TO_SCANNER_UNIT(val_c);
           *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
@@ -5368,6 +5378,14 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           if (s->page_height == FIXED_MM_TO_SCANNER_UNIT(val_c))
               return SANE_STATUS_GOOD;
 
+          /* if full height image, and paper size is changed,
+             change the image size to match new paper */
+          if (s->tl_y == 0 && s->br_y == s->page_height){
+              DBG (20, "sane_control_option: br_y tracking page_height\n");
+              s->br_y = FIXED_MM_TO_SCANNER_UNIT(val_c);
+              *info |= SANE_INFO_RELOAD_PARAMS;
+          }
+
           s->page_height = FIXED_MM_TO_SCANNER_UNIT(val_c);
           *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;

backend/fujitsu.conf.in

@@ -121,6 +121,9 @@ usb 0x04c5 0x119e
 #S1500 & S1500M
 usb 0x04c5 0x11a2
 
+#fi-6125
+usb 0x04c5 0x11ee
+
 #fi-6140Z
 usb 0x04c5 0x11f1
 
@@ -160,3 +163,33 @@ usb 0x04c5 0x132f
 #ScanSnap iX100
 usb 0x04c5 0x13f4
 
+#fi-6140ZLA
+usb 0x04c5 0x145f
+
+#fi-6240ZLA
+usb 0x04c5 0x1460
+
+#fi-6130ZLA
+usb 0x04c5 0x1461
+
+#fi-6230ZLA
+usb 0x04c5 0x1462
+
+#fi-6125ZLA
+usb 0x04c5 0x1463
+
+#fi-6225ZLA
+usb 0x04c5 0x1464
+
+#fi-6135ZLA
+usb 0x04c5 0x146b
+
+#fi-6235ZLA
+usb 0x04c5 0x146c
+
+#fi-6120ZLA
+usb 0x04c5 0x146d
+
+#fi-6220ZLA
+usb 0x04c5 0x146e
+

doc/descriptions/fujitsu.desc

@@ -12,7 +12,7 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www.thebility.com/fujitsu/" 
-:version "127"                   ; version of backend
+:version "129"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
 :comment "Backend updated for SANE release 1.0.25, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -131,6 +131,12 @@
 :usbid "0x04c5" "0x116f"
 :comment "small, recent, discontinued"
 
+:model "fi-6125"
+:interface "USB"
+:status :complete
+:usbid "0x04c5" "0x11ee"
+:comment "small, recent, discontinued"
+
 :model "fi-6130"
 :interface "USB"
 :status :complete
@@ -155,6 +161,42 @@
 :usbid "0x04c5" "0x11f4"
 :comment "small, recent, discontinued"
 
+:model "fi-6120ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146d"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6220ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146e"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6125ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1463"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6225ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1464"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6130ZLA"
+:interface "SCSI USB"
+:status :complete
+:usbid "0x04c5" "0x1461"
+:comment "small, recent, discontinued"
+
+:model "fi-6230ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1462"
+:comment "small, recent, discontinued, expected to work"
+
 :model "ScanSnap S1500"
 :interface "USB"
 :status :complete
@@ -331,6 +373,30 @@
 :usbid "0x04c5" "0x11f2"
 :comment "medium, recent, discontinued"
 
+:model "fi-6135ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146b"
+:comment "medium, recent, discontinued, expected to work"
+
+:model "fi-6235ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146c"
+:comment "medium, recent, discontinued, expected to work"
+
+:model "fi-6140ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x145f"
+:comment "medium, recent, discontinued, expected to work"
+
+:model "fi-6240ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1460"
+:comment "medium, recent, discontinued, expected to work"
+
 ;==================================================
 ; CURRENT MODELS, MEDIUM
 

doc/descriptions/unsupported.desc

@@ -667,6 +667,28 @@
 :status :unsupported
 :comment "Probably unsupported. "
 
+;********************************************************************************************
+:mfg "Fujitsu"
+:url "http://www.fujitsu.com/"
+
+:model "SP1120"
+:interface "USB"
+:usbid "0x04c5" "0x1473"
+:status :unsupported
+:comment "Genesys GL310 chipset, not supported by sane-genesys backend."
+
+:model "SP1125"
+:interface "USB"
+:usbid "0x04c5" "0x1475"
+:status :unsupported
+:comment "Genesys GL310 chipset, not supported by sane-genesys backend."
+
+:model "SP1130"
+:interface "USB"
+:usbid "0x04c5" "0x1476"
+:status :unsupported
+:comment "Genesys GL310 chipset, not supported by sane-genesys backend."
+
 ;********************************************************************************************
 
 :mfg "Genius"