Re: Canon scanner patches

[Petr Janda <elekktretterr@xxxxxxxxxxxxxx>]

Ok, formatting was ok this time, but I noticed my patches have an 
absolute path, so ive done them again.

Please tell me if they apply cleanly to HEAD since Im using DF 1.4.4.
--- sys/bus/usb/usbdevs.h.orig	2006-06-22 17:07:56.000000000 +1000
+++ 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 N1220U */
 #define	USB_PRODUCT_CANON_N676U	0x220d		/* CanoScan N676U */
+#define USB_PRODUCT_CANON_D660U 0x2208          /* CanoScan D660U */
 #define	USB_PRODUCT_CANON_N1240U	0x220e		/* CanoScan N1240U */
 #define	USB_PRODUCT_CANON_S10	0x3041		/* PowerShot S10 */
 #define	USB_PRODUCT_CANON_S20	0x3043		/* PowerShot S20 */

--- sys/dev/usbmisc/uscanner/uscanner.c.orig	2006-06-22 17:02:59.000000000 +1000
+++ sys/dev/usbmisc/uscanner/uscanner.c	2006-06-22 04:50:16.000000000 +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 },

--- sys/bus/usb/usbdevs.orig	2006-06-22 17:06:05.000000000 +1000
+++ 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