From 450012429b6a398c8833f6eeb8543775e597af3d Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sat, 18 Dec 2004 06:22:48 +0000 Subject: [PATCH] Cleanup missing and duplicate defines from the last commit, rename an entry in umass to conform. Reported-by: "Alexander \"alxl\" Lobachov" --- sys/bus/usb/usbdevs | 29 ++++++------ sys/bus/usb/usbdevs.h | 31 ++++++------ sys/bus/usb/usbdevs_data.h | 88 ++++++++++++++++------------------- sys/dev/usbmisc/umass/umass.c | 4 +- 4 files changed, 70 insertions(+), 82 deletions(-) diff --git a/sys/bus/usb/usbdevs b/sys/bus/usb/usbdevs index aba711bf9d..6bf8a42f5c 100644 --- a/sys/bus/usb/usbdevs +++ b/sys/bus/usb/usbdevs @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $ - * $DragonFly: src/sys/bus/usb/Attic/usbdevs,v 1.13 2004/12/17 20:50:46 dillon Exp $ + * $DragonFly: src/sys/bus/usb/Attic/usbdevs,v 1.14 2004/12/18 06:22:47 dillon Exp $ * $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $ */ @@ -196,7 +196,7 @@ vendor ELAN 0x04f3 Elan Microelectronics vendor NEWNEX 0x04f7 Newnex Technology vendor BROTHER 0x04f9 Brother Industries vendor DALLAS 0x04fa Dallas Semiconductor -vendor SUNPLUS 0x04fc Sunplus Technology +vendor AIPTEK2 0x04fc AIPTEK International vendor PFU 0x04fe PFU Ltd vendor FUJIKURA 0x0501 Fujikura/DDK vendor ACER 0x0502 Acer @@ -320,7 +320,7 @@ vendor AIWA 0x0677 Aiwa vendor ACARD 0x0678 ACARD Technology vendor PROLIFIC 0x067b Prolific Technology vendor SIEMENS 0x067c Siemens -vendor ADVANCELOGIC 0x0680 Avance Logic +vendor AVANCELOGIC 0x0680 Avance Logic vendor HAGIWARA 0x0693 Hagiwara Sys-Com vendor MINOLTA 0x0686 Minolta vendor CHPRODUCTS 0x068e CH Products @@ -343,6 +343,7 @@ vendor SMC 0x0707 Standard Microsystems vendor PUTERCOM 0x0708 Putercom vendor MCT 0x0711 MCT vendor IMATION 0x0718 Imation +vendor SUSTEEN 0x0731 Susteen vendor SONYERICSSON 0x0731 Sony Ericsson vendor EICON 0x0734 Eicon Networks vendor DIGITALSTREAM 0x074e Digital Stream @@ -471,6 +472,7 @@ vendor LUWEN 0x0c76 EasyDisk vendor ZCOM 0x0cde Z-Com vendor TANGTOP 0x0d3d Tangtop vendor SMC3 0x0d5c Standard Microsystems +vendor PEN 0x0d7d Pen Drive vendor PNY 0x0d7d PNY vendor ACDC 0x0d7e American Computer & Digital Components vendor ABC 0x0d8c ABC @@ -1209,30 +1211,28 @@ product KENSINGTON ORBIT_MAC 0x1009 Orbit USB trackball for Mac product KENSINGTON VIDEOCAM_VGA 0x5002 VideoCAM VGA /* Keyspan products */ -product KEYSPAN USA28 0x0101 USA-28 serial adapter -product KEYSPAN USA28X 0x0102 USA-28X serial adapter -product KEYSPAN USA19 0x0103 USA-19 serial adapter +product KEYSPAN USA18 0x0111 USA-18 serial adapter product KEYSPAN USA18_NF 0x0104 USA-18 serial adapter (no firmware) -product KEYSPAN USA18X 0x0105 USA-18X serial adapter -product KEYSPAN USA19W 0x0106 USA-19W serial adapter +product KEYSPAN USA18X 0x0112 USA-18X serial adapter +product KEYSPAN USA18X_NF 0x0105 USA-18X serial adapter +product KEYSPAN USA19W_NF 0x0106 USA-19W serial adapter product KEYSPAN USA19 0x0107 USA-19 serial adapter product KEYSPAN USA19W 0x0108 USA-19W serial adapter -product KEYSPAN USA49W 0x0109 USA-49W serial adapter +product KEYSPAN USA49W_NF 0x0109 USA-49W serial adapter product KEYSPAN USA49W 0x010a USA-49W serial adapter product KEYSPAN USA19QI_NF 0x010b USA-19QI serial adapter (no firmware) product KEYSPAN USA19QI 0x010c USA-19QI serial adapter product KEYSPAN USA19Q_NF 0x010d USA-19Q serial adapter (no firmware) product KEYSPAN USA19Q 0x010e USA-19Q serial adapter product KEYSPAN USA28 0x010f USA-28 serial adapter +product KEYSPAN USA28X 0x0102 USA-28X serial adapter product KEYSPAN USA28XXB 0x0110 USA-28X/XB serial adapter -product KEYSPAN USA18 0x0111 USA-18 serial adapter -product KEYSPAN USA18X 0x0112 USA-18X serial adapter product KEYSPAN USA28XB_NF 0x0113 USA-28XB serial adapter (no firmware) product KEYSPAN USA28XA_NF 0x0114 USA-28XB serial adapter (no firmware) product KEYSPAN USA28XA 0x0115 USA-28XA serial adapter product KEYSPAN USA18XA_NF 0x0116 USA-18XA serial adapter (no firmware) product KEYSPAN USA18XA 0x0117 USA-18XA serial adapter -product KEYSPAN USA19QW 0x0118 USA-19QW serial adapter +product KEYSPAN USA19QW_NF 0x0118 USA-19QW serial adapter product KEYSPAN USA19QW 0x0119 USA-19WQ serial adapter product KEYSPAN UIA10 0x0201 UIA-10 remote control product KEYSPAN UIA11 0x0202 UIA-11 remote control @@ -1610,9 +1610,6 @@ product PLEXTOR 40_12_40U 0x0011 PlexWriter 40/12/40U /* PLX products */ product PLX TESTBOARD 0x9060 test board -/* PNY products */ -product PNY ATTACHE 0x1300 USB 2.0 Flash Drive - /* PointChips */ product POINTCHIPS FLASH 0x8001 Flash @@ -1834,7 +1831,7 @@ product SONY CLIE_NX60 0x00da Sony Clie nx60 product SONY CLIE_TJ25 0x0169 Sony Clie tj25 /* Sony Ericsson products */ -product SONYERICSSON DCU10 0x0528 USB Cable +product SUSTEEN DCU10 0x0528 USB Cable /* SOURCENEXT products */ product SOURCENEXT KEIKAI8 0x039f KeikaiDenwa 8 diff --git a/sys/bus/usb/usbdevs.h b/sys/bus/usb/usbdevs.h index 56ebdf1ea6..44d778e1cc 100644 --- a/sys/bus/usb/usbdevs.h +++ b/sys/bus/usb/usbdevs.h @@ -1,5 +1,5 @@ /* - * $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.10 2004/12/17 20:50:46 dillon Exp $ + * $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.11 2004/12/18 06:22:47 dillon Exp $ * * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * @@ -41,7 +41,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $ - * $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.10 2004/12/17 20:50:46 dillon Exp $ + * $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.11 2004/12/18 06:22:47 dillon Exp $ * $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $ */ @@ -202,7 +202,7 @@ #define USB_VENDOR_NEWNEX 0x04f7 /* Newnex Technology */ #define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries */ #define USB_VENDOR_DALLAS 0x04fa /* Dallas Semiconductor */ -#define USB_VENDOR_SUNPLUS 0x04fc /* Sunplus Technology */ +#define USB_VENDOR_AIPTEK2 0x04fc /* AIPTEK International */ #define USB_VENDOR_PFU 0x04fe /* PFU Ltd */ #define USB_VENDOR_FUJIKURA 0x0501 /* Fujikura/DDK */ #define USB_VENDOR_ACER 0x0502 /* Acer */ @@ -326,7 +326,7 @@ #define USB_VENDOR_ACARD 0x0678 /* ACARD Technology */ #define USB_VENDOR_PROLIFIC 0x067b /* Prolific Technology */ #define USB_VENDOR_SIEMENS 0x067c /* Siemens */ -#define USB_VENDOR_ADVANCELOGIC 0x0680 /* Avance Logic */ +#define USB_VENDOR_AVANCELOGIC 0x0680 /* Avance Logic */ #define USB_VENDOR_HAGIWARA 0x0693 /* Hagiwara Sys-Com */ #define USB_VENDOR_MINOLTA 0x0686 /* Minolta */ #define USB_VENDOR_CHPRODUCTS 0x068e /* CH Products */ @@ -349,6 +349,7 @@ #define USB_VENDOR_PUTERCOM 0x0708 /* Putercom */ #define USB_VENDOR_MCT 0x0711 /* MCT */ #define USB_VENDOR_IMATION 0x0718 /* Imation */ +#define USB_VENDOR_SUSTEEN 0x0731 /* Susteen */ #define USB_VENDOR_SONYERICSSON 0x0731 /* Sony Ericsson */ #define USB_VENDOR_EICON 0x0734 /* Eicon Networks */ #define USB_VENDOR_DIGITALSTREAM 0x074e /* Digital Stream */ @@ -477,6 +478,7 @@ #define USB_VENDOR_ZCOM 0x0cde /* Z-Com */ #define USB_VENDOR_TANGTOP 0x0d3d /* Tangtop */ #define USB_VENDOR_SMC3 0x0d5c /* Standard Microsystems */ +#define USB_VENDOR_PEN 0x0d7d /* Pen Drive */ #define USB_VENDOR_PNY 0x0d7d /* PNY */ #define USB_VENDOR_ACDC 0x0d7e /* American Computer & Digital Components */ #define USB_VENDOR_ABC 0x0d8c /* ABC */ @@ -1215,30 +1217,28 @@ #define USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA 0x5002 /* VideoCAM VGA */ /* Keyspan products */ -#define USB_PRODUCT_KEYSPAN_USA28 0x0101 /* USA-28 serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA28X 0x0102 /* USA-28X serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19 0x0103 /* USA-19 serial adapter */ +#define USB_PRODUCT_KEYSPAN_USA18 0x0111 /* USA-18 serial adapter */ #define USB_PRODUCT_KEYSPAN_USA18_NF 0x0104 /* USA-18 serial adapter (no firmware) */ -#define USB_PRODUCT_KEYSPAN_USA18X 0x0105 /* USA-18X serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19W 0x0106 /* USA-19W serial adapter */ +#define USB_PRODUCT_KEYSPAN_USA18X 0x0112 /* USA-18X serial adapter */ +#define USB_PRODUCT_KEYSPAN_USA18X_NF 0x0105 /* USA-18X serial adapter */ +#define USB_PRODUCT_KEYSPAN_USA19W_NF 0x0106 /* USA-19W serial adapter */ #define USB_PRODUCT_KEYSPAN_USA19 0x0107 /* USA-19 serial adapter */ #define USB_PRODUCT_KEYSPAN_USA19W 0x0108 /* USA-19W serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA49W 0x0109 /* USA-49W serial adapter */ +#define USB_PRODUCT_KEYSPAN_USA49W_NF 0x0109 /* USA-49W serial adapter */ #define USB_PRODUCT_KEYSPAN_USA49W 0x010a /* USA-49W serial adapter */ #define USB_PRODUCT_KEYSPAN_USA19QI_NF 0x010b /* USA-19QI serial adapter (no firmware) */ #define USB_PRODUCT_KEYSPAN_USA19QI 0x010c /* USA-19QI serial adapter */ #define USB_PRODUCT_KEYSPAN_USA19Q_NF 0x010d /* USA-19Q serial adapter (no firmware) */ #define USB_PRODUCT_KEYSPAN_USA19Q 0x010e /* USA-19Q serial adapter */ #define USB_PRODUCT_KEYSPAN_USA28 0x010f /* USA-28 serial adapter */ +#define USB_PRODUCT_KEYSPAN_USA28X 0x0102 /* USA-28X serial adapter */ #define USB_PRODUCT_KEYSPAN_USA28XXB 0x0110 /* USA-28X/XB serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA18 0x0111 /* USA-18 serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA18X 0x0112 /* USA-18X serial adapter */ #define USB_PRODUCT_KEYSPAN_USA28XB_NF 0x0113 /* USA-28XB serial adapter (no firmware) */ #define USB_PRODUCT_KEYSPAN_USA28XA_NF 0x0114 /* USA-28XB serial adapter (no firmware) */ #define USB_PRODUCT_KEYSPAN_USA28XA 0x0115 /* USA-28XA serial adapter */ #define USB_PRODUCT_KEYSPAN_USA18XA_NF 0x0116 /* USA-18XA serial adapter (no firmware) */ #define USB_PRODUCT_KEYSPAN_USA18XA 0x0117 /* USA-18XA serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19QW 0x0118 /* USA-19QW serial adapter */ +#define USB_PRODUCT_KEYSPAN_USA19QW_NF 0x0118 /* USA-19QW serial adapter */ #define USB_PRODUCT_KEYSPAN_USA19QW 0x0119 /* USA-19WQ serial adapter */ #define USB_PRODUCT_KEYSPAN_UIA10 0x0201 /* UIA-10 remote control */ #define USB_PRODUCT_KEYSPAN_UIA11 0x0202 /* UIA-11 remote control */ @@ -1616,9 +1616,6 @@ /* PLX products */ #define USB_PRODUCT_PLX_TESTBOARD 0x9060 /* test board */ -/* PNY products */ -#define USB_PRODUCT_PNY_ATTACHE 0x1300 /* USB 2.0 Flash Drive */ - /* PointChips */ #define USB_PRODUCT_POINTCHIPS_FLASH 0x8001 /* Flash */ @@ -1840,7 +1837,7 @@ #define USB_PRODUCT_SONY_CLIE_TJ25 0x0169 /* Sony Clie tj25 */ /* Sony Ericsson products */ -#define USB_PRODUCT_SONYERICSSON_DCU10 0x0528 /* USB Cable */ +#define USB_PRODUCT_SUSTEEN_DCU10 0x0528 /* USB Cable */ /* SOURCENEXT products */ #define USB_PRODUCT_SOURCENEXT_KEIKAI8 0x039f /* KeikaiDenwa 8 */ diff --git a/sys/bus/usb/usbdevs_data.h b/sys/bus/usb/usbdevs_data.h index 62991e20e9..4536ea9a38 100644 --- a/sys/bus/usb/usbdevs_data.h +++ b/sys/bus/usb/usbdevs_data.h @@ -1,5 +1,5 @@ /* - * $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.10 2004/12/17 20:50:46 dillon Exp $ + * $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.11 2004/12/18 06:22:47 dillon Exp $ * * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * @@ -41,7 +41,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $ - * $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.10 2004/12/17 20:50:46 dillon Exp $ + * $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.11 2004/12/18 06:22:47 dillon Exp $ * $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $ */ @@ -446,7 +446,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3, 0, - "", + "AIPTEK International", "PenCam Mega 1.3", }, { @@ -644,7 +644,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AVANCELOGIC, USB_PRODUCT_AVANCELOGIC_USBAUDIO, 0, - "", + "Avance Logic", "USB Audio Speaker", }, { @@ -2580,37 +2580,31 @@ const struct usb_knowndev usb_knowndevs[] = { "VideoCAM VGA", }, { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28, - 0, - "Keyspan", - "USA-28 serial adapter", - }, - { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28X, + USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18, 0, "Keyspan", - "USA-28X serial adapter", + "USA-18 serial adapter", }, { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19, + USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18_NF, 0, "Keyspan", - "USA-19 serial adapter", + "USA-18 serial adapter (no firmware)", }, { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18_NF, + USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X, 0, "Keyspan", - "USA-18 serial adapter (no firmware)", + "USA-18X serial adapter", }, { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X, + USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X_NF, 0, "Keyspan", "USA-18X serial adapter", }, { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W, + USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W_NF, 0, "Keyspan", "USA-19W serial adapter", @@ -2628,7 +2622,7 @@ const struct usb_knowndev usb_knowndevs[] = { "USA-19W serial adapter", }, { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W, + USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W_NF, 0, "Keyspan", "USA-49W serial adapter", @@ -2670,22 +2664,16 @@ const struct usb_knowndev usb_knowndevs[] = { "USA-28 serial adapter", }, { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XXB, - 0, - "Keyspan", - "USA-28X/XB serial adapter", - }, - { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18, + USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28X, 0, "Keyspan", - "USA-18 serial adapter", + "USA-28X serial adapter", }, { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X, + USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XXB, 0, "Keyspan", - "USA-18X serial adapter", + "USA-28X/XB serial adapter", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XB_NF, @@ -2718,7 +2706,7 @@ const struct usb_knowndev usb_knowndevs[] = { "USA-18XA serial adapter", }, { - USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW, + USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW_NF, 0, "Keyspan", "USA-19QW serial adapter", @@ -4046,31 +4034,31 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISKPRO, 0, - "", + "Pen Drive", "USB Disk Pro", }, { USB_VENDOR_PEN, USB_PRODUCT_PEN_USBREADER, 0, - "", + "Pen Drive", "USB 6 in 1 Card Reader/Writer", }, { USB_VENDOR_PEN, USB_PRODUCT_PEN_MOBILEDRIVE, 0, - "", + "Pen Drive", "USB 3 in 1 Card Reader/Writer", }, { USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK, 0, - "", + "Pen Drive", "USB Disk", }, { USB_VENDOR_PEN, USB_PRODUCT_PEN_ATTACHE, 0, - "", + "Pen Drive", "USB 2.0 Flash Drive", }, { @@ -4235,12 +4223,6 @@ const struct usb_knowndev usb_knowndevs[] = { "PLX", "test board", }, - { - USB_VENDOR_PNY, USB_PRODUCT_PNY_ATTACHE, - 0, - "PNY", - "USB 2.0 Flash Drive", - }, { USB_VENDOR_POINTCHIPS, USB_PRODUCT_POINTCHIPS_FLASH, 0, @@ -5076,9 +5058,9 @@ const struct usb_knowndev usb_knowndevs[] = { "Sony Clie tj25", }, { - USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10, + USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10, 0, - "Sony Ericsson", + "Susteen", "USB Cable", }, { @@ -5162,7 +5144,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10, 0, - "", + "Susteen", "USB Cable", }, { @@ -6516,9 +6498,9 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { - USB_VENDOR_SUNPLUS, 0, + USB_VENDOR_AIPTEK2, 0, USB_KNOWNDEV_NOPROD, - "Sunplus Technology", + "AIPTEK International", NULL, }, { @@ -7260,7 +7242,7 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { - USB_VENDOR_ADVANCELOGIC, 0, + USB_VENDOR_AVANCELOGIC, 0, USB_KNOWNDEV_NOPROD, "Avance Logic", NULL, @@ -7397,6 +7379,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Imation", NULL, }, + { + USB_VENDOR_SUSTEEN, 0, + USB_KNOWNDEV_NOPROD, + "Susteen", + NULL, + }, { USB_VENDOR_SONYERICSSON, 0, USB_KNOWNDEV_NOPROD, @@ -8165,6 +8153,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Standard Microsystems", NULL, }, + { + USB_VENDOR_PEN, 0, + USB_KNOWNDEV_NOPROD, + "Pen Drive", + NULL, + }, { USB_VENDOR_PNY, 0, USB_KNOWNDEV_NOPROD, diff --git a/sys/dev/usbmisc/umass/umass.c b/sys/dev/usbmisc/umass/umass.c index 7cfde605d2..1edf422981 100644 --- a/sys/dev/usbmisc/umass/umass.c +++ b/sys/dev/usbmisc/umass/umass.c @@ -26,7 +26,7 @@ * * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ * $FreeBSD: src/sys/dev/usb/umass.c,v 1.96 2003/12/19 12:19:11 sanpei Exp $ - * $DragonFly: src/sys/dev/usbmisc/umass/umass.c,v 1.13 2004/09/15 01:38:13 dillon Exp $ + * $DragonFly: src/sys/dev/usbmisc/umass/umass.c,v 1.14 2004/12/18 06:22:48 dillon Exp $ */ /* @@ -375,7 +375,7 @@ Static struct umass_devdescr_t umass_devdescrs[] = { UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS }, - { USB_VENDOR_PNY, USB_PRODUCT_PNY_ATTACHE, RID_WILDCARD, + { USB_VENDOR_PEN, USB_PRODUCT_PEN_ATTACHE, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, IGNORE_RESIDUE }, -- 2.41.0