fujitsu: support new fi-6x20

epjitsu: mention new S300M

ChangeLog

@@ -1,3 +1,9 @@
+2008-04-22  m. allan noah <kitno455 a t gmail d o t com>
+	* backend/fujitsu.c, backend/fujitsu.conf.in: backend v1.0.59,
+	add fi-6140 PID, and fi-6x40 color mode
+	* doc/descriptions/fujitsu.desc: add fi-6140 PID, mark as 'good'
+	* doc/descriptions/epjitsu.desc: add S300M, mark as 'untested'
+
 2008-04-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
 	* backend/pixma_mp150.c:
 	Updated pixma backend to have MP970 (tested), and probably other 

backend/fujitsu.c

@@ -291,6 +291,8 @@
          - sane_start() rewritten, shorter, more clear
          - return values are SANE_Status, not int
          - hide unused functions
+      V 1.0.59 2008-04-22, MAN
+         - add fi-6140 usb ID, and fi-6x40 color mode
 
    SANE FLOW DIAGRAM
 
@@ -351,7 +353,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define BUILD 58 
+#define BUILD 59 
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -619,6 +621,9 @@ find_scanners ()
       DBG (15, "find_scanners: looking for 'usb 0x04c5 0x1135'\n");
       sanei_usb_attach_matching_devices("usb 0x04c5 0x1135", attach_one_usb);
 
+      DBG (15, "find_scanners: looking for 'usb 0x04c5 0x114d'\n");
+      sanei_usb_attach_matching_devices("usb 0x04c5 0x114d", attach_one_usb);
+
       DBG (15, "find_scanners: looking for 'usb 0x04c5 0x1155'\n");
       sanei_usb_attach_matching_devices("usb 0x04c5 0x1155", attach_one_usb);
   }
@@ -1515,7 +1520,10 @@ init_model (struct fujitsu *s)
   else if ( strstr (s->product_name, "fi-4340")
    || strstr (s->product_name, "fi-4750")
    || strstr (s->product_name, "fi-5650")
-   || strstr (s->product_name, "fi-5750")) {
+   || strstr (s->product_name, "fi-5750")
+   || strstr (s->product_name, "fi-6140")
+   || strstr (s->product_name, "fi-6240")
+   ) {
 
     /* weirdness */
     s->color_interlace = COLOR_INTERLACE_RRGGBB;

backend/fujitsu.conf.in

@@ -54,11 +54,14 @@ usb 0x04c5 0x10e7
 #fi-5110EOXM
 usb 0x04c5 0x10f2
 
-#scansnap S500
+#ScanSnap S500
 usb 0x04c5 0x10fe
 
-#scansnap S500M
+#ScanSnap S500M
 usb 0x04c5 0x1135
 
-#scansnap S510
+#fi-6140
+usb 0x04c5 0x114d
+
+#ScanSnap S510
 usb 0x04c5 0x1155

doc/descriptions/epjitsu.desc

@@ -12,7 +12,7 @@
 :backend "epjitsu"               ; name of backend
 :url "http://www.thebility.com/epjitsu/" 
 :new :yes
-:version "1.0.10"                ; version of backend
+:version "1.0.11"                ; version of backend
 :manpage "sane-epjitsu"          ; name of manpage (if it exists)
 :comment "Only basic support provided, see sane-epjitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -35,3 +35,7 @@
 :usbid "0x04c5" "0x1156"
 :comment "10 sheet ADF, 150/300 dpi, always scans in triplex color, no TWAIN driver"
 
+:model "ScanSnap S300M"
+:interface "USB"
+:status :untested
+:comment "10 sheet ADF, 150/300 dpi, always scans in triplex color, MAC only"

doc/descriptions/fujitsu.desc

@@ -11,7 +11,7 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www.thebility.com/fujitsu/" 
-:version "1.0.58"                ; version of backend
+:version "1.0.59"                ; 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....
@@ -224,7 +224,8 @@
 
 :model "fi-6140"
 :interface "SCSI USB"
-:status :untested
+:status :good
+:usbid "0x04c5" "0x114d"
 :comment "medium, current"
 
 :model "fi-6240"