From 9f57d816526021184b2e75a03054d6d0aff052ec Mon Sep 17 00:00:00 2001 From: sanpei Date: Thu, 18 Dec 2003 05:47:11 +0000 Subject: Add Support - PNY Attache Flash Drive [1] - minolta 5400 USB scanner [2] PR: kern/58045 [1] kern/56496 [2] Submitted by: [1] Rick C. Petty [2] Mark Diekhans --- sys/dev/usb/umass.c | 4 ++++ sys/dev/usb/usbdevs | 5 +++++ sys/dev/usb/uscanner.c | 3 +++ 3 files changed, 12 insertions(+) diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 6d7620c..c1ff49e 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -366,6 +366,10 @@ Static struct umass_devdescr_t umass_devdescrs[] = { UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I, NO_QUIRKS }, + { USB_VENDOR_PNY, USB_PRODUCT_PNY_ATTACHE, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + IGNORE_RESIDUE + }, { USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R, RID_WILDCARD, UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I, NO_QUIRKS diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 0d8d26f..80e9bcd 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -349,6 +349,7 @@ vendor AGATE 0x0c08 Agate Technologies vendor DMI 0x0c0b DMI vendor LUWEN 0x0c76 Luwen vendor SMC3 0x0d5c Standard Microsystems +vendor PNY 0x0d7d PNY vendor HAWKING 0x0e66 Hawking Technologies vendor MOTOROLA 0x1063 Motorola vendor PLX 0x10b5 PLX @@ -917,6 +918,7 @@ product MIDIMAN MIDISPORT2X2 0x1001 Midisport 2x2 product MINOLTA 2300 0x4001 Dimage 2300 product MINOLTA S304 0x4007 Dimage S304 product MINOLTA X 0x4009 Dimage X +product MINOLTA 5400 0x400e Dimage 5400 /* Mitsumi products */ product MITSUMI CDRRW 0x0000 CD-R/RW Drive @@ -1012,6 +1014,9 @@ product PIENGINEERING PS2USB 0x020b PS2 to Mac USB Adapter /* PLX products */ product PLX TESTBOARD 0x9060 test board +/* PNY products */ +product PNY ATTACHE 0x1300 USB 2.0 Flash Drive + /* Primax products */ product PRIMAX G2X300 0x0300 G2-200 scanner product PRIMAX G2E300 0x0301 G2E-300 scanner diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index ff0cbbd..7cd4a78 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -139,6 +139,9 @@ static const struct uscan_info uscanner_devs[] = { {{ USB_VENDOR_HP, USB_PRODUCT_HP_6200C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_6300C }, 0 }, + /* Minolta */ + {{ USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_5400 }, 0 }, + /* Microtek */ {{ USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX }, 0 }, {{ USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U }, 0 }, -- cgit v1.1