canon_dr backend v47

initial DR-G1130 support
add usb ids for many recent scanners

backend/canon_dr.c

@@ -303,6 +303,8 @@
          - split debug level 30 into two levels
          - simplify jpeg ifdefs
          - add support for DR-M160
+      v47 2014-07-07, MAN
+         - initial DR-G1130 support
 
    SANE FLOW DIAGRAM
 
@@ -352,7 +354,7 @@
 #include "canon_dr.h"
 
 #define DEBUG 1
-#define BUILD 46
+#define BUILD 47
 
 /* values for SANE_DEBUG_CANON_DR env var:
  - errors           5
@@ -1269,6 +1271,7 @@ init_model (struct scanner *s)
     || strstr (s->model_name,"DR-7550")
     || strstr (s->model_name,"DR-6050")
     || strstr (s->model_name,"DR-G1100")
+    || strstr (s->model_name,"DR-G1130")
   ){
 
     /*missing*/

backend/canon_dr.conf.in

@@ -149,12 +149,56 @@ option extra-status 1
 option duplex-offset 400
 usb 0x1083 0x163f
 
+# DR-C125
+usb 0x1083 0x1640
+
+# DR-P215
+usb 0x1083 0x1641
+
 # P-215
 usb 0x1083 0x1646
 
+# FSU-201
+usb 0x1083 0x1648
+
+# DR-C130
+usb 0x1083 0x164a
+
+# DR-P208
+usb 0x1083 0x164b
+
 # P-208
 usb 0x1083 0x164c
 
+# DR-G1130
+usb 0x1083 0x164f
+
 # DR-G1100
 usb 0x1083 0x1650
 
+# DR-C120
+usb 0x1083 0x1651
+
+# P-201
+usb 0x1083 0x1652
+
+# DR-F120
+usb 0x1083 0x1654
+
+# DR-M1060
+usb 0x1083 0x1657
+
+# DR-C225
+usb 0x1083 0x1658
+
+# DR-P215II
+usb 0x1083 0x1659
+
+# P-215II
+usb 0x1083 0x165b
+
+# DR-P208II
+usb 0x1083 0x165d
+
+# P-208II
+usb 0x1083 0x165f

doc/descriptions/canon_dr.desc

@@ -11,7 +11,7 @@
 
 :backend "canon_dr"              ; name of backend
 :url "http://www.thebility.com/canon/" 
-:version "41"                    ; version of backend
+:version "47"                    ; version of backend
 :manpage "sane-canon_dr"         ; name of manpage (if it exists)
 :comment "Backend updated for SANE release 1.0.25, see sane-canon_dr manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -265,15 +265,30 @@
 :status :untested
 :comment "Please test!"
 
+:model "DR-C120"
+:interface "USB"
+:usbid "0x1083" "0x1651"
+:status :untested
+
 :model "DR-C125"
 :interface "USB"
-;:usbid "0x1083" "0x"
+:usbid "0x1083" "0x1640"
 :status :untested
 :comment "Similar protocol to other canon_dr machines, but unsupported image format."
 
 :model "DR-C130"
 :interface "USB"
-;:usbid "0x1083" "0x"
+:usbid "0x1083" "0x164a"
+:status :untested
+
+:model "DR-C225"
+:interface "USB"
+:usbid "0x1083" "0x1658"
+:status :untested
+
+:model "DR-F120"
+:interface "USB"
+:usbid "0x1083" "0x1654"
 :status :untested
 
 :model "DR-G1100"
@@ -283,7 +298,7 @@
 
 :model "DR-G1130"
 :interface "USB"
-;:usbid "0x1083" "0x"
+:usbid "0x1083" "0x164f"
 :status :untested
 
 :model "DR-M140"
@@ -296,6 +311,16 @@
 :usbid "0x1083" "0x163e"
 :status :good
 
+:model "DR-M160II"
+:interface "USB"
+;:usbid "0x1083" "0x"
+:status :untested
+
+:model "DR-M1060"
+:interface "USB"
+:usbid "0x1083" "0x1657"
+:status :untested
+
 :model "P-150"
 :interface "USB"
 ;:usbid "0x1083" "0x"
@@ -306,15 +331,57 @@
 ;:usbid "0x1083" "0x"
 :status :untested
 
+:model "P-201"
+:interface "USB"
+:usbid "0x1083" "0x1652"
+:status :untested
+
+:model "DR-P208"
+:interface "USB"
+:usbid "0x1083" "0x164b"
+:status :untested
+:comment "Same as P-208?"
+
 :model "P-208"
 :interface "USB"
 :usbid "0x1083" "0x164c"
 :status :basic
 :comment "All modes and resolutions working, but calibration is poor."
 
+:model "DR-P208II"
+:interface "USB"
+:usbid "0x1083" "0x165d"
+:status :untested
+
+:model "P-208II"
+:interface "USB"
+:usbid "0x1083" "0x165f"
+:status :untested
+
+:model "DR-P215"
+:interface "USB"
+:usbid "0x1083" "0x1641"
+:status :untested
+:comment "Same as P-215?"
+
 :model "P-215"
 :interface "USB"
 :usbid "0x1083" "0x1646"
 :status :basic
 :comment "All modes and resolutions working, but calibration is poor. Card reader slot not working."
 
+:model "DR-P215II"
+:interface "USB"
+:usbid "0x1083" "0x1659"
+:status :untested
+
+:model "P-215II"
+:interface "USB"
+:usbid "0x1083" "0x165b"
+:status :untested
+
+:model "FSU-201"
+:interface "USB"
+:usbid "0x1083" "0x1648"
+:status :untested
+