diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-07-01 10:33:13 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-07-01 10:33:13 +0000 |
| commit | 3d85c36540028a38d34afb75674fd5b4f0a8c10d (patch) | |
| tree | 31f4ccc9310047ae8013d5e076c7d321ac246d3a /sys/dev/usb | |
| parent | d92c962dc3225f3ed8bc90cd582a6fad020b1518 (diff) | |
More Canon scanners, from NetBSD via Matthieu Baptiste.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/usbdevs | 4 | ||||
| -rw-r--r-- | sys/dev/usb/uscanner.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index dcaac00b120..a423170a4d4 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,4 @@ -$OpenBSD: usbdevs,v 1.204 2006/06/27 09:19:09 jsg Exp $ +$OpenBSD: usbdevs,v 1.205 2006/07/01 10:33:12 miod Exp $ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ /* @@ -754,7 +754,9 @@ product BTC BTC7932 0x6782 Keyboard/Mouse /* 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 diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index a0405fbe10f..3fe6035305f 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscanner.c,v 1.20 2006/06/23 06:27:12 miod Exp $ */ +/* $OpenBSD: uscanner.c,v 1.21 2006/07/01 10:33:12 miod Exp $ */ /* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */ /* @@ -107,6 +107,9 @@ static const struct uscan_info uscanner_devs[] = { /* 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 }, |