diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-01-28 09:43:44 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-01-28 09:43:44 +0000 |
| commit | 068c901929c8e128152d9695e219c78a5c15d162 (patch) | |
| tree | 2d13c329b2bb4222759f39870f2dbeb46cd477a5 /sys/dev/usb/uscanner.c | |
| parent | c4aeeb204ccb14898a9115b35ae590f15a16124f (diff) | |
Another USB sync with NetBSD. We are still lacking an up-to-date umass(4)
driver. I would appreciate it if someone with the hardware looked into it.
I also have to take a closer look at changes to the USB Ethernet drivers,
as well as import some drivers we are missing (uftdi, if_upl, yap, etc.)
Diffstat (limited to 'sys/dev/usb/uscanner.c')
| -rw-r--r-- | sys/dev/usb/uscanner.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 5d5b9c6f702..fb5de01ddd4 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uscanner.c,v 1.1 2000/11/16 19:40:17 aaron Exp $ */ -/* $NetBSD: uscanner.c,v 1.9 2000/11/14 13:57:16 augustss Exp $ */ +/* $OpenBSD: uscanner.c,v 1.2 2001/01/28 09:43:43 aaron Exp $ */ +/* $NetBSD: uscanner.c,v 1.11 2001/01/07 14:46:32 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -102,14 +102,18 @@ static const struct scanner_id { { USB_VENDOR_HP, USB_PRODUCT_HP_4200C }, { USB_VENDOR_HP, USB_PRODUCT_HP_S20 }, { USB_VENDOR_HP, USB_PRODUCT_HP_5200C }, +#if 0 { USB_VENDOR_HP, USB_PRODUCT_HP_5300C }, +#endif { USB_VENDOR_HP, USB_PRODUCT_HP_6200C }, { USB_VENDOR_HP, USB_PRODUCT_HP_6300C }, /* Avision */ { USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U }, +#if 0 /* Microtek */ + { USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX }, { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U }, { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX }, { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2 }, @@ -117,6 +121,7 @@ static const struct scanner_id { { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL }, { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL2 }, { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6UL }, +#endif /* Mustek */ { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU }, @@ -144,6 +149,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 }, @@ -632,11 +638,7 @@ USB_DETACH(uscanner) } int -#if defined(__OpenBSD__) -uscannerselect(dev, events, p) -#else uscannerpoll(dev, events, p) -#endif dev_t dev; int events; struct proc *p; |