diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-07-03 03:59:18 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-07-03 03:59:18 +0000 |
| commit | ef028b2fac50f29ad9db7a6e59de228a1c13ea76 (patch) | |
| tree | 6561605fb0fb34d75a51ce94e51b54d512347753 /sys/dev | |
| parent | e2df4549a1a3317e395a8eb72d4bdf909b51822f (diff) | |
No more ss(4) or usscanner(4). Unused, unloved and unmaintained.
General huzzahs.
"go for it" deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/files.usb | 7 | ||||
| -rw-r--r-- | sys/dev/usb/uscanner.c | 19 |
2 files changed, 2 insertions, 24 deletions
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index 4779312f4ab..741ed827d35 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -1,4 +1,4 @@ -# $OpenBSD: files.usb,v 1.90 2010/03/20 21:05:42 matthieu Exp $ +# $OpenBSD: files.usb,v 1.91 2010/07/03 03:59:17 krw Exp $ # $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $ # # Config file and device description for machine-independent USB code. @@ -290,11 +290,6 @@ device uscanner attach uscanner at uhub file dev/usb/uscanner.c uscanner needs-flag -# Avision SCSI over USB, HP5300 -device usscanner: scsi -attach usscanner at uhub -file dev/usb/usscanner.c usscanner - # Prism3 WI @ USB attach wi at uhub with wi_usb file dev/usb/if_wi_usb.c wi_usb diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 7954816ea4b..839bf4d76d8 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscanner.c,v 1.41 2009/10/13 19:33:19 pirofti Exp $ */ +/* $OpenBSD: uscanner.c,v 1.42 2010/07/03 03:59:17 krw Exp $ */ /* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */ /* @@ -108,26 +108,9 @@ static const struct uscan_info uscanner_devs[] = { {{ USB_VENDOR_HP, USB_PRODUCT_HP_4300C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_S20 }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_5200C }, 0 }, -#if 0 - /* Handled by usscanner */ - {{ USB_VENDOR_HP, USB_PRODUCT_HP_5300C }, 0 }, -#endif {{ USB_VENDOR_HP, USB_PRODUCT_HP_6200C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_6300C }, 0 }, -#if 0 - /* XXX Should be handled by usscanner */ - /* Microtek */ - {{ USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2 }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6 }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL2 }, 0 }, - {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6UL }, 0 }, -#endif - /* Mustek */ {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU }, 0 }, {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F }, 0 }, |