diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2007-11-10 17:30:27 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2007-11-10 17:30:27 +0000 |
| commit | 5cbbc43764a33c4219509bfe7e19d987d01d4a32 (patch) | |
| tree | 335e80fb9f792d061b37d0b80111ebf0c4c4d997 /sys/dev/usb | |
| parent | 5fb41c9502f9abb63c336a0462707f4743dcbed7 (diff) | |
- add support for more multifunction Epson devices (from FreeBSD and SANE).
I'm not adding any new !MF USB scanner IDs as those can be handled using
libusb and sane-backends (from ports).
- bring the uscanner man page up-to-date with actually supported scanners
ok winiger@ mbalmer@ jmc@, input and ok jsg@
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/usbdevs | 7 | ||||
| -rw-r--r-- | sys/dev/usb/uscanner.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 45be230a2af..0be6f5ba164 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,4 @@ -$OpenBSD: usbdevs,v 1.308 2007/11/06 17:25:15 ajacoutot Exp $ +$OpenBSD: usbdevs,v 1.309 2007/11/10 17:30:26 ajacoutot Exp $ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ /* @@ -1118,7 +1118,10 @@ product EPSON 1260 0x011d Perfection 1260 product EPSON 1660 0x011e Perfection 1660 product EPSON 1670 0x011f Perfection 1670 product EPSON CX3650 0x080e Stylus CX3650 -product EPSON DX3850 0x082f Stylus DX3850 / DX4050 +product EPSON DX3800 0x0818 Stylus DX3800 +product EPSON DX4000 0x082f Stylus DX4000 +product EPSON DX5000 0x082b Stylus DX5000 +product EPSON DX6000 0x082e Stylus DX6000 /* e-TEK Labs products */ product ETEK 1COM 0x8007 Serial diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index f34f26bb48b..eb5293939cf 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscanner.c,v 1.37 2007/11/06 17:25:15 ajacoutot Exp $ */ +/* $OpenBSD: uscanner.c,v 1.38 2007/11/10 17:30:26 ajacoutot Exp $ */ /* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */ /* @@ -176,7 +176,10 @@ static const struct uscan_info uscanner_devs[] = { {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2400 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX3850 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX3800 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX4000 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX5000 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX6000 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN }, /* UMAX */ |