On Sat, 29 Apr 2006 17:49:40 -0700, Phil Dibowitz <[EMAIL PROTECTED]> wrote:
> > Why just certain entries? Why not everything?
> >
> > It seems inconsistent (and an invitation for a zillion little patches) to
> > only apply this to a select few devices which Pete happens to have.
>
> I agree - I have no objection to adding this extra arguement to all of
> UNUSUAL_DEVs.
I think that you are right, it's cleaner. But the size of this thing
is intimidating. Please see attached...
-- Pete
diff -urp -X dontdiff linux-2.6.17-rc2/drivers/block/ub.c
linux-2.6.17-rc2-lem/drivers/block/ub.c
--- linux-2.6.17-rc2/drivers/block/ub.c 2006-04-23 21:05:39.000000000 -0700
+++ linux-2.6.17-rc2-lem/drivers/block/ub.c 2006-04-29 11:28:54.000000000
-0700
@@ -327,6 +327,7 @@ struct ub_dev {
char name[12];
struct usb_device *dev;
struct usb_interface *intf;
+ unsigned long us_flags;
struct list_head luns;
@@ -1901,6 +1898,8 @@ static int ub_sync_read_cap(struct ub_de
/* sd.c special-cases sector size of 0 to mean 512. Needed? Safe? */
nsec = be32_to_cpu(*(__be32 *)p) + 1;
+ if (sc->us_flags & US_FL_FIX_CAPACITY)
+ --nsec;
bsize = be32_to_cpu(*(__be32 *)(p + 4));
switch (bsize) {
case 512: shift = 0; break;
@@ -2226,6 +2225,7 @@ static int ub_probe(struct usb_interface
snprintf(sc->name, 12, DRV_NAME "(%d.%d)",
sc->dev->bus->busnum, sc->dev->devnum);
+ sc->us_flags = USB_US_ORIG_FLAGS(dev_id->driver_info);
/* XXX Verify that we can handle the device (from descriptors) */
if (ub_get_pipes(sc, sc->dev, intf) != 0)
diff -urp -X dontdiff linux-2.6.17-rc2/drivers/usb/storage/libusual.c
linux-2.6.17-rc2-lem/drivers/usb/storage/libusual.c
--- linux-2.6.17-rc2/drivers/usb/storage/libusual.c 2006-03-27
07:45:23.000000000 -0800
+++ linux-2.6.17-rc2-lem/drivers/usb/storage/libusual.c 2006-05-01
17:39:57.000000000 -0700
@@ -40,9 +40,9 @@ static int usu_probe_thread(void *arg);
*/
#define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
vendorName, productName,useProtocol, useTransport, \
- initFunction, flags) \
+ initFunction, flags, useType) \
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \
- .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
+ .driver_info = (flags)|((useType)<<24) }
#define USUAL_DEV(useProto, useTrans, useType) \
{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \
diff -urp -X dontdiff linux-2.6.17-rc2/drivers/usb/storage/unusual_devs.h
linux-2.6.17-rc2-lem/drivers/usb/storage/unusual_devs.h
--- linux-2.6.17-rc2/drivers/usb/storage/unusual_devs.h 2006-04-23
21:06:19.000000000 -0700
+++ linux-2.6.17-rc2-lem/drivers/usb/storage/unusual_devs.h 2006-05-01
19:28:13.000000000 -0700
@@ -54,36 +54,36 @@ UNUSUAL_DEV( 0x03eb, 0x2002, 0x0100, 0x
"ATMEL",
"SND1 Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x03ee, 0x6901, 0x0000, 0x0100,
"Mitsumi",
"USB FDD",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Reported by Rodolfo Quesada <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x03ee, 0x6906, 0x0003, 0x0003,
"VIA Technologies Inc.",
"Mitsumi multi cardreader",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, 0),
UNUSUAL_DEV( 0x03f0, 0x0107, 0x0200, 0x0200,
"HP",
"CD-Writer+",
- US_SC_8070, US_PR_CB, NULL, 0),
+ US_SC_8070, US_PR_CB, NULL, 0, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_USBAT
UNUSUAL_DEV( 0x03f0, 0x0207, 0x0001, 0x0001,
"HP",
"CD-Writer+ 8200e",
- US_SC_8070, US_PR_USBAT, init_usbat, 0),
+ US_SC_8070, US_PR_USBAT, init_usbat, 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x03f0, 0x0307, 0x0001, 0x0001,
"HP",
"CD-Writer+ CD-4e",
- US_SC_8070, US_PR_USBAT, init_usbat, 0),
+ US_SC_8070, US_PR_USBAT, init_usbat, 0, USB_US_TYPE_STOR),
#endif
/* Reported by Sebastian Kapfer <[EMAIL PROTECTED]>
@@ -94,14 +94,14 @@ UNUSUAL_DEV( 0x0409, 0x0040, 0x0000, 0x
"NEC",
"NEC USB UF000x",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Patch submitted by Mihnea-Costin Grigore <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x040d, 0x6205, 0x0003, 0x0003,
"VIA Technologies Inc.",
"USB 2.0 Card Reader",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Deduced by Jonathan Woithe <[EMAIL PROTECTED]>
* Entry needed for flags: US_FL_FIX_INQUIRY because initial inquiry message
@@ -111,40 +111,40 @@ UNUSUAL_DEV( 0x0411, 0x001c, 0x0113, 0x
"Buffalo",
"DUB-P40G HDD",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, 0),
/* Reported by Christian Leber <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0419, 0xaaf5, 0x0100, 0x0100,
"TrekStor",
"i.Beat 115 2.0",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE | US_FL_NOT_LOCKABLE ),
+ US_FL_IGNORE_RESIDUE | US_FL_NOT_LOCKABLE, USB_US_TYPE_STOR),
/* Reported by Stefan Werner <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0419, 0xaaf6, 0x0100, 0x0100,
"TrekStor",
"i.Beat Joy 2.0",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Reported by Pete Zaitcev <[EMAIL PROTECTED]>, bz#176584 */
UNUSUAL_DEV( 0x0420, 0x0001, 0x0100, 0x0100,
"GENERIC", "MP3 PLAYER", /* MyMusix PD-205 on the outside. */
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, 0),
/* Reported by Olaf Hering <[EMAIL PROTECTED]> from novell bug #105878 */
UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210,
"SMSC",
"FDC GOLD-2.30",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_DPCM
UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100,
"Microtech",
"CameraMate (DPCM_USB)",
- US_SC_SCSI, US_PR_DPCM_USB, NULL, 0 ),
+ US_SC_SCSI, US_PR_DPCM_USB, NULL, 0, USB_US_TYPE_STOR),
#endif
/* Patch submitted by Daniel Drake <[EMAIL PROTECTED]>
@@ -153,7 +153,7 @@ UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x
"Neuros Audio",
"USB 2.0 HD 2.5",
US_SC_DEVICE, US_PR_BULK, NULL,
- US_FL_NEED_OVERRIDE ),
+ US_FL_NEED_OVERRIDE, USB_US_TYPE_STOR),
/*
* Pete Zaitcev <[EMAIL PROTECTED]>, from Patrick C. F. Ernzer, bz#162559.
@@ -163,7 +163,8 @@ UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x
UNUSUAL_DEV( 0x0457, 0x0150, 0x0100, 0x0100,
"USBest Technology", /* sold by Transcend */
"USB Mass Storage Device",
- US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_NOT_LOCKABLE, 0),
/*
* Bohdan Linda <[EMAIL PROTECTED]>
@@ -174,30 +175,33 @@ UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x
"USB 2.0",
"Flash Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_NOT_LOCKABLE ),
+ US_FL_NOT_LOCKABLE, 0),
UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x0101,
"Rio",
"Rio Karma",
- US_SC_SCSI, US_PR_BULK, rio_karma_init, 0),
+ US_SC_SCSI, US_PR_BULK, rio_karma_init, 0, USB_US_TYPE_STOR),
/* Patch submitted by Philipp Friedrich <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0482, 0x0100, 0x0100, 0x0100,
"Kyocera",
"Finecam S3x",
- US_SC_8070, US_PR_CB, NULL, US_FL_FIX_INQUIRY),
+ US_SC_8070, US_PR_CB, NULL,
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Patch submitted by Philipp Friedrich <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0482, 0x0101, 0x0100, 0x0100,
"Kyocera",
"Finecam S4",
- US_SC_8070, US_PR_CB, NULL, US_FL_FIX_INQUIRY),
+ US_SC_8070, US_PR_CB, NULL,
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Patch submitted by Stephane Galles <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0482, 0x0103, 0x0100, 0x0100,
"Kyocera",
"Finecam S5",
- US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Patch for Kyocera Finecam L3
* Submitted by Michael Krauth <[EMAIL PROTECTED]>
@@ -207,21 +211,21 @@ UNUSUAL_DEV( 0x0482, 0x0105, 0x0100, 0x
"Kyocera",
"Finecam L3",
US_SC_SCSI, US_PR_BULK, NULL,
- US_FL_FIX_INQUIRY),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Reported by Paul Stewart <[EMAIL PROTECTED]>
* This entry is needed because the device reports Sub=ff */
UNUSUAL_DEV( 0x04a4, 0x0004, 0x0001, 0x0001,
"Hitachi",
"DVD-CAM DZ-MV100A Camcorder",
- US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN),
+ US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Reported by Andreas Bockhold <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x04b0, 0x0405, 0x0100, 0x0100,
"NIKON",
"NIKON DSC D70",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
+ US_FL_FIX_CAPACITY, USB_US_TYPE_STOR),
/* Patch for Nikon coolpix 2000
* Submitted by Fabien Cosse <[EMAIL PROTECTED]>*/
@@ -229,7 +233,7 @@ UNUSUAL_DEV( 0x04b0, 0x0301, 0x0010, 0x
"NIKON",
"NIKON DSC E2000",
US_SC_DEVICE, US_PR_DEVICE,NULL,
- US_FL_NOT_LOCKABLE ),
+ US_FL_NOT_LOCKABLE, USB_US_TYPE_STOR),
/* BENQ DC5330
* Reported by Manuel Fombuena <[EMAIL PROTECTED]> and
@@ -238,21 +242,23 @@ UNUSUAL_DEV( 0x04a5, 0x3010, 0x0100, 0x
"Tekom Technologies, Inc",
"300_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Reported by Simon Levitt <[EMAIL PROTECTED]>
* This entry needs Sub and Proto fields */
UNUSUAL_DEV( 0x04b8, 0x0601, 0x0100, 0x0100,
"Epson",
"875DC Storage",
- US_SC_SCSI, US_PR_CB, NULL, US_FL_FIX_INQUIRY),
+ US_SC_SCSI, US_PR_CB, NULL,
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Reported by Khalid Aziz <[EMAIL PROTECTED]>
* This entry is needed because the device reports Sub=ff */
UNUSUAL_DEV( 0x04b8, 0x0602, 0x0110, 0x0110,
"Epson",
"785EPX Storage",
- US_SC_SCSI, US_PR_BULK, NULL, US_FL_SINGLE_LUN),
+ US_SC_SCSI, US_PR_BULK, NULL,
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Not sure who reported this originally but
* Pavel Machek <[EMAIL PROTECTED]> reported that the extra US_FL_SINGLE_LUN
@@ -260,7 +266,8 @@ UNUSUAL_DEV( 0x04b8, 0x0602, 0x0110, 0x
UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210,
"Fujifilm",
"FinePix 1400Zoom",
- US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY |
US_FL_SINGLE_LUN),
+ US_SC_UFI, US_PR_DEVICE, NULL,
+ US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Reported by Peter W_chtler <[EMAIL PROTECTED]>
* The device needs the flags only.
@@ -269,7 +276,7 @@ UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x
"ScanLogic",
"SL11R-IDE",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Reported by Kriston Fincher <[EMAIL PROTECTED]>
* Patch submitted by Sean Millichamp <[EMAIL PROTECTED]>
@@ -279,28 +286,28 @@ UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x
UNUSUAL_DEV( 0x04da, 0x0901, 0x0100, 0x0200,
"Panasonic",
"LS-120 Camera",
- US_SC_UFI, US_PR_DEVICE, NULL, 0),
+ US_SC_UFI, US_PR_DEVICE, NULL, 0, USB_US_TYPE_STOR),
/* From Yukihiro Nakai, via [EMAIL PROTECTED]
* This is needed for CB instead of CBI */
UNUSUAL_DEV( 0x04da, 0x0d05, 0x0000, 0x0000,
"Sharp CE-CW05",
"CD-R/RW Drive",
- US_SC_8070, US_PR_CB, NULL, 0),
+ US_SC_8070, US_PR_CB, NULL, 0, USB_US_TYPE_STOR),
/* Reported by Adriaan Penning <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x04da, 0x2372, 0x0000, 0x9999,
"Panasonic",
"DMC-LCx Camera",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE ),
+ US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE, USB_US_TYPE_STOR),
/* Reported by Simeon Simeonov <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x04da, 0x2373, 0x0000, 0x9999,
"LEICA",
"D-LUX Camera",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE ),
+ US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE, USB_US_TYPE_STOR),
/* Most of the following entries were developed with the help of
* Shuttle/SCM directly.
@@ -308,27 +315,27 @@ UNUSUAL_DEV( 0x04da, 0x2373, 0x0000, 0x
UNUSUAL_DEV( 0x04e6, 0x0001, 0x0200, 0x0200,
"Matshita",
"LS-120",
- US_SC_8020, US_PR_CB, NULL, 0),
+ US_SC_8020, US_PR_CB, NULL, 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x04e6, 0x0002, 0x0100, 0x0100,
"Shuttle",
"eUSCSI Bridge",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init,
- US_FL_SCM_MULT_TARG ),
+ US_FL_SCM_MULT_TARG, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_SDDR09
UNUSUAL_DEV( 0x04e6, 0x0003, 0x0000, 0x9999,
"Sandisk",
"ImageMate SDDR09",
US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init,
- 0),
+ 0, USB_US_TYPE_STOR),
/* This entry is from [EMAIL PROTECTED] */
UNUSUAL_DEV( 0x04e6, 0x0005, 0x0100, 0x0208,
"SCM Microsystems",
"eUSB SmartMedia / CompactFlash Adapter",
US_SC_SCSI, US_PR_DPCM_USB, usb_stor_sddr09_dpcm_init,
- 0),
+ 0, USB_US_TYPE_STOR),
#endif
/* Reported by Markus Demleitner <[EMAIL PROTECTED]> */
@@ -336,47 +343,47 @@ UNUSUAL_DEV( 0x04e6, 0x0006, 0x0100, 0x
"SCM Microsystems Inc.",
"eUSB MMC Adapter",
US_SC_SCSI, US_PR_CB, NULL,
- US_FL_SINGLE_LUN),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Reported by Daniel Nouri <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x04e6, 0x0006, 0x0205, 0x0205,
"Shuttle",
"eUSB MMC Adapter",
US_SC_SCSI, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x04e6, 0x0007, 0x0100, 0x0200,
"Sony",
"Hifd",
US_SC_SCSI, US_PR_CB, NULL,
- US_FL_SINGLE_LUN),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x04e6, 0x0009, 0x0200, 0x0200,
"Shuttle",
"eUSB ATA/ATAPI Adapter",
- US_SC_8020, US_PR_CB, NULL, 0),
+ US_SC_8020, US_PR_CB, NULL, 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x04e6, 0x000a, 0x0200, 0x0200,
"Shuttle",
"eUSB CompactFlash Adapter",
- US_SC_8020, US_PR_CB, NULL, 0),
+ US_SC_8020, US_PR_CB, NULL, 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x04e6, 0x000B, 0x0100, 0x0100,
"Shuttle",
"eUSCSI Bridge",
US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init,
- US_FL_SCM_MULT_TARG ),
+ US_FL_SCM_MULT_TARG, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x04e6, 0x000C, 0x0100, 0x0100,
"Shuttle",
"eUSCSI Bridge",
US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init,
- US_FL_SCM_MULT_TARG ),
+ US_FL_SCM_MULT_TARG, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x04e6, 0x0101, 0x0200, 0x0200,
"Shuttle",
"CD-RW Device",
- US_SC_8020, US_PR_CB, NULL, 0),
+ US_SC_8020, US_PR_CB, NULL, 0, USB_US_TYPE_STOR),
/* Entry and supporting patch by Theodore Kilgore <[EMAIL PROTECTED]>.
* Device uses standards-violating 32-byte Bulk Command Block Wrappers and
@@ -387,14 +394,14 @@ UNUSUAL_DEV( 0x04fc, 0x80c2, 0x0100, 0x
"Kobian Mercury",
"Binocam DCB-132",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_BULK32),
+ US_FL_BULK32, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_USBAT
UNUSUAL_DEV( 0x04e6, 0x1010, 0x0000, 0x9999,
"Shuttle/SCM",
"USBAT-02",
US_SC_SCSI, US_PR_USBAT, init_usbat,
- US_FL_SINGLE_LUN),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
#endif
/* Reported by Bob Sass <[EMAIL PROTECTED]> -- only rev 1.33 tested */
@@ -402,7 +409,7 @@ UNUSUAL_DEV( 0x050d, 0x0115, 0x0133, 0x
"Belkin",
"USB SCSI Adaptor",
US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init,
- US_FL_SCM_MULT_TARG ),
+ US_FL_SCM_MULT_TARG, USB_US_TYPE_STOR),
/* Iomega Clik! Drive
* Reported by David Chatenay <[EMAIL PROTECTED]>
@@ -412,7 +419,7 @@ UNUSUAL_DEV( 0x0525, 0xa140, 0x0100, 0x
"Iomega",
"USB Clik! 40",
US_SC_8070, US_PR_BULK, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Yakumo Mega Image 37
* Submitted by Stephan Fuhrmann <[EMAIL PROTECTED]> */
@@ -420,7 +427,7 @@ UNUSUAL_DEV( 0x052b, 0x1801, 0x0100, 0x
"Tekom Technologies, Inc",
"300_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Another Yakumo camera.
* Reported by Michele Alzetta <[EMAIL PROTECTED]> */
@@ -428,14 +435,14 @@ UNUSUAL_DEV( 0x052b, 0x1804, 0x0100, 0x
"Tekom Technologies, Inc",
"300_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Reported by Iacopo Spalletti <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x052b, 0x1807, 0x0100, 0x0100,
"Tekom Technologies, Inc",
"300_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Yakumo Mega Image 47
* Reported by Bjoern Paetzel <[EMAIL PROTECTED]> */
@@ -443,7 +450,7 @@ UNUSUAL_DEV( 0x052b, 0x1905, 0x0100, 0x
"Tekom Technologies, Inc",
"400_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Reported by Paul Ortyl <[EMAIL PROTECTED]>
* Note that it's similar to the device above, only different prodID */
@@ -451,35 +458,34 @@ UNUSUAL_DEV( 0x052b, 0x1911, 0x0100, 0x
"Tekom Technologies, Inc",
"400_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x054c, 0x0010, 0x0106, 0x0450,
"Sony",
"DSC-S30/S70/S75/505V/F505/F707/F717/P8",
US_SC_SCSI, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN | US_FL_NOT_LOCKABLE | US_FL_NO_WP_DETECT ),
+ US_FL_SINGLE_LUN | US_FL_NOT_LOCKABLE | US_FL_NO_WP_DETECT,
USB_US_TYPE_STOR),
/* This entry is needed because the device reports Sub=ff */
UNUSUAL_DEV( 0x054c, 0x0010, 0x0500, 0x0600,
"Sony",
"DSC-T1/T5",
US_SC_8070, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
-
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Reported by [EMAIL PROTECTED] */
UNUSUAL_DEV( 0x054c, 0x0025, 0x0100, 0x0100,
"Sony",
"Memorystick NW-MS7",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_ISD200
UNUSUAL_DEV( 0x054c, 0x002b, 0x0100, 0x0110,
"Sony",
"Portable USB Harddrive V2",
US_SC_ISD200, US_PR_BULK, isd200_Initialization,
- 0 ),
+ 0, USB_US_TYPE_STOR),
#endif
/* Submitted by Olaf Hering, <[EMAIL PROTECTED]> SuSE Bugzilla #49049 */
@@ -487,80 +493,79 @@ UNUSUAL_DEV( 0x054c, 0x002c, 0x0501, 0x
"Sony",
"USB Floppy Drive",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x054c, 0x002d, 0x0100, 0x0100,
"Sony",
"Memorystick MSAC-US1",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Submitted by Klaus Mueller <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x054c, 0x002e, 0x0106, 0x0310,
"Sony",
"Handycam",
US_SC_SCSI, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Submitted by Rajesh Kumble Nayak <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x054c, 0x002e, 0x0500, 0x0500,
"Sony",
"Handycam HC-85",
US_SC_UFI, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x054c, 0x0032, 0x0000, 0x9999,
"Sony",
"Memorystick MSC-U01N",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Submitted by Michal Mlotek <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x054c, 0x0058, 0x0000, 0x9999,
"Sony",
"PEG N760c Memorystick",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x054c, 0x0069, 0x0000, 0x9999,
"Sony",
"Memorystick MSC-U03",
US_SC_UFI, US_PR_CB, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Submitted by Nathan Babb <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x054c, 0x006d, 0x0000, 0x9999,
"Sony",
"PEG Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Submitted by Mike Alborn <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x054c, 0x016a, 0x0000, 0x9999,
"Sony",
"PEG Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Submitted by Frank Engel <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x054c, 0x0099, 0x0000, 0x9999,
"Sony",
"PEG Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
-
UNUSUAL_DEV( 0x057b, 0x0000, 0x0000, 0x0299,
"Y-E Data",
"Flashbuster-U",
US_SC_DEVICE, US_PR_CB, NULL,
- US_FL_SINGLE_LUN),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x057b, 0x0000, 0x0300, 0x9999,
"Y-E Data",
"Flashbuster-U",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Reported by Johann Cardon <[EMAIL PROTECTED]>
* This entry is needed only because the device reports
@@ -569,20 +574,20 @@ UNUSUAL_DEV( 0x057b, 0x0000, 0x0300, 0x
UNUSUAL_DEV( 0x057b, 0x0022, 0x0000, 0x9999,
"Y-E Data",
"Silicon Media R/W",
- US_SC_DEVICE, US_PR_DEVICE, NULL, 0),
+ US_SC_DEVICE, US_PR_DEVICE, NULL, 0, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_ALAUDA
UNUSUAL_DEV( 0x0584, 0x0008, 0x0102, 0x0102,
"Fujifilm",
"DPC-R1 (Alauda)",
- US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0 ),
+ US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0, USB_US_TYPE_STOR),
#endif
/* Fabrizio Fellini <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0595, 0x4343, 0x0000, 0x2210,
"Fujifilm",
"Digital Camera EX-20 DSC",
- US_SC_8070, US_PR_DEVICE, NULL, 0 ),
+ US_SC_8070, US_PR_DEVICE, NULL, 0, USB_US_TYPE_STOR),
/* The entry was here before I took over, and had US_SC_RBC. It turns
* out that isn't needed. Additionally, Torsten Eriksson
@@ -594,7 +599,7 @@ UNUSUAL_DEV( 0x0595, 0x4343, 0x0000, 0x
UNUSUAL_DEV( 0x059f, 0xa601, 0x0200, 0x0200,
"LaCie",
"USB Hard Disk",
- US_SC_DEVICE, US_PR_CB, NULL, 0 ),
+ US_SC_DEVICE, US_PR_CB, NULL, 0, USB_US_TYPE_STOR),
/* Submitted by Joel Bourquard <[EMAIL PROTECTED]>
* Some versions of this device need the SubClass and Protocol overrides
@@ -604,32 +609,32 @@ UNUSUAL_DEV( 0x05ab, 0x0060, 0x1104, 0x
"In-System",
"PyroGate External CD-ROM Enclosure (FCD-523)",
US_SC_SCSI, US_PR_BULK, NULL,
- US_FL_NEED_OVERRIDE ),
+ US_FL_NEED_OVERRIDE, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_ISD200
UNUSUAL_DEV( 0x05ab, 0x0031, 0x0100, 0x0110,
"In-System",
"USB/IDE Bridge (ATA/ATAPI)",
US_SC_ISD200, US_PR_BULK, isd200_Initialization,
- 0 ),
+ 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x05ab, 0x0301, 0x0100, 0x0110,
"In-System",
"Portable USB Harddrive V2",
US_SC_ISD200, US_PR_BULK, isd200_Initialization,
- 0 ),
+ 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x05ab, 0x0351, 0x0100, 0x0110,
"In-System",
"Portable USB Harddrive V2",
US_SC_ISD200, US_PR_BULK, isd200_Initialization,
- 0 ),
+ 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x05ab, 0x5701, 0x0100, 0x0110,
"In-System",
"USB Storage Adapter V2",
US_SC_ISD200, US_PR_BULK, isd200_Initialization,
- 0 ),
+ 0, USB_US_TYPE_STOR),
#endif
/* Submitted by Sven Anderson <[EMAIL PROTECTED]>
@@ -642,26 +647,26 @@ UNUSUAL_DEV( 0x05ac, 0x1202, 0x0000, 0x9
"Apple",
"iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_FIX_CAPACITY, 0),
/* Reported by Avi Kivity <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x05ac, 0x1203, 0x0000, 0x9999,
"Apple",
"iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_FIX_CAPACITY, 0),
UNUSUAL_DEV( 0x05ac, 0x1204, 0x0000, 0x9999,
"Apple",
"iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_FIX_CAPACITY, 0),
UNUSUAL_DEV( 0x05ac, 0x1205, 0x0000, 0x9999,
"Apple",
"iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_FIX_CAPACITY, 0),
/*
* Reported by Tyson Vinson <[EMAIL PROTECTED]>
@@ -671,14 +676,14 @@ UNUSUAL_DEV( 0x05ac, 0x120a, 0x0000, 0x9
"Apple",
"iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_FIX_CAPACITY, 0),
#ifdef CONFIG_USB_STORAGE_JUMPSHOT
UNUSUAL_DEV( 0x05dc, 0x0001, 0x0000, 0x0001,
"Lexar",
"Jumpshot USB CF Reader",
US_SC_SCSI, US_PR_JUMPSHOT, NULL,
- US_FL_NEED_OVERRIDE ),
+ US_FL_NEED_OVERRIDE, USB_US_TYPE_STOR),
#endif
/* Reported by Blake Matheny <[EMAIL PROTECTED]> */
@@ -686,7 +691,7 @@ UNUSUAL_DEV( 0x05dc, 0xb002, 0x0000, 0x
"Lexar",
"USB CF Reader",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* The following two entries are for a Genesys USB to IDE
* converter chip, but it changes its ProductId depending
@@ -699,13 +704,13 @@ UNUSUAL_DEV( 0x05e3, 0x0701, 0x0000, 0x
"Genesys Logic",
"USB to IDE Optical",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_GO_SLOW ),
+ US_FL_GO_SLOW, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x05e3, 0x0702, 0x0000, 0xffff,
"Genesys Logic",
"USB to IDE Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_GO_SLOW ),
+ US_FL_GO_SLOW, USB_US_TYPE_STOR),
/* Reported by Hanno Boeck <[EMAIL PROTECTED]>
* Taken from the Lycoris Kernel */
@@ -713,19 +718,19 @@ UNUSUAL_DEV( 0x0636, 0x0003, 0x0000, 0x
"Vivitar",
"Vivicam 35Xx",
US_SC_SCSI, US_PR_BULK, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, 0),
UNUSUAL_DEV( 0x0644, 0x0000, 0x0100, 0x0100,
"TEAC",
"Floppy Drive",
- US_SC_UFI, US_PR_CB, NULL, 0 ),
+ US_SC_UFI, US_PR_CB, NULL, 0, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_SDDR09
UNUSUAL_DEV( 0x066b, 0x0105, 0x0100, 0x0100,
"Olympus",
"Camedia MAUSB-2",
US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init,
- 0),
+ 0, USB_US_TYPE_STOR),
#endif
/* Reported by Darsen Lu <[EMAIL PROTECTED]> */
@@ -733,86 +738,86 @@ UNUSUAL_DEV( 0x066f, 0x8000, 0x0001, 0x0
"SigmaTel",
"USBMSC Audio Player",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_FIX_CAPACITY, USB_US_TYPE_STOR),
/* Reported by Richard -=[]=- <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x067b, 0x2507, 0x0100, 0x0100,
"Prolific Technology Inc.",
"Mass Storage Device",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY | US_FL_GO_SLOW ),
+ US_FL_FIX_CAPACITY | US_FL_GO_SLOW, USB_US_TYPE_STOR),
/* Reported by Alex Butcher <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x067b, 0x3507, 0x0001, 0x0001,
"Prolific Technology Inc.",
"ATAPI-6 Bridge Controller",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY | US_FL_GO_SLOW ),
+ US_FL_FIX_CAPACITY | US_FL_GO_SLOW, USB_US_TYPE_STOR),
/* Submitted by Benny Sjostrand <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0686, 0x4011, 0x0001, 0x0001,
"Minolta",
"Dimage F300",
- US_SC_SCSI, US_PR_BULK, NULL, 0 ),
+ US_SC_SCSI, US_PR_BULK, NULL, 0, USB_US_TYPE_STOR),
/* Reported by Miguel A. Fosas <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0686, 0x4017, 0x0001, 0x0001,
"Minolta",
"DIMAGE E223",
- US_SC_SCSI, US_PR_DEVICE, NULL, 0 ),
+ US_SC_SCSI, US_PR_DEVICE, NULL, 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100,
"Hagiwara",
"Flashgate",
- US_SC_SCSI, US_PR_BULK, NULL, 0 ),
+ US_SC_SCSI, US_PR_BULK, NULL, 0, USB_US_TYPE_STOR),
/* Reported by David Hamilton <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001,
"Thomson Multimedia Inc.",
"RCA RD1080 MP3 Player",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_FIX_CAPACITY, USB_US_TYPE_STOR),
/* Submitted by Roman Hodek <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200,
"Sandisk",
"ImageMate SDDR-05a",
US_SC_SCSI, US_PR_CB, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
-UNUSUAL_DEV( 0x0781, 0x0002, 0x0009, 0x0009,
+UNUSUAL_DEV( 0x0781, 0x0002, 0x0009, 0x0009,
"SanDisk Corporation",
"ImageMate CompactFlash USB",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_FIX_CAPACITY, 0),
#ifdef CONFIG_USB_STORAGE_USBAT
UNUSUAL_DEV( 0x0781, 0x0005, 0x0005, 0x0005,
"Sandisk",
"ImageMate SDDR-05b",
US_SC_SCSI, US_PR_USBAT, init_usbat,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
#endif
UNUSUAL_DEV( 0x0781, 0x0100, 0x0100, 0x0100,
"Sandisk",
"ImageMate SDDR-12",
US_SC_SCSI, US_PR_CB, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_SDDR09
UNUSUAL_DEV( 0x0781, 0x0200, 0x0000, 0x9999,
"Sandisk",
"ImageMate SDDR-09",
US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init,
- 0),
+ 0, USB_US_TYPE_STOR),
#endif
#ifdef CONFIG_USB_STORAGE_FREECOM
UNUSUAL_DEV( 0x07ab, 0xfc01, 0x0000, 0x9999,
"Freecom",
"USB-IDE",
- US_SC_QIC, US_PR_FREECOM, freecom_init, 0),
+ US_SC_QIC, US_PR_FREECOM, freecom_init, 0, USB_US_TYPE_STOR),
#endif
/* Reported by Eero Volotinen <[EMAIL PROTECTED]> */
@@ -820,32 +825,32 @@ UNUSUAL_DEV( 0x07ab, 0xfccd, 0x0000, 0x
"Freecom Technologies",
"FHD-Classic",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
+ US_FL_FIX_CAPACITY, 0),
UNUSUAL_DEV( 0x07af, 0x0004, 0x0100, 0x0133,
"Microtech",
"USB-SCSI-DB25",
US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init,
- US_FL_SCM_MULT_TARG ),
+ US_FL_SCM_MULT_TARG, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x07af, 0x0005, 0x0100, 0x0100,
"Microtech",
"USB-SCSI-HD50",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init,
- US_FL_SCM_MULT_TARG ),
+ US_FL_SCM_MULT_TARG, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_DPCM
UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100,
"Microtech",
"CameraMate (DPCM_USB)",
- US_SC_SCSI, US_PR_DPCM_USB, NULL, 0 ),
+ US_SC_SCSI, US_PR_DPCM_USB, NULL, 0, USB_US_TYPE_STOR),
#endif
#ifdef CONFIG_USB_STORAGE_ALAUDA
UNUSUAL_DEV( 0x07b4, 0x010a, 0x0102, 0x0102,
"Olympus",
"MAUSB-10 (Alauda)",
- US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0 ),
+ US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0, USB_US_TYPE_STOR),
#endif
#ifdef CONFIG_USB_STORAGE_DATAFAB
@@ -853,7 +858,7 @@ UNUSUAL_DEV( 0x07c4, 0xa000, 0x0000, 0x
"Datafab",
"MDCFE-B USB CF Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
/*
* The following Datafab-based devices may or may not work
@@ -870,38 +875,38 @@ UNUSUAL_DEV( 0x07c4, 0xa001, 0x0000, 0xf
"SIIG/Datafab",
"SIIG/Datafab Memory Stick+CF Reader/Writer",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
/* Reported by Josef Reisinger <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x07c4, 0xa002, 0x0000, 0xffff,
"Datafab/Unknown",
"MD2/MD3 Disk enclosure",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x07c4, 0xa003, 0x0000, 0xffff,
"Datafab/Unknown",
"Datafab-based Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x07c4, 0xa004, 0x0000, 0xffff,
"Datafab/Unknown",
"Datafab-based Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x07c4, 0xa005, 0x0000, 0xffff,
"PNY/Datafab",
"PNY/Datafab CF+SM Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
UNUSUAL_DEV( 0x07c4, 0xa006, 0x0000, 0xffff,
"Simple Tech/Datafab",
"Simple Tech/Datafab CF+SM Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
#endif
#ifdef CONFIG_USB_STORAGE_SDDR55
@@ -910,7 +915,7 @@ UNUSUAL_DEV( 0x07c4, 0xa103, 0x0000, 0x9
"Datafab",
"MDSM-B reader",
US_SC_SCSI, US_PR_SDDR55, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
#endif
#ifdef CONFIG_USB_STORAGE_DATAFAB
@@ -919,7 +924,7 @@ UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0x
"Datafab Systems, Inc.",
"USB to CF + SM Combo (LC1)",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
#endif
#ifdef CONFIG_USB_STORAGE_SDDR55
/* SM part - aeb <[EMAIL PROTECTED]> */
@@ -927,7 +932,7 @@ UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0x
"Datafab Systems, Inc.",
"USB to CF + SM Combo (LC1)",
US_SC_SCSI, US_PR_SDDR55, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
#endif
#ifdef CONFIG_USB_STORAGE_DATAFAB
@@ -939,7 +944,7 @@ UNUSUAL_DEV( 0x07c4, 0xa10b, 0x0000, 0x
"DataFab Systems Inc.",
"USB CF+MS",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
#endif
@@ -953,7 +958,7 @@ UNUSUAL_DEV( 0x07c4, 0xa400, 0x0000, 0x
"Datafab",
"KECF-USB",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Casio QV 2x00/3x00/4000/8000 digital still cameras are not conformant
* to the USB storage specification in two ways:
@@ -970,14 +975,14 @@ UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9
"Casio",
"QV DigitalCamera",
US_SC_8070, US_PR_CB, NULL,
- US_FL_NEED_OVERRIDE | US_FL_FIX_INQUIRY ),
+ US_FL_NEED_OVERRIDE | US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Submitted by Hartmut Wahl <[EMAIL PROTECTED]>*/
UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001,
"Samsung",
"Digimax 410",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Entry and supporting patch by Theodore Kilgore <[EMAIL PROTECTED]>.
* Flag will support Bulk devices which use a standards-violating 32-byte
@@ -989,14 +994,14 @@ UNUSUAL_DEV( 0x084d, 0x0011, 0x0110, 0x
"Grandtech",
"DC2MEGA",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_BULK32),
+ US_FL_BULK32, USB_US_TYPE_STOR),
/* Submitted by Jan De Luyck <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x08bd, 0x1100, 0x0000, 0x0000,
"CITIZEN",
"X1DE-USB",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Entry needed for flags. Moreover, all devices with this ID use
* bulk-only transport, but _some_ falsely report Control/Bulk instead.
@@ -1007,7 +1012,7 @@ UNUSUAL_DEV( 0x090a, 0x1001, 0x0100, 0x
"Trumpion",
"t33520 USB Flash Card Controller",
US_SC_DEVICE, US_PR_BULK, NULL,
- US_FL_NEED_OVERRIDE ),
+ US_FL_NEED_OVERRIDE, 0),
/* Reported by Filippo Bardelli <[EMAIL PROTECTED]>
* The device reports a subclass of RBC, which is wrong.
@@ -1016,21 +1021,21 @@ UNUSUAL_DEV( 0x090a, 0x1050, 0x0100, 0x
"Trumpion Microelectronics, Inc.",
"33520 USB Digital Voice Recorder",
US_SC_UFI, US_PR_DEVICE, NULL,
- 0),
+ 0, USB_US_TYPE_STOR),
/* Trumpion Microelectronics MP3 player ([EMAIL PROTECTED]) */
UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999,
"Trumpion",
"MP3 player",
US_SC_RBC, US_PR_BULK, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
/* aeb */
UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,
"Feiya",
"5-in-1 Card Reader",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_FIX_CAPACITY, 0),
/* This Pentax still camera is not conformant
* to the USB storage specification: -
@@ -1043,22 +1048,21 @@ UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1
"Pentax",
"Optio 2/3/400",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
-
+ US_FL_FIX_INQUIRY, 0),
/* Submitted by Per Winkvist <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff,
"Pentax",
"Optio S/S4",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_ISD200
UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110,
"ATI",
"USB Cable 205",
US_SC_ISD200, US_PR_BULK, isd200_Initialization,
- 0 ),
+ 0, USB_US_TYPE_STOR),
#endif
#ifdef CONFIG_USB_STORAGE_DATAFAB
@@ -1066,14 +1070,14 @@ UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xf
"Acomdata",
"CF",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
#endif
#ifdef CONFIG_USB_STORAGE_SDDR55
UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff,
"Acomdata",
"SM",
US_SC_SCSI, US_PR_SDDR55, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
#endif
/* Submitted by: Nick Sillik <[EMAIL PROTECTED]>
@@ -1101,14 +1105,14 @@ UNUSUAL_DEV( 0x0c45, 0x1060, 0x0100, 0x0
"Unknown",
"Unknown",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN ),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
/* Submitted by Joris Struyve <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xffff,
"Medion",
"MD 7425",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY),
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/*
* Entry for Jenoptik JD 5200z3
@@ -1118,7 +1122,8 @@ UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xf
UNUSUAL_DEV( 0x0d96, 0x5200, 0x0001, 0x0200,
"Jenoptik",
"JD 5200 z3",
- US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_INQUIRY, USB_US_TYPE_STOR),
/* Reported by Lubomir Blaha <[EMAIL PROTECTED]>
* I _REALLY_ don't know what 3rd, 4th number and all defines mean, but this
@@ -1129,7 +1134,7 @@ UNUSUAL_DEV( 0x0dd8, 0x1060, 0x0000, 0xf
"Netac",
"USB-CF-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, 0),
/* Patch by Stephan Walter <[EMAIL PROTECTED]>
* I don't know why, but it works... */
@@ -1137,28 +1142,28 @@ UNUSUAL_DEV( 0x0dda, 0x0001, 0x0012, 0x0
"WINWARD",
"Music Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, 0),
/* Reported by Ian McConnell <ian at emit.demon.co.uk> */
UNUSUAL_DEV( 0x0dda, 0x0301, 0x0012, 0x0012,
"PNP_MP3",
"PNP_MP3 PLAYER",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, 0),
/* Reported by Jim McCloskey <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0e21, 0x0520, 0x0100, 0x0100,
"Cowon Systems",
"iAUDIO M5",
US_SC_DEVICE, US_PR_BULK, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
/* Submitted by Antoine Mairesse <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300,
"USB",
"Solid state disk",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_INQUIRY, 0),
/* Submitted by Daniel Drake <[EMAIL PROTECTED]>
* Reported by dayul on the Gentoo Forums */
@@ -1166,21 +1171,21 @@ UNUSUAL_DEV( 0x0ea0, 0x2168, 0x0110, 0x
"Ours Technology",
"Flash Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Reported by Rastislav Stanik <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0ea0, 0x6828, 0x0110, 0x0110,
"USB",
"Flash Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Reported by Michael Stattmann <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000,
"Sony Ericsson",
"V800-Vodafone 802",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_NO_WP_DETECT ),
+ US_FL_NO_WP_DETECT, USB_US_TYPE_STOR),
/* Reported by Kevin Cernekee <[EMAIL PROTECTED]>
* Tested on hardware version 1.10.
@@ -1190,28 +1195,28 @@ UNUSUAL_DEV( 0x1019, 0x0c55, 0x0000, 0x
"Desknote",
"UCR-61S2B",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_ucr61s2b_init,
- 0 ),
+ 0, USB_US_TYPE_STOR),
/* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */
UNUSUAL_DEV( 0x132b, 0x000b, 0x0001, 0x0001,
"Minolta",
"Dimage Z10",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- 0 ),
+ 0, USB_US_TYPE_STOR),
/* Reported by Kotrla Vitezslav <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x1370, 0x6828, 0x0110, 0x0110,
"SWISSBIT",
"Black Silver",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_IGNORE_RESIDUE ),
+ US_FL_IGNORE_RESIDUE, USB_US_TYPE_STOR),
/* Reported by Radovan Garabik <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999,
"MPIO",
"HS200",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_GO_SLOW ),
+ US_FL_GO_SLOW, USB_US_TYPE_STOR),
/*
* David H_rdeman <[EMAIL PROTECTED]>
@@ -1220,14 +1225,15 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x
UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100,
"Iomega",
"Micro Mini 1GB",
- US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_NOT_LOCKABLE, USB_US_TYPE_STOR),
#ifdef CONFIG_USB_STORAGE_SDDR55
UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x9999,
"Sandisk",
"ImageMate SDDR55",
US_SC_SCSI, US_PR_SDDR55, NULL,
- US_FL_SINGLE_LUN),
+ US_FL_SINGLE_LUN, USB_US_TYPE_STOR),
#endif
/* Reported by Andrew Simmons <[EMAIL PROTECTED]> */
@@ -1235,7 +1241,7 @@ UNUSUAL_DEV( 0xed06, 0x4500, 0x0001, 0x
"DataStor",
"USB4500 FW1.04",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
+ US_FL_FIX_CAPACITY, 0),
/* Control/Bulk transport for all SubClass values */
USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR),
diff -urp -X dontdiff linux-2.6.17-rc2/drivers/usb/storage/usb.c
linux-2.6.17-rc2-lem/drivers/usb/storage/usb.c
--- linux-2.6.17-rc2/drivers/usb/storage/usb.c 2006-04-23 21:06:19.000000000
-0700
+++ linux-2.6.17-rc2-lem/drivers/usb/storage/usb.c 2006-05-01
17:38:17.000000000 -0700
@@ -124,7 +124,7 @@ static DECLARE_COMPLETION(threads_gone);
#define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
vendorName, productName,useProtocol, useTransport, \
- initFunction, flags) \
+ initFunction, flags, useType) \
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
@@ -157,7 +157,7 @@ MODULE_DEVICE_TABLE (usb, storage_usb_id
#define UNUSUAL_DEV(idVendor, idProduct, bcdDeviceMin, bcdDeviceMax, \
vendor_name, product_name, use_protocol, use_transport, \
- init_function, Flags) \
+ init_function, Flags, useType) \
{ \
.vendorName = vendor_name, \
.productName = product_name, \
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
