Canon scanner patches

[Petr Janda <elekktretterr@xxxxxxxxxxxxxx>]

These are my first patches for DragonFly. I hope they work.

They patch uscanner.c, usbdevs and usbdevs.h and allow Canon scanners 
D660U and N676U to work on DragonFly.

--- /usr/src/sys/dev/usbmisc/uscanner/uscanner.c.orig   2006-06-22 
17:02:59.0000
00000 +1000
+++ /usr/src/sys/dev/usbmisc/uscanner/uscanner.c        2006-06-22 
04:50:16.0000
00000 +1000
@@ -123,6 +123,8 @@

  /* Canon */
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U }, 0 },
+ {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N676U }, 0 },
+ {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_D660U }, 0 },

  /* Kye */
 {{ USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO }, 0 },




--- /usr/src/sys/bus/usb/usbdevs.orig   2006-06-22 17:06:05.000000000 +1000
+++ /usr/src/sys/bus/usb/usbdevs        2006-06-22 03:52:13.000000000 +1000
@@ -746,6 +746,7 @@
product CANON N656U            0x2206  CanoScan N656U
product CANON N1220U           0x2207  CanoScan N1220U
product CANON N676U            0x220d  CanoScan N676U
+product CANON D660U            0x2208  CanoScan D660U
product CANON N1240U           0x220e  CanoScan N1240U
product CANON S10              0x3041  PowerShot S10
product CANON S20              0x3043  PowerShot S20




--- /usr/src/sys/bus/usb/usbdevs.h.orig 2006-06-22 17:07:56.000000000 +1000
+++ /usr/src/sys/bus/usb/usbdevs.h      2006-06-22 04:20:09.000000000 +1000
@@ -753,6 +753,7 @@
#define        USB_PRODUCT_CANON_N656U 0x2206          /* CanoScan N656U */
#define        USB_PRODUCT_CANON_N1220U        0x2207          /* 
CanoScan N122
0U */
#define        USB_PRODUCT_CANON_N676U 0x220d          /* CanoScan N676U */
+#define USB_PRODUCT_CANON_D660U 0x2208          /* CanoScan D660U */
#define        USB_PRODUCT_CANON_N1240U        0x220e          /* 
CanoScan N124
0U */
#define        USB_PRODUCT_CANON_S10   0x3041          /* PowerShot S10 */
#define        USB_PRODUCT_CANON_S20   0x3043          /* PowerShot S20 */