summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoraugustss <augustss@NetBSD.org>2001-01-07 14:46:31 +0000
committeraugustss <augustss@NetBSD.org>2001-01-07 14:46:31 +0000
commit6d5a1918f85da0ffc6b9736a9a17ec0105e2e328 (patch)
treeb956c5ce0c029555d274621fe1b8992b3e60fb3b /sys/dev
parent2e7677dc496d72f49334004c3f762ae9d0115014 (diff)
Add Epson 1640 scanner. (From FreeBSD)
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usbdevs5
-rw-r--r--sys/dev/usb/uscanner.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index b868ae7c375..aa8baaa0722 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.138 2001/01/02 09:52:55 augustss Exp $
+$NetBSD: usbdevs,v 1.139 2001/01/07 14:46:31 augustss Exp $
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -454,7 +454,8 @@ product EPSON PRINTER5 0x0005 USB Printer
product EPSON 636 0x0101 Perfection 636U / 636Photo scanner
product EPSON 610 0x0103 Perfection 610 scanner
product EPSON 1200 0x0104 Perfection 1200U / 1200Photo scanner
-product EPSON 1600 0x0107 Expression 1600
+product EPSON 1600 0x0107 Expression 1600 scanner
+product EPSON 1640 0x010a Perfection 1640SU scanner
/* e-TEK Labs products */
product ETEK 1COM 0x8007 Serial port
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index d8925e4e5af..a57be18b0c0 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.10 2001/01/01 18:52:05 augustss Exp $ */
+/* $NetBSD: uscanner.c,v 1.11 2001/01/07 14:46:31 augustss Exp $ */
/* $FreeBSD$ */
/*
@@ -148,6 +148,7 @@ static const struct scanner_id {
{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610 },
{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200 },
{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600 },
+ { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640 },
/* UMAX */
{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U },