diff options
| author | Warner Losh <imp@FreeBSD.org> | 2006-01-31 19:09:38 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2006-01-31 19:09:38 +0000 |
| commit | 01538a58fdb150d09ab019cf4d74addaab62f2a7 (patch) | |
| tree | dc5f72da2c22a6dd5cc96977846329309282b02e /sys/dev/usb | |
| parent | 6c237adcea92f538d7533d9166d14eb88fa4ffe0 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/umass.c | 24 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 14 |
2 files changed, 24 insertions, 14 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 892098614b659..57ef5e557c0e5 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -324,10 +324,22 @@ Static struct umass_devdescr_t umass_devdescrs[] = { UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I, RS_NO_CLEAR_UA }, + { USB_VENDOR_ADDON, USB_PRODUCT_ADDON_ATTACHE, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + IGNORE_RESIDUE + }, { USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100, RID_WILDCARD, UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I, RS_NO_CLEAR_UA }, + { USB_VENDOR_ADDON, USB_PRODUCT_ADDON_A256MB, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + IGNORE_RESIDUE + }, + { USB_VENDOR_ADDON, USB_PRODUCT_ADDON_DISKPRO512, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + IGNORE_RESIDUE + }, { USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB2IDE, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, FORCE_SHORT_INQUIRY | NO_START_STOP | IGNORE_RESIDUE @@ -426,17 +438,9 @@ Static struct umass_devdescr_t umass_devdescrs[] = { UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_TEST_UNIT_READY }, - { USB_VENDOR_PNY, USB_PRODUCT_PNY_ATTACHE, RID_WILDCARD, - UMASS_PROTO_SCSI | UMASS_PROTO_BBB, - IGNORE_RESIDUE - }, - { USB_VENDOR_PNY, USB_PRODUCT_PNY_A256MB, RID_WILDCARD, + { USB_VENDOR_PNY, USB_PRODUCT_PNY_ATTACHE2, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, - IGNORE_RESIDUE - }, - { USB_VENDOR_PNY, USB_PRODUCT_PNY_DISKPRO512, RID_WILDCARD, - UMASS_PROTO_SCSI | UMASS_PROTO_BBB, - IGNORE_RESIDUE + IGNORE_RESIDUE | NO_START_STOP }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDCZ2_256, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index a7e5b73a19df8..197eb88174945 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -475,7 +475,7 @@ vendor LUWEN 0x0c76 Luwen vendor ZCOM 0x0cde Z-Com vendor TANGTOP 0x0d3d Tangtop vendor SMC3 0x0d5c SMC -vendor PNY 0x0d7d PNY +vendor ADDON 0x0d7d Add-on Technology vendor ACDC 0x0d7e ACDC vendor ABC 0x0d8c ABC vendor MSI 0x0db0 Micro Star International @@ -510,6 +510,7 @@ vendor RALINK 0x148f Ralink Technology vendor IMAGINATION 0x149a Imagination Technologies vendor CONCEPTRONIC 0x14b2 Conceptronic vendor SILICONPORTALS 0x1527 Silicon Portals +vendor PNY 0x154b PNY vendor SOHOWARE 0x15e8 SOHOware vendor UMAX 0x1606 UMAX vendor INSIDEOUT 0x1608 Inside Out Networks @@ -596,6 +597,13 @@ product ADMTEK PEGASUS 0x0986 AN986 Ethernet product ADMTEK PEGASUSII 0x8511 AN8511 Ethernet product ADMTEK PEGASUSII_2 0x8513 AN8513 Ethernet +/* ADDON products */ +/* PNY OEMs these */ +product ADDON ATTACHE 0x1300 USB 2.0 Flash Drive +product ADDON ATTACHE 0x1300 USB 2.0 Flash Drive +product ADDON A256MB 0x1400 Attache 256MB USB 2.0 Flash Drive +product ADDON DISKPRO512 0x1420 USB 2.0 Flash Drive (DANE-ELEC zMate 512MB USB flash drive) + /* ADS products */ product ADS UBS10BT 0x0008 UBS-10BT Ethernet @@ -1333,9 +1341,7 @@ product PLEXTOR 40_12_40U 0x0011 PlexWriter 40/12/40U product PLX TESTBOARD 0x9060 test board /* PNY products */ -product PNY ATTACHE 0x1300 USB 2.0 Flash Drive -product PNY A256MB 0x1400 Attache 256MB USB 2.0 Flash Drive -product PNY DISKPRO512 0x1420 USB 2.0 Flash Drive (DANE-ELEC zMate 512MB USB flash drive) +product PNY ATTACHE2 0x0010 USB 2.0 Flash Drive /* Primax products */ product PRIMAX G2X300 0x0300 G2-200 scanner |