summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2003-01-27 00:31:01 +0000
committerwiz <wiz@NetBSD.org>2003-01-27 00:31:01 +0000
commitb091df0ed2b972c11d951af20fff61fea6c4afb7 (patch)
tree37feed6b05b0ebef731a2bdd3911faa7f166d43f /sys/dev
parent430723285073b70bdfa78835321657052dec0ddb (diff)
regen (CANOSCAN N670U).
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usbdevs.h5
-rw-r--r--sys/dev/usb/usbdevs_data.h10
-rw-r--r--sys/dev/usb/uscanner.c5
3 files changed, 14 insertions, 6 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 5b06a5ba59a..610b8ea7f97 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.300 2003/01/24 01:51:09 tsarna Exp $ */
+/* $NetBSD: usbdevs.h,v 1.301 2003/01/27 00:31:01 wiz Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.295 2003/01/24 01:49:22 tsarna Exp
+ * NetBSD: usbdevs,v 1.296 2003/01/27 00:29:31 wiz Exp
*/
/*
@@ -521,6 +521,7 @@
/* Canon, Inc. products */
#define USB_PRODUCT_CANON_N656U 0x2206 /* CANOSCAN N656U */
+#define USB_PRODUCT_CANON_N670U 0x220d /* CANOSCAN N670U */
#define USB_PRODUCT_CANON_S10 0x3041 /* PowerShot S10 */
#define USB_PRODUCT_CANON_S20 0x3043 /* PowerShot S20 */
#define USB_PRODUCT_CANON_S100_US 0x3045 /* PowerShot S100 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 7aecef838e3..306af118fcc 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.301 2003/01/24 01:51:09 tsarna Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.302 2003/01/27 00:31:01 wiz Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.295 2003/01/24 01:49:22 tsarna Exp
+ * NetBSD: usbdevs,v 1.296 2003/01/27 00:29:31 wiz Exp
*/
/*
@@ -574,6 +574,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"CANOSCAN N656U",
},
{
+ USB_VENDOR_CANON, USB_PRODUCT_CANON_N670U,
+ 0,
+ "Canon",
+ "CANOSCAN N670U",
+ },
+ {
USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
0,
"Canon",
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 2910dcb225e..a576dd41b98 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.38 2003/01/15 13:35:55 augustss Exp $ */
+/* $NetBSD: uscanner.c,v 1.39 2003/01/27 00:31:02 wiz Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.38 2003/01/15 13:35:55 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.39 2003/01/27 00:31:02 wiz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,6 +112,7 @@ static const struct uscan_info uscanner_devs[] = {
/* Canon */
{{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U }, 0 },
+ {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N670U }, 0 },
/* Kye */
{{ USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO }, 0 },