SEO

Hi,

This diff add support for more Canon scanners in -current (from
NetBSD). Tested on i386 with a CanoScan Lide 30:

mattieu@vosgien: ~ $ usbdevs
addr 1: UHCI root hub, Intel
addr 1: UHCI root hub, Intel
addr 2: CanoScan, Canon
addr 1: UHCI root hub, Intel
addr 2: Biometric Coprocessor, STMicroelectronics
addr 1: UHCI root hub, Intel
addr 1: EHCI root hub, Intel
addr 2: OneTouch, Maxtor
mattieu@vosgien: ~ $ dmesg | grep uscanner
uscanner0 at uhub1 port 2ugen0 at uhub2 port 2
uscanner0: Canon CanoScan, rev 1.10/1.00, addr 2


--- usbdevs Sat Jul 1 11:15:23 2006
+++ usbdevs.test Sat Jul 1 11:14:55 2006
@@ -754,7 +754,9 @@

/* Canon, Inc. products */
product CANON N656U 0x2206 CANOSCAN N656U
+product CANON N1220U 0x2207 CANOSCAN N1220U
product CANON N670U 0x220d CANOSCAN N670U
+product CANON N1240U 0x220e CANOSCAN N1240U
product CANON S10 0x3041 PowerShot S10
product CANON S20 0x3043 PowerShot S20
product CANON S100_US 0x3045 PowerShot S100

--- uscanner.c Sat Jul 1 11:10:13 2006
+++ uscanner.c.test Sat Jul 1 11:19:35 2006
@@ -107,6 +107,9 @@

/* Canon */
{{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U }, 0 },
+ {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N670U }, 0 },
+ {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1220U }, 0 },
+ {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U }, 0 },

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




--
Mattieu Baptiste
"/earth is 102% full ... please delete anyone you can."