Commit 8fa7fd74 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman

USB: storage: Use USB_ prefix instead of US_ prefix

This commit changes prefix for some of the USB mass storage
class related macros (ie. USB_SC_ for subclass and USB_PR_
for class).
Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1992de83
...@@ -396,7 +396,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum); ...@@ -396,7 +396,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum);
#else #else
static const struct usb_device_id ub_usb_ids[] = { static const struct usb_device_id ub_usb_ids[] = {
{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_SCSI, US_PR_BULK) }, { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, USB_SC_SCSI, USB_PR_BULK) },
{ } { }
}; };
......
...@@ -113,7 +113,7 @@ static int slave_alloc (struct scsi_device *sdev) ...@@ -113,7 +113,7 @@ static int slave_alloc (struct scsi_device *sdev)
* Let the scanning code know if this target merely sets * Let the scanning code know if this target merely sets
* Peripheral Device Type to 0x1f to indicate no LUN. * Peripheral Device Type to 0x1f to indicate no LUN.
*/ */
if (us->subclass == US_SC_UFI) if (us->subclass == USB_SC_UFI)
sdev->sdev_target->pdt_1f_for_no_lun = 1; sdev->sdev_target->pdt_1f_for_no_lun = 1;
return 0; return 0;
...@@ -176,7 +176,7 @@ static int slave_configure(struct scsi_device *sdev) ...@@ -176,7 +176,7 @@ static int slave_configure(struct scsi_device *sdev)
/* Disk-type devices use MODE SENSE(6) if the protocol /* Disk-type devices use MODE SENSE(6) if the protocol
* (SubClass) is Transparent SCSI, otherwise they use * (SubClass) is Transparent SCSI, otherwise they use
* MODE SENSE(10). */ * MODE SENSE(10). */
if (us->subclass != US_SC_SCSI && us->subclass != US_SC_CYP_ATACB) if (us->subclass != USB_SC_SCSI && us->subclass != USB_SC_CYP_ATACB)
sdev->use_10_for_ms = 1; sdev->use_10_for_ms = 1;
/* Many disks only accept MODE SENSE transfer lengths of /* Many disks only accept MODE SENSE transfer lengths of
...@@ -245,7 +245,7 @@ static int slave_configure(struct scsi_device *sdev) ...@@ -245,7 +245,7 @@ static int slave_configure(struct scsi_device *sdev)
* capacity will be decremented or is correct. */ * capacity will be decremented or is correct. */
if (!(us->fflags & (US_FL_FIX_CAPACITY | US_FL_CAPACITY_OK | if (!(us->fflags & (US_FL_FIX_CAPACITY | US_FL_CAPACITY_OK |
US_FL_SCM_MULT_TARG)) && US_FL_SCM_MULT_TARG)) &&
us->protocol == US_PR_BULK) us->protocol == USB_PR_BULK)
us->use_last_sector_hacks = 1; us->use_last_sector_hacks = 1;
} else { } else {
...@@ -261,7 +261,7 @@ static int slave_configure(struct scsi_device *sdev) ...@@ -261,7 +261,7 @@ static int slave_configure(struct scsi_device *sdev)
* scsi_level == 0 (UNKNOWN). Hence such devices must necessarily * scsi_level == 0 (UNKNOWN). Hence such devices must necessarily
* be single-LUN. * be single-LUN.
*/ */
if ((us->protocol == US_PR_CB || us->protocol == US_PR_CBI) && if ((us->protocol == USB_PR_CB || us->protocol == USB_PR_CBI) &&
sdev->scsi_level == SCSI_UNKNOWN) sdev->scsi_level == SCSI_UNKNOWN)
us->max_lun = 0; us->max_lun = 0;
......
...@@ -1760,7 +1760,7 @@ static int sddr09_probe(struct usb_interface *intf, ...@@ -1760,7 +1760,7 @@ static int sddr09_probe(struct usb_interface *intf,
if (result) if (result)
return result; return result;
if (us->protocol == US_PR_DPCM_USB) { if (us->protocol == USB_PR_DPCM_USB) {
us->transport_name = "Control/Bulk-EUSB/SDDR09"; us->transport_name = "Control/Bulk-EUSB/SDDR09";
us->transport = dpcm_transport; us->transport = dpcm_transport;
us->transport_reset = usb_stor_CB_reset; us->transport_reset = usb_stor_CB_reset;
......
...@@ -642,7 +642,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) ...@@ -642,7 +642,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
* unless the operation involved a data-in transfer. Devices * unless the operation involved a data-in transfer. Devices
* can signal most data-in errors by stalling the bulk-in pipe. * can signal most data-in errors by stalling the bulk-in pipe.
*/ */
if ((us->protocol == US_PR_CB || us->protocol == US_PR_DPCM_USB) && if ((us->protocol == USB_PR_CB || us->protocol == USB_PR_DPCM_USB) &&
srb->sc_data_direction != DMA_FROM_DEVICE) { srb->sc_data_direction != DMA_FROM_DEVICE) {
US_DEBUGP("-- CB transport device requiring auto-sense\n"); US_DEBUGP("-- CB transport device requiring auto-sense\n");
need_auto_sense = 1; need_auto_sense = 1;
...@@ -701,8 +701,8 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) ...@@ -701,8 +701,8 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
scsi_eh_prep_cmnd(srb, &ses, NULL, 0, sense_size); scsi_eh_prep_cmnd(srb, &ses, NULL, 0, sense_size);
/* FIXME: we must do the protocol translation here */ /* FIXME: we must do the protocol translation here */
if (us->subclass == US_SC_RBC || us->subclass == US_SC_SCSI || if (us->subclass == USB_SC_RBC || us->subclass == USB_SC_SCSI ||
us->subclass == US_SC_CYP_ATACB) us->subclass == USB_SC_CYP_ATACB)
srb->cmd_len = 6; srb->cmd_len = 6;
else else
srb->cmd_len = 12; srb->cmd_len = 12;
...@@ -926,7 +926,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us) ...@@ -926,7 +926,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us)
/* NOTE: CB does not have a status stage. Silly, I know. So /* NOTE: CB does not have a status stage. Silly, I know. So
* we have to catch this at a higher level. * we have to catch this at a higher level.
*/ */
if (us->protocol != US_PR_CBI) if (us->protocol != USB_PR_CBI)
return USB_STOR_TRANSPORT_GOOD; return USB_STOR_TRANSPORT_GOOD;
result = usb_stor_intr_transfer(us, us->iobuf, 2); result = usb_stor_intr_transfer(us, us->iobuf, 2);
...@@ -942,7 +942,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us) ...@@ -942,7 +942,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us)
* that this means we could be ignoring a real error on these * that this means we could be ignoring a real error on these
* commands, but that can't be helped. * commands, but that can't be helped.
*/ */
if (us->subclass == US_SC_UFI) { if (us->subclass == USB_SC_UFI) {
if (srb->cmnd[0] == REQUEST_SENSE || if (srb->cmnd[0] == REQUEST_SENSE ||
srb->cmnd[0] == INQUIRY) srb->cmnd[0] == INQUIRY)
return USB_STOR_TRANSPORT_GOOD; return USB_STOR_TRANSPORT_GOOD;
......
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
UNUSUAL_DEV( 0x0584, 0x0008, 0x0102, 0x0102, UNUSUAL_DEV( 0x0584, 0x0008, 0x0102, 0x0102,
"Fujifilm", "Fujifilm",
"DPC-R1 (Alauda)", "DPC-R1 (Alauda)",
US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0), USB_SC_SCSI, USB_PR_ALAUDA, init_alauda, 0),
UNUSUAL_DEV( 0x07b4, 0x010a, 0x0102, 0x0102, UNUSUAL_DEV( 0x07b4, 0x010a, 0x0102, 0x0102,
"Olympus", "Olympus",
"MAUSB-10 (Alauda)", "MAUSB-10 (Alauda)",
US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0), USB_SC_SCSI, USB_PR_ALAUDA, init_alauda, 0),
#endif /* defined(CONFIG_USB_STORAGE_ALAUDA) || ... */ #endif /* defined(CONFIG_USB_STORAGE_ALAUDA) || ... */
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
UNUSUAL_DEV( 0x04b4, 0x6830, 0x0000, 0x9999, UNUSUAL_DEV( 0x04b4, 0x6830, 0x0000, 0x9999,
"Cypress", "Cypress",
"Cypress AT2LP", "Cypress AT2LP",
US_SC_CYP_ATACB, US_PR_DEVICE, NULL, 0), USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
/* CY7C68310 : support atacb and atacb2 */ /* CY7C68310 : support atacb and atacb2 */
UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x9999, UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x9999,
"Cypress", "Cypress",
"Cypress ISD-300LP", "Cypress ISD-300LP",
US_SC_CYP_ATACB, US_PR_DEVICE, NULL, 0), USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
#endif /* defined(CONFIG_USB_STORAGE_CYPRESS_ATACB) || ... */ #endif /* defined(CONFIG_USB_STORAGE_CYPRESS_ATACB) || ... */
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
UNUSUAL_DEV( 0x07c4, 0xa000, 0x0000, 0x0015, UNUSUAL_DEV( 0x07c4, 0xa000, 0x0000, 0x0015,
"Datafab", "Datafab",
"MDCFE-B USB CF Reader", "MDCFE-B USB CF Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
0), 0),
/* /*
...@@ -38,45 +38,45 @@ UNUSUAL_DEV( 0x07c4, 0xa000, 0x0000, 0x0015, ...@@ -38,45 +38,45 @@ UNUSUAL_DEV( 0x07c4, 0xa000, 0x0000, 0x0015,
UNUSUAL_DEV( 0x07c4, 0xa001, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa001, 0x0000, 0xffff,
"SIIG/Datafab", "SIIG/Datafab",
"SIIG/Datafab Memory Stick+CF Reader/Writer", "SIIG/Datafab Memory Stick+CF Reader/Writer",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
0), 0),
/* Reported by Josef Reisinger <josef.reisinger@netcologne.de> */ /* Reported by Josef Reisinger <josef.reisinger@netcologne.de> */
UNUSUAL_DEV( 0x07c4, 0xa002, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa002, 0x0000, 0xffff,
"Datafab/Unknown", "Datafab/Unknown",
"MD2/MD3 Disk enclosure", "MD2/MD3 Disk enclosure",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
UNUSUAL_DEV( 0x07c4, 0xa003, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa003, 0x0000, 0xffff,
"Datafab/Unknown", "Datafab/Unknown",
"Datafab-based Reader", "Datafab-based Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
0), 0),
UNUSUAL_DEV( 0x07c4, 0xa004, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa004, 0x0000, 0xffff,
"Datafab/Unknown", "Datafab/Unknown",
"Datafab-based Reader", "Datafab-based Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
0), 0),
UNUSUAL_DEV( 0x07c4, 0xa005, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa005, 0x0000, 0xffff,
"PNY/Datafab", "PNY/Datafab",
"PNY/Datafab CF+SM Reader", "PNY/Datafab CF+SM Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
0), 0),
UNUSUAL_DEV( 0x07c4, 0xa006, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa006, 0x0000, 0xffff,
"Simple Tech/Datafab", "Simple Tech/Datafab",
"Simple Tech/Datafab CF+SM Reader", "Simple Tech/Datafab CF+SM Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
0), 0),
/* Submitted by Olaf Hering <olh@suse.de> */ /* Submitted by Olaf Hering <olh@suse.de> */
UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff,
"Datafab Systems, Inc.", "Datafab Systems, Inc.",
"USB to CF + SM Combo (LC1)", "USB to CF + SM Combo (LC1)",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
0), 0),
/* Reported by Felix Moeller <felix@derklecks.de> /* Reported by Felix Moeller <felix@derklecks.de>
...@@ -86,13 +86,13 @@ UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff, ...@@ -86,13 +86,13 @@ UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff,
UNUSUAL_DEV( 0x07c4, 0xa10b, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa10b, 0x0000, 0xffff,
"DataFab Systems Inc.", "DataFab Systems Inc.",
"USB CF+MS", "USB CF+MS",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
0), 0),
UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff, UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff,
"Acomdata", "Acomdata",
"CF", "CF",
US_SC_SCSI, US_PR_DATAFAB, NULL, USB_SC_SCSI, USB_PR_DATAFAB, NULL,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
#endif /* defined(CONFIG_USB_STORAGE_DATAFAB) || ... */ #endif /* defined(CONFIG_USB_STORAGE_DATAFAB) || ... */
...@@ -63,26 +63,26 @@ ...@@ -63,26 +63,26 @@
UNUSUAL_DEV( 0x03eb, 0x2002, 0x0100, 0x0100, UNUSUAL_DEV( 0x03eb, 0x2002, 0x0100, 0x0100,
"ATMEL", "ATMEL",
"SND1 Storage", "SND1 Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE), US_FL_IGNORE_RESIDUE),
/* Reported by Rodolfo Quesada <rquesada@roqz.net> */ /* Reported by Rodolfo Quesada <rquesada@roqz.net> */
UNUSUAL_DEV( 0x03ee, 0x6906, 0x0003, 0x0003, UNUSUAL_DEV( 0x03ee, 0x6906, 0x0003, 0x0003,
"VIA Technologies Inc.", "VIA Technologies Inc.",
"Mitsumi multi cardreader", "Mitsumi multi cardreader",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
UNUSUAL_DEV( 0x03f0, 0x0107, 0x0200, 0x0200, UNUSUAL_DEV( 0x03f0, 0x0107, 0x0200, 0x0200,
"HP", "HP",
"CD-Writer+", "CD-Writer+",
US_SC_8070, US_PR_CB, NULL, 0), USB_SC_8070, USB_PR_CB, NULL, 0),
/* Reported by Ben Efros <ben@pc-doctor.com> */ /* Reported by Ben Efros <ben@pc-doctor.com> */
UNUSUAL_DEV( 0x03f0, 0x070c, 0x0000, 0x0000, UNUSUAL_DEV( 0x03f0, 0x070c, 0x0000, 0x0000,
"HP", "HP",
"Personal Media Drive", "Personal Media Drive",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SANE_SENSE ), US_FL_SANE_SENSE ),
/* Reported by Grant Grundler <grundler@parisc-linux.org> /* Reported by Grant Grundler <grundler@parisc-linux.org>
...@@ -91,7 +91,7 @@ UNUSUAL_DEV( 0x03f0, 0x070c, 0x0000, 0x0000, ...@@ -91,7 +91,7 @@ UNUSUAL_DEV( 0x03f0, 0x070c, 0x0000, 0x0000,
UNUSUAL_DEV( 0x03f0, 0x4002, 0x0001, 0x0001, UNUSUAL_DEV( 0x03f0, 0x4002, 0x0001, 0x0001,
"HP", "HP",
"PhotoSmart R707", "PhotoSmart R707",
US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_CAPACITY), USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_FIX_CAPACITY),
/* Reported by Sebastian Kapfer <sebastian_kapfer@gmx.net> /* Reported by Sebastian Kapfer <sebastian_kapfer@gmx.net>
* and Olaf Hering <olh@suse.de> (different bcd's, same vendor/product) * and Olaf Hering <olh@suse.de> (different bcd's, same vendor/product)
...@@ -100,14 +100,14 @@ UNUSUAL_DEV( 0x03f0, 0x4002, 0x0001, 0x0001, ...@@ -100,14 +100,14 @@ UNUSUAL_DEV( 0x03f0, 0x4002, 0x0001, 0x0001,
UNUSUAL_DEV( 0x0409, 0x0040, 0x0000, 0x9999, UNUSUAL_DEV( 0x0409, 0x0040, 0x0000, 0x9999,
"NEC", "NEC",
"NEC USB UF000x", "NEC USB UF000x",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* Patch submitted by Mihnea-Costin Grigore <mihnea@zulu.ro> */ /* Patch submitted by Mihnea-Costin Grigore <mihnea@zulu.ro> */
UNUSUAL_DEV( 0x040d, 0x6205, 0x0003, 0x0003, UNUSUAL_DEV( 0x040d, 0x6205, 0x0003, 0x0003,
"VIA Technologies Inc.", "VIA Technologies Inc.",
"USB 2.0 Card Reader", "USB 2.0 Card Reader",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Deduced by Jonathan Woithe <jwoithe@physics.adelaide.edu.au> /* Deduced by Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
...@@ -117,40 +117,40 @@ UNUSUAL_DEV( 0x040d, 0x6205, 0x0003, 0x0003, ...@@ -117,40 +117,40 @@ UNUSUAL_DEV( 0x040d, 0x6205, 0x0003, 0x0003,
UNUSUAL_DEV( 0x0411, 0x001c, 0x0113, 0x0113, UNUSUAL_DEV( 0x0411, 0x001c, 0x0113, 0x0113,
"Buffalo", "Buffalo",
"DUB-P40G HDD", "DUB-P40G HDD",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
/* Submitted by Ernestas Vaiciukevicius <ernisv@gmail.com> */ /* Submitted by Ernestas Vaiciukevicius <ernisv@gmail.com> */
UNUSUAL_DEV( 0x0419, 0x0100, 0x0100, 0x0100, UNUSUAL_DEV( 0x0419, 0x0100, 0x0100, 0x0100,
"Samsung Info. Systems America, Inc.", "Samsung Info. Systems America, Inc.",
"MP3 Player", "MP3 Player",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Orgad Shaneh <orgads@gmail.com> */ /* Reported by Orgad Shaneh <orgads@gmail.com> */
UNUSUAL_DEV( 0x0419, 0xaace, 0x0100, 0x0100, UNUSUAL_DEV( 0x0419, 0xaace, 0x0100, 0x0100,
"Samsung", "MP3 Player", "Samsung", "MP3 Player",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Christian Leber <christian@leber.de> */ /* Reported by Christian Leber <christian@leber.de> */
UNUSUAL_DEV( 0x0419, 0xaaf5, 0x0100, 0x0100, UNUSUAL_DEV( 0x0419, 0xaaf5, 0x0100, 0x0100,
"TrekStor", "TrekStor",
"i.Beat 115 2.0", "i.Beat 115 2.0",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_NOT_LOCKABLE ), US_FL_IGNORE_RESIDUE | US_FL_NOT_LOCKABLE ),
/* Reported by Stefan Werner <dustbln@gmx.de> */ /* Reported by Stefan Werner <dustbln@gmx.de> */
UNUSUAL_DEV( 0x0419, 0xaaf6, 0x0100, 0x0100, UNUSUAL_DEV( 0x0419, 0xaaf6, 0x0100, 0x0100,
"TrekStor", "TrekStor",
"i.Beat Joy 2.0", "i.Beat Joy 2.0",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Pete Zaitcev <zaitcev@redhat.com>, bz#176584 */ /* Reported by Pete Zaitcev <zaitcev@redhat.com>, bz#176584 */
UNUSUAL_DEV( 0x0420, 0x0001, 0x0100, 0x0100, UNUSUAL_DEV( 0x0420, 0x0001, 0x0100, 0x0100,
"GENERIC", "MP3 PLAYER", /* MyMusix PD-205 on the outside. */ "GENERIC", "MP3 PLAYER", /* MyMusix PD-205 on the outside. */
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Andrew Nayenko <relan@bk.ru> /* Reported by Andrew Nayenko <relan@bk.ru>
...@@ -158,28 +158,28 @@ UNUSUAL_DEV( 0x0420, 0x0001, 0x0100, 0x0100, ...@@ -158,28 +158,28 @@ UNUSUAL_DEV( 0x0420, 0x0001, 0x0100, 0x0100,
UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x0610, UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x0610,
"Nokia", "Nokia",
"Nokia 6288", "Nokia 6288",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64 ), US_FL_MAX_SECTORS_64 ),
/* Reported by Mario Rettig <mariorettig@web.de> */ /* Reported by Mario Rettig <mariorettig@web.de> */
UNUSUAL_DEV( 0x0421, 0x042e, 0x0100, 0x0100, UNUSUAL_DEV( 0x0421, 0x042e, 0x0100, 0x0100,
"Nokia", "Nokia",
"Nokia 3250", "Nokia 3250",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ), US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
/* Reported by <honkkis@gmail.com> */ /* Reported by <honkkis@gmail.com> */
UNUSUAL_DEV( 0x0421, 0x0433, 0x0100, 0x0100, UNUSUAL_DEV( 0x0421, 0x0433, 0x0100, 0x0100,
"Nokia", "Nokia",
"E70", "E70",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ), US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
/* Reported by Jon Hart <Jon.Hart@web.de> */ /* Reported by Jon Hart <Jon.Hart@web.de> */
UNUSUAL_DEV( 0x0421, 0x0434, 0x0100, 0x0100, UNUSUAL_DEV( 0x0421, 0x0434, 0x0100, 0x0100,
"Nokia", "Nokia",
"E60", "E60",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ), US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ),
/* Reported by Sumedha Swamy <sumedhaswamy@gmail.com> and /* Reported by Sumedha Swamy <sumedhaswamy@gmail.com> and
...@@ -187,7 +187,7 @@ UNUSUAL_DEV( 0x0421, 0x0434, 0x0100, 0x0100, ...@@ -187,7 +187,7 @@ UNUSUAL_DEV( 0x0421, 0x0434, 0x0100, 0x0100,
UNUSUAL_DEV( 0x0421, 0x0444, 0x0100, 0x0100, UNUSUAL_DEV( 0x0421, 0x0444, 0x0100, 0x0100,
"Nokia", "Nokia",
"N91", "N91",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ), US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
/* Reported by Jiri Slaby <jirislaby@gmail.com> and /* Reported by Jiri Slaby <jirislaby@gmail.com> and
...@@ -195,42 +195,42 @@ UNUSUAL_DEV( 0x0421, 0x0444, 0x0100, 0x0100, ...@@ -195,42 +195,42 @@ UNUSUAL_DEV( 0x0421, 0x0444, 0x0100, 0x0100,
UNUSUAL_DEV( 0x0421, 0x0446, 0x0100, 0x0100, UNUSUAL_DEV( 0x0421, 0x0446, 0x0100, 0x0100,
"Nokia", "Nokia",
"N80", "N80",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ), US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
/* Reported by Matthew Bloch <matthew@bytemark.co.uk> */ /* Reported by Matthew Bloch <matthew@bytemark.co.uk> */
UNUSUAL_DEV( 0x0421, 0x044e, 0x0100, 0x0100, UNUSUAL_DEV( 0x0421, 0x044e, 0x0100, 0x0100,
"Nokia", "Nokia",
"E61", "E61",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ), US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
/* Reported by Bardur Arantsson <bardur@scientician.net> */ /* Reported by Bardur Arantsson <bardur@scientician.net> */
UNUSUAL_DEV( 0x0421, 0x047c, 0x0370, 0x0610, UNUSUAL_DEV( 0x0421, 0x047c, 0x0370, 0x0610,
"Nokia", "Nokia",
"6131", "6131",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64 ), US_FL_MAX_SECTORS_64 ),
/* Reported by Manuel Osdoba <manuel.osdoba@tu-ilmenau.de> */ /* Reported by Manuel Osdoba <manuel.osdoba@tu-ilmenau.de> */
UNUSUAL_DEV( 0x0421, 0x0492, 0x0452, 0x9999, UNUSUAL_DEV( 0x0421, 0x0492, 0x0452, 0x9999,
"Nokia", "Nokia",
"Nokia 6233", "Nokia 6233",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64 ), US_FL_MAX_SECTORS_64 ),
/* Reported by Alex Corcoles <alex@corcoles.net> */ /* Reported by Alex Corcoles <alex@corcoles.net> */
UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x0370, UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x0370,
"Nokia", "Nokia",
"6234", "6234",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64 ), US_FL_MAX_SECTORS_64 ),
#ifdef NO_SDDR09 #ifdef NO_SDDR09
UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100, UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100,
"Microtech", "Microtech",
"CameraMate", "CameraMate",
US_SC_SCSI, US_PR_CB, NULL, USB_SC_SCSI, USB_PR_CB, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
#endif #endif
...@@ -239,7 +239,7 @@ UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100, ...@@ -239,7 +239,7 @@ UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100,
UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x0100, UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x0100,
"Neuros Audio", "Neuros Audio",
"USB 2.0 HD 2.5", "USB 2.0 HD 2.5",
US_SC_DEVICE, US_PR_BULK, NULL, USB_SC_DEVICE, USB_PR_BULK, NULL,
US_FL_NEED_OVERRIDE ), US_FL_NEED_OVERRIDE ),
/* /*
...@@ -250,7 +250,7 @@ UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x0100, ...@@ -250,7 +250,7 @@ UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x0100,
UNUSUAL_DEV( 0x0457, 0x0150, 0x0100, 0x0100, UNUSUAL_DEV( 0x0457, 0x0150, 0x0100, 0x0100,
"USBest Technology", /* sold by Transcend */ "USBest Technology", /* sold by Transcend */
"USB Mass Storage Device", "USB Mass Storage Device",
US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
/* /*
* Bohdan Linda <bohdan.linda@gmail.com> * Bohdan Linda <bohdan.linda@gmail.com>
...@@ -260,7 +260,7 @@ UNUSUAL_DEV( 0x0457, 0x0150, 0x0100, 0x0100, ...@@ -260,7 +260,7 @@ UNUSUAL_DEV( 0x0457, 0x0150, 0x0100, 0x0100,
UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x0100, UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x0100,
"USB 2.0", "USB 2.0",
"Flash Disk", "Flash Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_NOT_LOCKABLE ), US_FL_NOT_LOCKABLE ),
/* Reported by Tamas Kerecsen <kerecsen@bigfoot.com> /* Reported by Tamas Kerecsen <kerecsen@bigfoot.com>
...@@ -272,7 +272,7 @@ UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x0100, ...@@ -272,7 +272,7 @@ UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x0100,
UNUSUAL_DEV( 0x045e, 0xffff, 0x0000, 0x0000, UNUSUAL_DEV( 0x045e, 0xffff, 0x0000, 0x0000,
"Mitac", "Mitac",
"GPS", "GPS",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64 ), US_FL_MAX_SECTORS_64 ),
/* /*
...@@ -284,32 +284,32 @@ UNUSUAL_DEV( 0x045e, 0xffff, 0x0000, 0x0000, ...@@ -284,32 +284,32 @@ UNUSUAL_DEV( 0x045e, 0xffff, 0x0000, 0x0000,
UNUSUAL_DEV( 0x046b, 0xff40, 0x0100, 0x0100, UNUSUAL_DEV( 0x046b, 0xff40, 0x0100, 0x0100,
"AMI", "AMI",
"Virtual Floppy", "Virtual Floppy",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_NO_WP_DETECT), US_FL_NO_WP_DETECT),
/* Patch submitted by Philipp Friedrich <philipp@void.at> */ /* Patch submitted by Philipp Friedrich <philipp@void.at> */
UNUSUAL_DEV( 0x0482, 0x0100, 0x0100, 0x0100, UNUSUAL_DEV( 0x0482, 0x0100, 0x0100, 0x0100,
"Kyocera", "Kyocera",
"Finecam S3x", "Finecam S3x",
US_SC_8070, US_PR_CB, NULL, US_FL_FIX_INQUIRY), USB_SC_8070, USB_PR_CB, NULL, US_FL_FIX_INQUIRY),
/* Patch submitted by Philipp Friedrich <philipp@void.at> */ /* Patch submitted by Philipp Friedrich <philipp@void.at> */
UNUSUAL_DEV( 0x0482, 0x0101, 0x0100, 0x0100, UNUSUAL_DEV( 0x0482, 0x0101, 0x0100, 0x0100,
"Kyocera", "Kyocera",
"Finecam S4", "Finecam S4",
US_SC_8070, US_PR_CB, NULL, US_FL_FIX_INQUIRY), USB_SC_8070, USB_PR_CB, NULL, US_FL_FIX_INQUIRY),
/* Patch submitted by Stephane Galles <stephane.galles@free.fr> */ /* Patch submitted by Stephane Galles <stephane.galles@free.fr> */
UNUSUAL_DEV( 0x0482, 0x0103, 0x0100, 0x0100, UNUSUAL_DEV( 0x0482, 0x0103, 0x0100, 0x0100,
"Kyocera", "Kyocera",
"Finecam S5", "Finecam S5",
US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY), USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
/* Patch submitted by Jens Taprogge <jens.taprogge@taprogge.org> */ /* Patch submitted by Jens Taprogge <jens.taprogge@taprogge.org> */
UNUSUAL_DEV( 0x0482, 0x0107, 0x0100, 0x0100, UNUSUAL_DEV( 0x0482, 0x0107, 0x0100, 0x0100,
"Kyocera", "Kyocera",
"CONTAX SL300R T*", "CONTAX SL300R T*",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE), US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE),
/* Reported by Paul Stewart <stewart@wetlogic.net> /* Reported by Paul Stewart <stewart@wetlogic.net>
...@@ -317,7 +317,7 @@ UNUSUAL_DEV( 0x0482, 0x0107, 0x0100, 0x0100, ...@@ -317,7 +317,7 @@ UNUSUAL_DEV( 0x0482, 0x0107, 0x0100, 0x0100,
UNUSUAL_DEV( 0x04a4, 0x0004, 0x0001, 0x0001, UNUSUAL_DEV( 0x04a4, 0x0004, 0x0001, 0x0001,
"Hitachi", "Hitachi",
"DVD-CAM DZ-MV100A Camcorder", "DVD-CAM DZ-MV100A Camcorder",
US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN), USB_SC_SCSI, USB_PR_CB, NULL, US_FL_SINGLE_LUN),
/* BENQ DC5330 /* BENQ DC5330
* Reported by Manuel Fombuena <mfombuena@ya.com> and * Reported by Manuel Fombuena <mfombuena@ya.com> and
...@@ -325,7 +325,7 @@ UNUSUAL_DEV( 0x04a4, 0x0004, 0x0001, 0x0001, ...@@ -325,7 +325,7 @@ UNUSUAL_DEV( 0x04a4, 0x0004, 0x0001, 0x0001,
UNUSUAL_DEV( 0x04a5, 0x3010, 0x0100, 0x0100, UNUSUAL_DEV( 0x04a5, 0x3010, 0x0100, 0x0100,
"Tekom Technologies, Inc", "Tekom Technologies, Inc",
"300_CAMERA", "300_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Patch for Nikon coolpix 2000 /* Patch for Nikon coolpix 2000
...@@ -333,14 +333,14 @@ UNUSUAL_DEV( 0x04a5, 0x3010, 0x0100, 0x0100, ...@@ -333,14 +333,14 @@ UNUSUAL_DEV( 0x04a5, 0x3010, 0x0100, 0x0100,
UNUSUAL_DEV( 0x04b0, 0x0301, 0x0010, 0x0010, UNUSUAL_DEV( 0x04b0, 0x0301, 0x0010, 0x0010,
"NIKON", "NIKON",
"NIKON DSC E2000", "NIKON DSC E2000",
US_SC_DEVICE, US_PR_DEVICE,NULL, USB_SC_DEVICE, USB_PR_DEVICE,NULL,
US_FL_NOT_LOCKABLE ), US_FL_NOT_LOCKABLE ),
/* Reported by Doug Maxey (dwm@austin.ibm.com) */ /* Reported by Doug Maxey (dwm@austin.ibm.com) */
UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110, UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110,
"IBM", "IBM",
"IBM RSA2", "IBM RSA2",
US_SC_DEVICE, US_PR_CB, NULL, USB_SC_DEVICE, USB_PR_CB, NULL,
US_FL_MAX_SECTORS_MIN), US_FL_MAX_SECTORS_MIN),
/* Reported by Simon Levitt <simon@whattf.com> /* Reported by Simon Levitt <simon@whattf.com>
...@@ -348,14 +348,14 @@ UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110, ...@@ -348,14 +348,14 @@ UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110,
UNUSUAL_DEV( 0x04b8, 0x0601, 0x0100, 0x0100, UNUSUAL_DEV( 0x04b8, 0x0601, 0x0100, 0x0100,
"Epson", "Epson",
"875DC Storage", "875DC Storage",
US_SC_SCSI, US_PR_CB, NULL, US_FL_FIX_INQUIRY), USB_SC_SCSI, USB_PR_CB, NULL, US_FL_FIX_INQUIRY),
/* Reported by Khalid Aziz <khalid@gonehiking.org> /* Reported by Khalid Aziz <khalid@gonehiking.org>
* This entry is needed because the device reports Sub=ff */ * This entry is needed because the device reports Sub=ff */
UNUSUAL_DEV( 0x04b8, 0x0602, 0x0110, 0x0110, UNUSUAL_DEV( 0x04b8, 0x0602, 0x0110, 0x0110,
"Epson", "Epson",
"785EPX Storage", "785EPX Storage",
US_SC_SCSI, US_PR_BULK, NULL, US_FL_SINGLE_LUN), USB_SC_SCSI, USB_PR_BULK, NULL, US_FL_SINGLE_LUN),
/* Not sure who reported this originally but /* Not sure who reported this originally but
* Pavel Machek <pavel@ucw.cz> reported that the extra US_FL_SINGLE_LUN * Pavel Machek <pavel@ucw.cz> reported that the extra US_FL_SINGLE_LUN
...@@ -363,7 +363,7 @@ UNUSUAL_DEV( 0x04b8, 0x0602, 0x0110, 0x0110, ...@@ -363,7 +363,7 @@ UNUSUAL_DEV( 0x04b8, 0x0602, 0x0110, 0x0110,
UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210, UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210,
"Fujifilm", "Fujifilm",
"FinePix 1400Zoom", "FinePix 1400Zoom",
US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN), USB_SC_UFI, USB_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN),
/* Reported by Ondrej Zary <linux@rainbow-software.org> /* Reported by Ondrej Zary <linux@rainbow-software.org>
* The device reports one sector more and breaks when that sector is accessed * The device reports one sector more and breaks when that sector is accessed
...@@ -371,7 +371,7 @@ UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210, ...@@ -371,7 +371,7 @@ UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210,
UNUSUAL_DEV( 0x04ce, 0x0002, 0x026c, 0x026c, UNUSUAL_DEV( 0x04ce, 0x0002, 0x026c, 0x026c,
"ScanLogic", "ScanLogic",
"SL11R-IDE", "SL11R-IDE",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY), US_FL_FIX_CAPACITY),
/* Reported by Kriston Fincher <kriston@airmail.net> /* Reported by Kriston Fincher <kriston@airmail.net>
...@@ -382,27 +382,27 @@ UNUSUAL_DEV( 0x04ce, 0x0002, 0x026c, 0x026c, ...@@ -382,27 +382,27 @@ UNUSUAL_DEV( 0x04ce, 0x0002, 0x026c, 0x026c,
UNUSUAL_DEV( 0x04da, 0x0901, 0x0100, 0x0200, UNUSUAL_DEV( 0x04da, 0x0901, 0x0100, 0x0200,
"Panasonic", "Panasonic",
"LS-120 Camera", "LS-120 Camera",
US_SC_UFI, US_PR_DEVICE, NULL, 0), USB_SC_UFI, USB_PR_DEVICE, NULL, 0),
/* From Yukihiro Nakai, via zaitcev@yahoo.com. /* From Yukihiro Nakai, via zaitcev@yahoo.com.
* This is needed for CB instead of CBI */ * This is needed for CB instead of CBI */
UNUSUAL_DEV( 0x04da, 0x0d05, 0x0000, 0x0000, UNUSUAL_DEV( 0x04da, 0x0d05, 0x0000, 0x0000,
"Sharp CE-CW05", "Sharp CE-CW05",
"CD-R/RW Drive", "CD-R/RW Drive",
US_SC_8070, US_PR_CB, NULL, 0), USB_SC_8070, USB_PR_CB, NULL, 0),
/* Reported by Adriaan Penning <a.penning@luon.net> */ /* Reported by Adriaan Penning <a.penning@luon.net> */
UNUSUAL_DEV( 0x04da, 0x2372, 0x0000, 0x9999, UNUSUAL_DEV( 0x04da, 0x2372, 0x0000, 0x9999,
"Panasonic", "Panasonic",
"DMC-LCx Camera", "DMC-LCx Camera",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE ), US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE ),
/* Reported by Simeon Simeonov <simeonov_2000@yahoo.com> */ /* Reported by Simeon Simeonov <simeonov_2000@yahoo.com> */
UNUSUAL_DEV( 0x04da, 0x2373, 0x0000, 0x9999, UNUSUAL_DEV( 0x04da, 0x2373, 0x0000, 0x9999,
"LEICA", "LEICA",
"D-LUX Camera", "D-LUX Camera",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE ), US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE ),
/* Most of the following entries were developed with the help of /* Most of the following entries were developed with the help of
...@@ -411,19 +411,19 @@ UNUSUAL_DEV( 0x04da, 0x2373, 0x0000, 0x9999, ...@@ -411,19 +411,19 @@ UNUSUAL_DEV( 0x04da, 0x2373, 0x0000, 0x9999,
UNUSUAL_DEV( 0x04e6, 0x0001, 0x0200, 0x0200, UNUSUAL_DEV( 0x04e6, 0x0001, 0x0200, 0x0200,
"Matshita", "Matshita",
"LS-120", "LS-120",
US_SC_8020, US_PR_CB, NULL, 0), USB_SC_8020, USB_PR_CB, NULL, 0),
UNUSUAL_DEV( 0x04e6, 0x0002, 0x0100, 0x0100, UNUSUAL_DEV( 0x04e6, 0x0002, 0x0100, 0x0100,
"Shuttle", "Shuttle",
"eUSCSI Bridge", "eUSCSI Bridge",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
US_FL_SCM_MULT_TARG ), US_FL_SCM_MULT_TARG ),
#ifdef NO_SDDR09 #ifdef NO_SDDR09
UNUSUAL_DEV( 0x04e6, 0x0005, 0x0100, 0x0208, UNUSUAL_DEV( 0x04e6, 0x0005, 0x0100, 0x0208,
"SCM Microsystems", "SCM Microsystems",
"eUSB CompactFlash Adapter", "eUSB CompactFlash Adapter",
US_SC_SCSI, US_PR_CB, NULL, USB_SC_SCSI, USB_PR_CB, NULL,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
#endif #endif
...@@ -431,54 +431,54 @@ UNUSUAL_DEV( 0x04e6, 0x0005, 0x0100, 0x0208, ...@@ -431,54 +431,54 @@ UNUSUAL_DEV( 0x04e6, 0x0005, 0x0100, 0x0208,
UNUSUAL_DEV( 0x04e6, 0x0006, 0x0100, 0x0100, UNUSUAL_DEV( 0x04e6, 0x0006, 0x0100, 0x0100,
"SCM Microsystems Inc.", "SCM Microsystems Inc.",
"eUSB MMC Adapter", "eUSB MMC Adapter",
US_SC_SCSI, US_PR_CB, NULL, USB_SC_SCSI, USB_PR_CB, NULL,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
/* Reported by Daniel Nouri <dpunktnpunkt@web.de> */ /* Reported by Daniel Nouri <dpunktnpunkt@web.de> */
UNUSUAL_DEV( 0x04e6, 0x0006, 0x0205, 0x0205, UNUSUAL_DEV( 0x04e6, 0x0006, 0x0205, 0x0205,
"Shuttle", "Shuttle",
"eUSB MMC Adapter", "eUSB MMC Adapter",
US_SC_SCSI, US_PR_DEVICE, NULL, USB_SC_SCSI, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
UNUSUAL_DEV( 0x04e6, 0x0007, 0x0100, 0x0200, UNUSUAL_DEV( 0x04e6, 0x0007, 0x0100, 0x0200,
"Sony", "Sony",
"Hifd", "Hifd",
US_SC_SCSI, US_PR_CB, NULL, USB_SC_SCSI, USB_PR_CB, NULL,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
UNUSUAL_DEV( 0x04e6, 0x0009, 0x0200, 0x0200, UNUSUAL_DEV( 0x04e6, 0x0009, 0x0200, 0x0200,
"Shuttle", "Shuttle",
"eUSB ATA/ATAPI Adapter", "eUSB ATA/ATAPI Adapter",
US_SC_8020, US_PR_CB, NULL, 0), USB_SC_8020, USB_PR_CB, NULL, 0),
UNUSUAL_DEV( 0x04e6, 0x000a, 0x0200, 0x0200, UNUSUAL_DEV( 0x04e6, 0x000a, 0x0200, 0x0200,
"Shuttle", "Shuttle",
"eUSB CompactFlash Adapter", "eUSB CompactFlash Adapter",
US_SC_8020, US_PR_CB, NULL, 0), USB_SC_8020, USB_PR_CB, NULL, 0),
UNUSUAL_DEV( 0x04e6, 0x000B, 0x0100, 0x0100, UNUSUAL_DEV( 0x04e6, 0x000B, 0x0100, 0x0100,
"Shuttle", "Shuttle",
"eUSCSI Bridge", "eUSCSI Bridge",
US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, USB_SC_SCSI, USB_PR_BULK, usb_stor_euscsi_init,
US_FL_SCM_MULT_TARG ), US_FL_SCM_MULT_TARG ),
UNUSUAL_DEV( 0x04e6, 0x000C, 0x0100, 0x0100, UNUSUAL_DEV( 0x04e6, 0x000C, 0x0100, 0x0100,
"Shuttle", "Shuttle",
"eUSCSI Bridge", "eUSCSI Bridge",
US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, USB_SC_SCSI, USB_PR_BULK, usb_stor_euscsi_init,
US_FL_SCM_MULT_TARG ), US_FL_SCM_MULT_TARG ),
UNUSUAL_DEV( 0x04e6, 0x0101, 0x0200, 0x0200, UNUSUAL_DEV( 0x04e6, 0x0101, 0x0200, 0x0200,
"Shuttle", "Shuttle",
"CD-RW Device", "CD-RW Device",
US_SC_8020, US_PR_CB, NULL, 0), USB_SC_8020, USB_PR_CB, NULL, 0),
/* Reported by Dmitry Khlystov <adminimus@gmail.com> */ /* Reported by Dmitry Khlystov <adminimus@gmail.com> */
UNUSUAL_DEV( 0x04e8, 0x507c, 0x0220, 0x0220, UNUSUAL_DEV( 0x04e8, 0x507c, 0x0220, 0x0220,
"Samsung", "Samsung",
"YP-U3", "YP-U3",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64), US_FL_MAX_SECTORS_64),
/* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>. /* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>.
...@@ -488,14 +488,14 @@ UNUSUAL_DEV( 0x04e8, 0x507c, 0x0220, 0x0220, ...@@ -488,14 +488,14 @@ UNUSUAL_DEV( 0x04e8, 0x507c, 0x0220, 0x0220,
UNUSUAL_DEV( 0x04fc, 0x80c2, 0x0100, 0x0100, UNUSUAL_DEV( 0x04fc, 0x80c2, 0x0100, 0x0100,
"Kobian Mercury", "Kobian Mercury",
"Binocam DCB-132", "Binocam DCB-132",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_BULK32), US_FL_BULK32),
/* Reported by Bob Sass <rls@vectordb.com> -- only rev 1.33 tested */ /* Reported by Bob Sass <rls@vectordb.com> -- only rev 1.33 tested */
UNUSUAL_DEV( 0x050d, 0x0115, 0x0133, 0x0133, UNUSUAL_DEV( 0x050d, 0x0115, 0x0133, 0x0133,
"Belkin", "Belkin",
"USB SCSI Adaptor", "USB SCSI Adaptor",
US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, USB_SC_SCSI, USB_PR_BULK, usb_stor_euscsi_init,
US_FL_SCM_MULT_TARG ), US_FL_SCM_MULT_TARG ),
/* Iomega Clik! Drive /* Iomega Clik! Drive
...@@ -505,14 +505,14 @@ UNUSUAL_DEV( 0x050d, 0x0115, 0x0133, 0x0133, ...@@ -505,14 +505,14 @@ UNUSUAL_DEV( 0x050d, 0x0115, 0x0133, 0x0133,
UNUSUAL_DEV( 0x0525, 0xa140, 0x0100, 0x0100, UNUSUAL_DEV( 0x0525, 0xa140, 0x0100, 0x0100,
"Iomega", "Iomega",
"USB Clik! 40", "USB Clik! 40",
US_SC_8070, US_PR_DEVICE, NULL, USB_SC_8070, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
/* Added by Alan Stern <stern@rowland.harvard.edu> */ /* Added by Alan Stern <stern@rowland.harvard.edu> */
COMPLIANT_DEV(0x0525, 0xa4a5, 0x0000, 0x9999, COMPLIANT_DEV(0x0525, 0xa4a5, 0x0000, 0x9999,
"Linux", "Linux",
"File-backed Storage Gadget", "File-backed Storage Gadget",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_CAPACITY_OK ), US_FL_CAPACITY_OK ),
/* Yakumo Mega Image 37 /* Yakumo Mega Image 37
...@@ -520,7 +520,7 @@ COMPLIANT_DEV(0x0525, 0xa4a5, 0x0000, 0x9999, ...@@ -520,7 +520,7 @@ COMPLIANT_DEV(0x0525, 0xa4a5, 0x0000, 0x9999,
UNUSUAL_DEV( 0x052b, 0x1801, 0x0100, 0x0100, UNUSUAL_DEV( 0x052b, 0x1801, 0x0100, 0x0100,
"Tekom Technologies, Inc", "Tekom Technologies, Inc",
"300_CAMERA", "300_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Another Yakumo camera. /* Another Yakumo camera.
...@@ -528,14 +528,14 @@ UNUSUAL_DEV( 0x052b, 0x1801, 0x0100, 0x0100, ...@@ -528,14 +528,14 @@ UNUSUAL_DEV( 0x052b, 0x1801, 0x0100, 0x0100,
UNUSUAL_DEV( 0x052b, 0x1804, 0x0100, 0x0100, UNUSUAL_DEV( 0x052b, 0x1804, 0x0100, 0x0100,
"Tekom Technologies, Inc", "Tekom Technologies, Inc",
"300_CAMERA", "300_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Iacopo Spalletti <avvisi@spalletti.it> */ /* Reported by Iacopo Spalletti <avvisi@spalletti.it> */
UNUSUAL_DEV( 0x052b, 0x1807, 0x0100, 0x0100, UNUSUAL_DEV( 0x052b, 0x1807, 0x0100, 0x0100,
"Tekom Technologies, Inc", "Tekom Technologies, Inc",
"300_CAMERA", "300_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Yakumo Mega Image 47 /* Yakumo Mega Image 47
...@@ -543,7 +543,7 @@ UNUSUAL_DEV( 0x052b, 0x1807, 0x0100, 0x0100, ...@@ -543,7 +543,7 @@ UNUSUAL_DEV( 0x052b, 0x1807, 0x0100, 0x0100,
UNUSUAL_DEV( 0x052b, 0x1905, 0x0100, 0x0100, UNUSUAL_DEV( 0x052b, 0x1905, 0x0100, 0x0100,
"Tekom Technologies, Inc", "Tekom Technologies, Inc",
"400_CAMERA", "400_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Paul Ortyl <ortylp@3miasto.net> /* Reported by Paul Ortyl <ortylp@3miasto.net>
...@@ -551,13 +551,13 @@ UNUSUAL_DEV( 0x052b, 0x1905, 0x0100, 0x0100, ...@@ -551,13 +551,13 @@ UNUSUAL_DEV( 0x052b, 0x1905, 0x0100, 0x0100,
UNUSUAL_DEV( 0x052b, 0x1911, 0x0100, 0x0100, UNUSUAL_DEV( 0x052b, 0x1911, 0x0100, 0x0100,
"Tekom Technologies, Inc", "Tekom Technologies, Inc",
"400_CAMERA", "400_CAMERA",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
UNUSUAL_DEV( 0x054c, 0x0010, 0x0106, 0x0450, UNUSUAL_DEV( 0x054c, 0x0010, 0x0106, 0x0450,
"Sony", "Sony",
"DSC-S30/S70/S75/505V/F505/F707/F717/P8", "DSC-S30/S70/S75/505V/F505/F707/F717/P8",
US_SC_SCSI, US_PR_DEVICE, NULL, USB_SC_SCSI, USB_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 ),
/* Submitted by Lars Jacob <jacob.lars@googlemail.com> /* Submitted by Lars Jacob <jacob.lars@googlemail.com>
...@@ -565,7 +565,7 @@ UNUSUAL_DEV( 0x054c, 0x0010, 0x0106, 0x0450, ...@@ -565,7 +565,7 @@ UNUSUAL_DEV( 0x054c, 0x0010, 0x0106, 0x0450,
UNUSUAL_DEV( 0x054c, 0x0010, 0x0500, 0x0610, UNUSUAL_DEV( 0x054c, 0x0010, 0x0500, 0x0610,
"Sony", "Sony",
"DSC-T1/T5/H5", "DSC-T1/T5/H5",
US_SC_8070, US_PR_DEVICE, NULL, USB_SC_8070, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
...@@ -573,88 +573,88 @@ UNUSUAL_DEV( 0x054c, 0x0010, 0x0500, 0x0610, ...@@ -573,88 +573,88 @@ UNUSUAL_DEV( 0x054c, 0x0010, 0x0500, 0x0610,
UNUSUAL_DEV( 0x054c, 0x0025, 0x0100, 0x0100, UNUSUAL_DEV( 0x054c, 0x0025, 0x0100, 0x0100,
"Sony", "Sony",
"Memorystick NW-MS7", "Memorystick NW-MS7",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* Submitted by Olaf Hering, <olh@suse.de> SuSE Bugzilla #49049 */ /* Submitted by Olaf Hering, <olh@suse.de> SuSE Bugzilla #49049 */
UNUSUAL_DEV( 0x054c, 0x002c, 0x0501, 0x2000, UNUSUAL_DEV( 0x054c, 0x002c, 0x0501, 0x2000,
"Sony", "Sony",
"USB Floppy Drive", "USB Floppy Drive",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
UNUSUAL_DEV( 0x054c, 0x002d, 0x0100, 0x0100, UNUSUAL_DEV( 0x054c, 0x002d, 0x0100, 0x0100,
"Sony", "Sony",
"Memorystick MSAC-US1", "Memorystick MSAC-US1",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* Submitted by Klaus Mueller <k.mueller@intershop.de> */ /* Submitted by Klaus Mueller <k.mueller@intershop.de> */
UNUSUAL_DEV( 0x054c, 0x002e, 0x0106, 0x0310, UNUSUAL_DEV( 0x054c, 0x002e, 0x0106, 0x0310,
"Sony", "Sony",
"Handycam", "Handycam",
US_SC_SCSI, US_PR_DEVICE, NULL, USB_SC_SCSI, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* Submitted by Rajesh Kumble Nayak <nayak@obs-nice.fr> */ /* Submitted by Rajesh Kumble Nayak <nayak@obs-nice.fr> */
UNUSUAL_DEV( 0x054c, 0x002e, 0x0500, 0x0500, UNUSUAL_DEV( 0x054c, 0x002e, 0x0500, 0x0500,
"Sony", "Sony",
"Handycam HC-85", "Handycam HC-85",
US_SC_UFI, US_PR_DEVICE, NULL, USB_SC_UFI, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
UNUSUAL_DEV( 0x054c, 0x0032, 0x0000, 0x9999, UNUSUAL_DEV( 0x054c, 0x0032, 0x0000, 0x9999,
"Sony", "Sony",
"Memorystick MSC-U01N", "Memorystick MSC-U01N",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* Submitted by Michal Mlotek <mlotek@foobar.pl> */ /* Submitted by Michal Mlotek <mlotek@foobar.pl> */
UNUSUAL_DEV( 0x054c, 0x0058, 0x0000, 0x9999, UNUSUAL_DEV( 0x054c, 0x0058, 0x0000, 0x9999,
"Sony", "Sony",
"PEG N760c Memorystick", "PEG N760c Memorystick",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
UNUSUAL_DEV( 0x054c, 0x0069, 0x0000, 0x9999, UNUSUAL_DEV( 0x054c, 0x0069, 0x0000, 0x9999,
"Sony", "Sony",
"Memorystick MSC-U03", "Memorystick MSC-U03",
US_SC_UFI, US_PR_CB, NULL, USB_SC_UFI, USB_PR_CB, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* Submitted by Nathan Babb <nathan@lexi.com> */ /* Submitted by Nathan Babb <nathan@lexi.com> */
UNUSUAL_DEV( 0x054c, 0x006d, 0x0000, 0x9999, UNUSUAL_DEV( 0x054c, 0x006d, 0x0000, 0x9999,
"Sony", "Sony",
"PEG Mass Storage", "PEG Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
/* Submitted by Frank Engel <frankie@cse.unsw.edu.au> */ /* Submitted by Frank Engel <frankie@cse.unsw.edu.au> */
UNUSUAL_DEV( 0x054c, 0x0099, 0x0000, 0x9999, UNUSUAL_DEV( 0x054c, 0x0099, 0x0000, 0x9999,
"Sony", "Sony",
"PEG Mass Storage", "PEG Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
/* Submitted by Mike Alborn <malborn@deandra.homeip.net> */ /* Submitted by Mike Alborn <malborn@deandra.homeip.net> */
UNUSUAL_DEV( 0x054c, 0x016a, 0x0000, 0x9999, UNUSUAL_DEV( 0x054c, 0x016a, 0x0000, 0x9999,
"Sony", "Sony",
"PEG Mass Storage", "PEG Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
/* floppy reports multiple luns */ /* floppy reports multiple luns */
UNUSUAL_DEV( 0x055d, 0x2020, 0x0000, 0x0210, UNUSUAL_DEV( 0x055d, 0x2020, 0x0000, 0x0210,
"SAMSUNG", "SAMSUNG",
"SFD-321U [FW 0C]", "SFD-321U [FW 0C]",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* We keep this entry to force the transport; firmware 3.00 and later is ok. */ /* We keep this entry to force the transport; firmware 3.00 and later is ok. */
UNUSUAL_DEV( 0x057b, 0x0000, 0x0000, 0x0299, UNUSUAL_DEV( 0x057b, 0x0000, 0x0000, 0x0299,
"Y-E Data", "Y-E Data",
"Flashbuster-U", "Flashbuster-U",
US_SC_DEVICE, US_PR_CB, NULL, USB_SC_DEVICE, USB_PR_CB, NULL,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
/* Reported by Johann Cardon <johann.cardon@free.fr> /* Reported by Johann Cardon <johann.cardon@free.fr>
...@@ -664,20 +664,20 @@ UNUSUAL_DEV( 0x057b, 0x0000, 0x0000, 0x0299, ...@@ -664,20 +664,20 @@ UNUSUAL_DEV( 0x057b, 0x0000, 0x0000, 0x0299,
UNUSUAL_DEV( 0x057b, 0x0022, 0x0000, 0x9999, UNUSUAL_DEV( 0x057b, 0x0022, 0x0000, 0x9999,
"Y-E Data", "Y-E Data",
"Silicon Media R/W", "Silicon Media R/W",
US_SC_DEVICE, US_PR_DEVICE, NULL, 0), USB_SC_DEVICE, USB_PR_DEVICE, NULL, 0),
/* Reported by RTE <raszilki@yandex.ru> */ /* Reported by RTE <raszilki@yandex.ru> */
UNUSUAL_DEV( 0x058f, 0x6387, 0x0141, 0x0141, UNUSUAL_DEV( 0x058f, 0x6387, 0x0141, 0x0141,
"JetFlash", "JetFlash",
"TS1GJF2A/120", "TS1GJF2A/120",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64 ), US_FL_MAX_SECTORS_64 ),
/* Fabrizio Fellini <fello@libero.it> */ /* Fabrizio Fellini <fello@libero.it> */
UNUSUAL_DEV( 0x0595, 0x4343, 0x0000, 0x2210, UNUSUAL_DEV( 0x0595, 0x4343, 0x0000, 0x2210,
"Fujifilm", "Fujifilm",
"Digital Camera EX-20 DSC", "Digital Camera EX-20 DSC",
US_SC_8070, US_PR_DEVICE, NULL, 0 ), USB_SC_8070, USB_PR_DEVICE, NULL, 0 ),
/* Reported by Andre Welter <a.r.welter@gmx.de> /* Reported by Andre Welter <a.r.welter@gmx.de>
* This antique device predates the release of the Bulk-only Transport * This antique device predates the release of the Bulk-only Transport
...@@ -688,14 +688,14 @@ UNUSUAL_DEV( 0x0595, 0x4343, 0x0000, 0x2210, ...@@ -688,14 +688,14 @@ UNUSUAL_DEV( 0x0595, 0x4343, 0x0000, 0x2210,
UNUSUAL_DEV( 0x059b, 0x0001, 0x0100, 0x0100, UNUSUAL_DEV( 0x059b, 0x0001, 0x0100, 0x0100,
"Iomega", "Iomega",
"ZIP 100", "ZIP 100",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* Reported by <Hendryk.Pfeiffer@gmx.de> */ /* Reported by <Hendryk.Pfeiffer@gmx.de> */
UNUSUAL_DEV( 0x059f, 0x0643, 0x0000, 0x0000, UNUSUAL_DEV( 0x059f, 0x0643, 0x0000, 0x0000,
"LaCie", "LaCie",
"DVD+-RW", "DVD+-RW",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_GO_SLOW ), US_FL_GO_SLOW ),
/* Submitted by Joel Bourquard <numlock@freesurf.ch> /* Submitted by Joel Bourquard <numlock@freesurf.ch>
...@@ -705,7 +705,7 @@ UNUSUAL_DEV( 0x059f, 0x0643, 0x0000, 0x0000, ...@@ -705,7 +705,7 @@ UNUSUAL_DEV( 0x059f, 0x0643, 0x0000, 0x0000,
UNUSUAL_DEV( 0x05ab, 0x0060, 0x1104, 0x1110, UNUSUAL_DEV( 0x05ab, 0x0060, 0x1104, 0x1110,
"In-System", "In-System",
"PyroGate External CD-ROM Enclosure (FCD-523)", "PyroGate External CD-ROM Enclosure (FCD-523)",
US_SC_SCSI, US_PR_BULK, NULL, USB_SC_SCSI, USB_PR_BULK, NULL,
US_FL_NEED_OVERRIDE ), US_FL_NEED_OVERRIDE ),
/* Submitted by Sven Anderson <sven-linux@anderson.de> /* Submitted by Sven Anderson <sven-linux@anderson.de>
...@@ -717,26 +717,26 @@ UNUSUAL_DEV( 0x05ab, 0x0060, 0x1104, 0x1110, ...@@ -717,26 +717,26 @@ UNUSUAL_DEV( 0x05ab, 0x0060, 0x1104, 0x1110,
UNUSUAL_DEV( 0x05ac, 0x1202, 0x0000, 0x9999, UNUSUAL_DEV( 0x05ac, 0x1202, 0x0000, 0x9999,
"Apple", "Apple",
"iPod", "iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY ), US_FL_FIX_CAPACITY ),
/* Reported by Avi Kivity <avi@argo.co.il> */ /* Reported by Avi Kivity <avi@argo.co.il> */
UNUSUAL_DEV( 0x05ac, 0x1203, 0x0000, 0x9999, UNUSUAL_DEV( 0x05ac, 0x1203, 0x0000, 0x9999,
"Apple", "Apple",
"iPod", "iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY ), US_FL_FIX_CAPACITY ),
UNUSUAL_DEV( 0x05ac, 0x1204, 0x0000, 0x9999, UNUSUAL_DEV( 0x05ac, 0x1204, 0x0000, 0x9999,
"Apple", "Apple",
"iPod", "iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE ), US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE ),
UNUSUAL_DEV( 0x05ac, 0x1205, 0x0000, 0x9999, UNUSUAL_DEV( 0x05ac, 0x1205, 0x0000, 0x9999,
"Apple", "Apple",
"iPod", "iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY ), US_FL_FIX_CAPACITY ),
/* /*
...@@ -746,7 +746,7 @@ UNUSUAL_DEV( 0x05ac, 0x1205, 0x0000, 0x9999, ...@@ -746,7 +746,7 @@ UNUSUAL_DEV( 0x05ac, 0x1205, 0x0000, 0x9999,
UNUSUAL_DEV( 0x05ac, 0x120a, 0x0000, 0x9999, UNUSUAL_DEV( 0x05ac, 0x120a, 0x0000, 0x9999,
"Apple", "Apple",
"iPod", "iPod",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY ), US_FL_FIX_CAPACITY ),
/* Reported by Dan Williams <dcbw@redhat.com> /* Reported by Dan Williams <dcbw@redhat.com>
...@@ -758,14 +758,14 @@ UNUSUAL_DEV( 0x05ac, 0x120a, 0x0000, 0x9999, ...@@ -758,14 +758,14 @@ UNUSUAL_DEV( 0x05ac, 0x120a, 0x0000, 0x9999,
UNUSUAL_DEV( 0x05c6, 0x1000, 0x0000, 0x9999, UNUSUAL_DEV( 0x05c6, 0x1000, 0x0000, 0x9999,
"Option N.V.", "Option N.V.",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, option_ms_init, USB_SC_DEVICE, USB_PR_DEVICE, option_ms_init,
0), 0),
/* Reported by Blake Matheny <bmatheny@purdue.edu> */ /* Reported by Blake Matheny <bmatheny@purdue.edu> */
UNUSUAL_DEV( 0x05dc, 0xb002, 0x0000, 0x0113, UNUSUAL_DEV( 0x05dc, 0xb002, 0x0000, 0x0113,
"Lexar", "Lexar",
"USB CF Reader", "USB CF Reader",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
/* The following two entries are for a Genesys USB to IDE /* The following two entries are for a Genesys USB to IDE
...@@ -782,20 +782,20 @@ UNUSUAL_DEV( 0x05dc, 0xb002, 0x0000, 0x0113, ...@@ -782,20 +782,20 @@ UNUSUAL_DEV( 0x05dc, 0xb002, 0x0000, 0x0113,
UNUSUAL_DEV( 0x05e3, 0x0701, 0x0000, 0xffff, UNUSUAL_DEV( 0x05e3, 0x0701, 0x0000, 0xffff,
"Genesys Logic", "Genesys Logic",
"USB to IDE Optical", "USB to IDE Optical",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_GO_SLOW | US_FL_MAX_SECTORS_64 | US_FL_IGNORE_RESIDUE ), US_FL_GO_SLOW | US_FL_MAX_SECTORS_64 | US_FL_IGNORE_RESIDUE ),
UNUSUAL_DEV( 0x05e3, 0x0702, 0x0000, 0xffff, UNUSUAL_DEV( 0x05e3, 0x0702, 0x0000, 0xffff,
"Genesys Logic", "Genesys Logic",
"USB to IDE Disk", "USB to IDE Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_GO_SLOW | US_FL_MAX_SECTORS_64 | US_FL_IGNORE_RESIDUE ), US_FL_GO_SLOW | US_FL_MAX_SECTORS_64 | US_FL_IGNORE_RESIDUE ),
/* Reported by Ben Efros <ben@pc-doctor.com> */ /* Reported by Ben Efros <ben@pc-doctor.com> */
UNUSUAL_DEV( 0x05e3, 0x0723, 0x9451, 0x9451, UNUSUAL_DEV( 0x05e3, 0x0723, 0x9451, 0x9451,
"Genesys Logic", "Genesys Logic",
"USB to SATA", "USB to SATA",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SANE_SENSE ), US_FL_SANE_SENSE ),
/* Reported by Hanno Boeck <hanno@gmx.de> /* Reported by Hanno Boeck <hanno@gmx.de>
...@@ -803,33 +803,33 @@ UNUSUAL_DEV( 0x05e3, 0x0723, 0x9451, 0x9451, ...@@ -803,33 +803,33 @@ UNUSUAL_DEV( 0x05e3, 0x0723, 0x9451, 0x9451,
UNUSUAL_DEV( 0x0636, 0x0003, 0x0000, 0x9999, UNUSUAL_DEV( 0x0636, 0x0003, 0x0000, 0x9999,
"Vivitar", "Vivitar",
"Vivicam 35Xx", "Vivicam 35Xx",
US_SC_SCSI, US_PR_BULK, NULL, USB_SC_SCSI, USB_PR_BULK, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
UNUSUAL_DEV( 0x0644, 0x0000, 0x0100, 0x0100, UNUSUAL_DEV( 0x0644, 0x0000, 0x0100, 0x0100,
"TEAC", "TEAC",
"Floppy Drive", "Floppy Drive",
US_SC_UFI, US_PR_CB, NULL, 0 ), USB_SC_UFI, USB_PR_CB, NULL, 0 ),
/* Reported by Darsen Lu <darsen@micro.ee.nthu.edu.tw> */ /* Reported by Darsen Lu <darsen@micro.ee.nthu.edu.tw> */
UNUSUAL_DEV( 0x066f, 0x8000, 0x0001, 0x0001, UNUSUAL_DEV( 0x066f, 0x8000, 0x0001, 0x0001,
"SigmaTel", "SigmaTel",
"USBMSC Audio Player", "USBMSC Audio Player",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY ), US_FL_FIX_CAPACITY ),
/* Reported by Daniel Kukula <daniel.kuku@gmail.com> */ /* Reported by Daniel Kukula <daniel.kuku@gmail.com> */
UNUSUAL_DEV( 0x067b, 0x1063, 0x0100, 0x0100, UNUSUAL_DEV( 0x067b, 0x1063, 0x0100, 0x0100,
"Prolific Technology, Inc.", "Prolific Technology, Inc.",
"Prolific Storage Gadget", "Prolific Storage Gadget",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_BAD_SENSE ), US_FL_BAD_SENSE ),
/* Reported by Rogerio Brito <rbrito@ime.usp.br> */ /* Reported by Rogerio Brito <rbrito@ime.usp.br> */
UNUSUAL_DEV( 0x067b, 0x2317, 0x0001, 0x001, UNUSUAL_DEV( 0x067b, 0x2317, 0x0001, 0x001,
"Prolific Technology, Inc.", "Prolific Technology, Inc.",
"Mass Storage Device", "Mass Storage Device",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_NOT_LOCKABLE ), US_FL_NOT_LOCKABLE ),
/* Reported by Richard -=[]=- <micro_flyer@hotmail.com> */ /* Reported by Richard -=[]=- <micro_flyer@hotmail.com> */
...@@ -838,45 +838,45 @@ UNUSUAL_DEV( 0x067b, 0x2317, 0x0001, 0x001, ...@@ -838,45 +838,45 @@ UNUSUAL_DEV( 0x067b, 0x2317, 0x0001, 0x001,
UNUSUAL_DEV( 0x067b, 0x2507, 0x0001, 0x0100, UNUSUAL_DEV( 0x067b, 0x2507, 0x0001, 0x0100,
"Prolific Technology Inc.", "Prolific Technology Inc.",
"Mass Storage Device", "Mass Storage Device",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY | US_FL_GO_SLOW ), US_FL_FIX_CAPACITY | US_FL_GO_SLOW ),
/* Reported by Alex Butcher <alex.butcher@assursys.co.uk> */ /* Reported by Alex Butcher <alex.butcher@assursys.co.uk> */
UNUSUAL_DEV( 0x067b, 0x3507, 0x0001, 0x0101, UNUSUAL_DEV( 0x067b, 0x3507, 0x0001, 0x0101,
"Prolific Technology Inc.", "Prolific Technology Inc.",
"ATAPI-6 Bridge Controller", "ATAPI-6 Bridge Controller",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY | US_FL_GO_SLOW ), US_FL_FIX_CAPACITY | US_FL_GO_SLOW ),
/* Submitted by Benny Sjostrand <benny@hostmobility.com> */ /* Submitted by Benny Sjostrand <benny@hostmobility.com> */
UNUSUAL_DEV( 0x0686, 0x4011, 0x0001, 0x0001, UNUSUAL_DEV( 0x0686, 0x4011, 0x0001, 0x0001,
"Minolta", "Minolta",
"Dimage F300", "Dimage F300",
US_SC_SCSI, US_PR_BULK, NULL, 0 ), USB_SC_SCSI, USB_PR_BULK, NULL, 0 ),
/* Reported by Miguel A. Fosas <amn3s1a@ono.com> */ /* Reported by Miguel A. Fosas <amn3s1a@ono.com> */
UNUSUAL_DEV( 0x0686, 0x4017, 0x0001, 0x0001, UNUSUAL_DEV( 0x0686, 0x4017, 0x0001, 0x0001,
"Minolta", "Minolta",
"DIMAGE E223", "DIMAGE E223",
US_SC_SCSI, US_PR_DEVICE, NULL, 0 ), USB_SC_SCSI, USB_PR_DEVICE, NULL, 0 ),
UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100, UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100,
"Hagiwara", "Hagiwara",
"Flashgate", "Flashgate",
US_SC_SCSI, US_PR_BULK, NULL, 0 ), USB_SC_SCSI, USB_PR_BULK, NULL, 0 ),
/* Reported by David Hamilton <niftimusmaximus@lycos.com> */ /* Reported by David Hamilton <niftimusmaximus@lycos.com> */
UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001, UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001,
"Thomson Multimedia Inc.", "Thomson Multimedia Inc.",
"RCA RD1080 MP3 Player", "RCA RD1080 MP3 Player",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY ), US_FL_FIX_CAPACITY ),
/* Reported by Adrian Pilchowiec <adi1981@epf.pl> */ /* Reported by Adrian Pilchowiec <adi1981@epf.pl> */
UNUSUAL_DEV( 0x071b, 0x3203, 0x0000, 0x0000, UNUSUAL_DEV( 0x071b, 0x3203, 0x0000, 0x0000,
"RockChip", "RockChip",
"MP3", "MP3",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64), US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64),
/* Reported by Jean-Baptiste Onofre <jb@nanthrax.net> /* Reported by Jean-Baptiste Onofre <jb@nanthrax.net>
...@@ -886,7 +886,7 @@ UNUSUAL_DEV( 0x071b, 0x3203, 0x0000, 0x0000, ...@@ -886,7 +886,7 @@ UNUSUAL_DEV( 0x071b, 0x3203, 0x0000, 0x0000,
UNUSUAL_DEV( 0x071b, 0x32bb, 0x0000, 0x0000, UNUSUAL_DEV( 0x071b, 0x32bb, 0x0000, 0x0000,
"RockChip", "RockChip",
"MTP", "MTP",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64), US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64),
/* Reported by Massimiliano Ghilardi <massimiliano.ghilardi@gmail.com> /* Reported by Massimiliano Ghilardi <massimiliano.ghilardi@gmail.com>
...@@ -902,59 +902,59 @@ UNUSUAL_DEV( 0x071b, 0x32bb, 0x0000, 0x0000, ...@@ -902,59 +902,59 @@ UNUSUAL_DEV( 0x071b, 0x32bb, 0x0000, 0x0000,
UNUSUAL_DEV( 0x071b, 0x3203, 0x0100, 0x0100, UNUSUAL_DEV( 0x071b, 0x3203, 0x0100, 0x0100,
"RockChip", "RockChip",
"ROCK MP3", "ROCK MP3",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64), US_FL_MAX_SECTORS_64),
/* Reported by Olivier Blondeau <zeitoun@gmail.com> */ /* Reported by Olivier Blondeau <zeitoun@gmail.com> */
UNUSUAL_DEV( 0x0727, 0x0306, 0x0100, 0x0100, UNUSUAL_DEV( 0x0727, 0x0306, 0x0100, 0x0100,
"ATMEL", "ATMEL",
"SND1 Storage", "SND1 Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE), US_FL_IGNORE_RESIDUE),
/* Submitted by Roman Hodek <roman@hodek.net> */ /* Submitted by Roman Hodek <roman@hodek.net> */
UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200, UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200,
"Sandisk", "Sandisk",
"ImageMate SDDR-05a", "ImageMate SDDR-05a",
US_SC_SCSI, US_PR_CB, NULL, USB_SC_SCSI, USB_PR_CB, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
UNUSUAL_DEV( 0x0781, 0x0002, 0x0009, 0x0009, UNUSUAL_DEV( 0x0781, 0x0002, 0x0009, 0x0009,
"SanDisk Corporation", "SanDisk Corporation",
"ImageMate CompactFlash USB", "ImageMate CompactFlash USB",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY ), US_FL_FIX_CAPACITY ),
UNUSUAL_DEV( 0x0781, 0x0100, 0x0100, 0x0100, UNUSUAL_DEV( 0x0781, 0x0100, 0x0100, 0x0100,
"Sandisk", "Sandisk",
"ImageMate SDDR-12", "ImageMate SDDR-12",
US_SC_SCSI, US_PR_CB, NULL, USB_SC_SCSI, USB_PR_CB, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* Reported by Eero Volotinen <eero@ping-viini.org> */ /* Reported by Eero Volotinen <eero@ping-viini.org> */
UNUSUAL_DEV( 0x07ab, 0xfccd, 0x0000, 0x9999, UNUSUAL_DEV( 0x07ab, 0xfccd, 0x0000, 0x9999,
"Freecom Technologies", "Freecom Technologies",
"FHD-Classic", "FHD-Classic",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY), US_FL_FIX_CAPACITY),
UNUSUAL_DEV( 0x07af, 0x0004, 0x0100, 0x0133, UNUSUAL_DEV( 0x07af, 0x0004, 0x0100, 0x0133,
"Microtech", "Microtech",
"USB-SCSI-DB25", "USB-SCSI-DB25",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
US_FL_SCM_MULT_TARG ), US_FL_SCM_MULT_TARG ),
UNUSUAL_DEV( 0x07af, 0x0005, 0x0100, 0x0100, UNUSUAL_DEV( 0x07af, 0x0005, 0x0100, 0x0100,
"Microtech", "Microtech",
"USB-SCSI-HD50", "USB-SCSI-HD50",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_euscsi_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
US_FL_SCM_MULT_TARG ), US_FL_SCM_MULT_TARG ),
#ifdef NO_SDDR09 #ifdef NO_SDDR09
UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100, UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100,
"Microtech", "Microtech",
"CameraMate", "CameraMate",
US_SC_SCSI, US_PR_CB, NULL, USB_SC_SCSI, USB_PR_CB, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
#endif #endif
...@@ -967,7 +967,7 @@ UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100, ...@@ -967,7 +967,7 @@ UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100,
UNUSUAL_DEV( 0x07c4, 0xa400, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa400, 0x0000, 0xffff,
"Datafab", "Datafab",
"KECF-USB", "KECF-USB",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY | US_FL_FIX_CAPACITY ), US_FL_FIX_INQUIRY | US_FL_FIX_CAPACITY ),
/* Reported by Rauch Wolke <rauchwolke@gmx.net> /* Reported by Rauch Wolke <rauchwolke@gmx.net>
...@@ -976,7 +976,7 @@ UNUSUAL_DEV( 0x07c4, 0xa400, 0x0000, 0xffff, ...@@ -976,7 +976,7 @@ UNUSUAL_DEV( 0x07c4, 0xa400, 0x0000, 0xffff,
UNUSUAL_DEV( 0x07c4, 0xa4a5, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa4a5, 0x0000, 0xffff,
"Simple Tech/Datafab", "Simple Tech/Datafab",
"CF+SM Reader", "CF+SM Reader",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_MAX_SECTORS_64 ), US_FL_IGNORE_RESIDUE | US_FL_MAX_SECTORS_64 ),
/* Casio QV 2x00/3x00/4000/8000 digital still cameras are not conformant /* Casio QV 2x00/3x00/4000/8000 digital still cameras are not conformant
...@@ -986,42 +986,42 @@ UNUSUAL_DEV( 0x07c4, 0xa4a5, 0x0000, 0xffff, ...@@ -986,42 +986,42 @@ UNUSUAL_DEV( 0x07c4, 0xa4a5, 0x0000, 0xffff,
* - They don't like the INQUIRY command. So we must handle this command * - They don't like the INQUIRY command. So we must handle this command
* of the SCSI layer ourselves. * of the SCSI layer ourselves.
* - Some cameras with idProduct=0x1001 and bcdDevice=0x1000 have * - Some cameras with idProduct=0x1001 and bcdDevice=0x1000 have
* bInterfaceProtocol=0x00 (US_PR_CBI) while others have 0x01 (US_PR_CB). * bInterfaceProtocol=0x00 (USB_PR_CBI) while others have 0x01 (USB_PR_CB).
* So don't remove the US_PR_CB override! * So don't remove the USB_PR_CB override!
* - Cameras with bcdDevice=0x9009 require the US_SC_8070 override. * - Cameras with bcdDevice=0x9009 require the USB_SC_8070 override.
*/ */
UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9999, UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9999,
"Casio", "Casio",
"QV DigitalCamera", "QV DigitalCamera",
US_SC_8070, US_PR_CB, NULL, USB_SC_8070, USB_PR_CB, NULL,
US_FL_NEED_OVERRIDE | US_FL_FIX_INQUIRY ), US_FL_NEED_OVERRIDE | US_FL_FIX_INQUIRY ),
/* Submitted by Hartmut Wahl <hwahl@hwahl.de>*/ /* Submitted by Hartmut Wahl <hwahl@hwahl.de>*/
UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001, UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001,
"Samsung", "Samsung",
"Digimax 410", "Digimax 410",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY), US_FL_FIX_INQUIRY),
/* Reported by Luciano Rocha <luciano@eurotux.com> */ /* Reported by Luciano Rocha <luciano@eurotux.com> */
UNUSUAL_DEV( 0x0840, 0x0082, 0x0001, 0x0001, UNUSUAL_DEV( 0x0840, 0x0082, 0x0001, 0x0001,
"Argosy", "Argosy",
"Storage", "Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY), US_FL_FIX_CAPACITY),
/* Reported and patched by Nguyen Anh Quynh <aquynh@gmail.com> */ /* Reported and patched by Nguyen Anh Quynh <aquynh@gmail.com> */
UNUSUAL_DEV( 0x0840, 0x0084, 0x0001, 0x0001, UNUSUAL_DEV( 0x0840, 0x0084, 0x0001, 0x0001,
"Argosy", "Argosy",
"Storage", "Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY), US_FL_FIX_CAPACITY),
/* Reported by Martijn Hijdra <martijn.hijdra@gmail.com> */ /* Reported by Martijn Hijdra <martijn.hijdra@gmail.com> */
UNUSUAL_DEV( 0x0840, 0x0085, 0x0001, 0x0001, UNUSUAL_DEV( 0x0840, 0x0085, 0x0001, 0x0001,
"Argosy", "Argosy",
"Storage", "Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY), US_FL_FIX_CAPACITY),
/* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>. /* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>.
...@@ -1033,7 +1033,7 @@ UNUSUAL_DEV( 0x0840, 0x0085, 0x0001, 0x0001, ...@@ -1033,7 +1033,7 @@ UNUSUAL_DEV( 0x0840, 0x0085, 0x0001, 0x0001,
UNUSUAL_DEV( 0x084d, 0x0011, 0x0110, 0x0110, UNUSUAL_DEV( 0x084d, 0x0011, 0x0110, 0x0110,
"Grandtech", "Grandtech",
"DC2MEGA", "DC2MEGA",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_BULK32), US_FL_BULK32),
/* Andrew Lunn <andrew@lunn.ch> /* Andrew Lunn <andrew@lunn.ch>
...@@ -1044,14 +1044,14 @@ UNUSUAL_DEV( 0x084d, 0x0011, 0x0110, 0x0110, ...@@ -1044,14 +1044,14 @@ UNUSUAL_DEV( 0x084d, 0x0011, 0x0110, 0x0110,
UNUSUAL_DEV( 0x0851, 0x1543, 0x0200, 0x0200, UNUSUAL_DEV( 0x0851, 0x1543, 0x0200, 0x0200,
"PanDigital", "PanDigital",
"Photo Frame", "Photo Frame",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_NOT_LOCKABLE), US_FL_NOT_LOCKABLE),
/* Submitted by Jan De Luyck <lkml@kcore.org> */ /* Submitted by Jan De Luyck <lkml@kcore.org> */
UNUSUAL_DEV( 0x08bd, 0x1100, 0x0000, 0x0000, UNUSUAL_DEV( 0x08bd, 0x1100, 0x0000, 0x0000,
"CITIZEN", "CITIZEN",
"X1DE-USB", "X1DE-USB",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
/* Submitted by Dylan Taft <d13f00l@gmail.com> /* Submitted by Dylan Taft <d13f00l@gmail.com>
...@@ -1060,7 +1060,7 @@ UNUSUAL_DEV( 0x08bd, 0x1100, 0x0000, 0x0000, ...@@ -1060,7 +1060,7 @@ UNUSUAL_DEV( 0x08bd, 0x1100, 0x0000, 0x0000,
UNUSUAL_DEV( 0x08ca, 0x3103, 0x0100, 0x0100, UNUSUAL_DEV( 0x08ca, 0x3103, 0x0100, 0x0100,
"AIPTEK", "AIPTEK",
"Aiptek USB Keychain MP3 Player", "Aiptek USB Keychain MP3 Player",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE), US_FL_IGNORE_RESIDUE),
/* Entry needed for flags. Moreover, all devices with this ID use /* Entry needed for flags. Moreover, all devices with this ID use
...@@ -1071,7 +1071,7 @@ UNUSUAL_DEV( 0x08ca, 0x3103, 0x0100, 0x0100, ...@@ -1071,7 +1071,7 @@ UNUSUAL_DEV( 0x08ca, 0x3103, 0x0100, 0x0100,
UNUSUAL_DEV( 0x090a, 0x1001, 0x0100, 0x0100, UNUSUAL_DEV( 0x090a, 0x1001, 0x0100, 0x0100,
"Trumpion", "Trumpion",
"t33520 USB Flash Card Controller", "t33520 USB Flash Card Controller",
US_SC_DEVICE, US_PR_BULK, NULL, USB_SC_DEVICE, USB_PR_BULK, NULL,
US_FL_NEED_OVERRIDE ), US_FL_NEED_OVERRIDE ),
/* Reported by Filippo Bardelli <filibard@libero.it> /* Reported by Filippo Bardelli <filibard@libero.it>
...@@ -1080,21 +1080,21 @@ UNUSUAL_DEV( 0x090a, 0x1001, 0x0100, 0x0100, ...@@ -1080,21 +1080,21 @@ UNUSUAL_DEV( 0x090a, 0x1001, 0x0100, 0x0100,
UNUSUAL_DEV( 0x090a, 0x1050, 0x0100, 0x0100, UNUSUAL_DEV( 0x090a, 0x1050, 0x0100, 0x0100,
"Trumpion Microelectronics, Inc.", "Trumpion Microelectronics, Inc.",
"33520 USB Digital Voice Recorder", "33520 USB Digital Voice Recorder",
US_SC_UFI, US_PR_DEVICE, NULL, USB_SC_UFI, USB_PR_DEVICE, NULL,
0), 0),
/* Trumpion Microelectronics MP3 player (felipe_alfaro@linuxmail.org) */ /* Trumpion Microelectronics MP3 player (felipe_alfaro@linuxmail.org) */
UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999, UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999,
"Trumpion", "Trumpion",
"MP3 player", "MP3 player",
US_SC_RBC, US_PR_BULK, NULL, USB_SC_RBC, USB_PR_BULK, NULL,
0 ), 0 ),
/* aeb */ /* aeb */
UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff, UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,
"Feiya", "Feiya",
"5-in-1 Card Reader", "5-in-1 Card Reader",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY ), US_FL_FIX_CAPACITY ),
/* This Pentax still camera is not conformant /* This Pentax still camera is not conformant
...@@ -1107,7 +1107,7 @@ UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff, ...@@ -1107,7 +1107,7 @@ UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,
UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000, UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000,
"Pentax", "Pentax",
"Optio 2/3/400", "Optio 2/3/400",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
/* These are virtual windows driver CDs, which the zd1211rw driver /* These are virtual windows driver CDs, which the zd1211rw driver
...@@ -1115,13 +1115,13 @@ UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000, ...@@ -1115,13 +1115,13 @@ UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000,
UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101, UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101,
"ZyXEL", "ZyXEL",
"G-220F USB-WLAN Install", "G-220F USB-WLAN Install",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_DEVICE ), US_FL_IGNORE_DEVICE ),
UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101, UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101,
"SiteCom", "SiteCom",
"WL-117 USB-WLAN Install", "WL-117 USB-WLAN Install",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_DEVICE ), US_FL_IGNORE_DEVICE ),
/* Reported by Dan Williams <dcbw@redhat.com> /* Reported by Dan Williams <dcbw@redhat.com>
...@@ -1133,7 +1133,7 @@ UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101, ...@@ -1133,7 +1133,7 @@ UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101,
UNUSUAL_DEV( 0x0af0, 0x6971, 0x0000, 0x9999, UNUSUAL_DEV( 0x0af0, 0x6971, 0x0000, 0x9999,
"Option N.V.", "Option N.V.",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, option_ms_init, USB_SC_DEVICE, USB_PR_DEVICE, option_ms_init,
0), 0),
/* Reported by F. Aben <f.aben@option.com> /* Reported by F. Aben <f.aben@option.com>
...@@ -1143,7 +1143,7 @@ UNUSUAL_DEV( 0x0af0, 0x6971, 0x0000, 0x9999, ...@@ -1143,7 +1143,7 @@ UNUSUAL_DEV( 0x0af0, 0x6971, 0x0000, 0x9999,
UNUSUAL_DEV( 0x0af0, 0x7401, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x7401, 0x0000, 0x0000,
"Option", "Option",
"GI 0401 SD-Card", "GI 0401 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
/* Reported by Jan Dumon <j.dumon@option.com> /* Reported by Jan Dumon <j.dumon@option.com>
...@@ -1153,104 +1153,104 @@ UNUSUAL_DEV( 0x0af0, 0x7401, 0x0000, 0x0000, ...@@ -1153,104 +1153,104 @@ UNUSUAL_DEV( 0x0af0, 0x7401, 0x0000, 0x0000,
UNUSUAL_DEV( 0x0af0, 0x7501, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x7501, 0x0000, 0x0000,
"Option", "Option",
"GI 0431 SD-Card", "GI 0431 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0x7701, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x7701, 0x0000, 0x0000,
"Option", "Option",
"GI 0451 SD-Card", "GI 0451 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0x7706, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x7706, 0x0000, 0x0000,
"Option", "Option",
"GI 0451 SD-Card", "GI 0451 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0x7901, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x7901, 0x0000, 0x0000,
"Option", "Option",
"GI 0452 SD-Card", "GI 0452 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0x7A01, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x7A01, 0x0000, 0x0000,
"Option", "Option",
"GI 0461 SD-Card", "GI 0461 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0x7A05, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x7A05, 0x0000, 0x0000,
"Option", "Option",
"GI 0461 SD-Card", "GI 0461 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0x8300, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x8300, 0x0000, 0x0000,
"Option", "Option",
"GI 033x SD-Card", "GI 033x SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0x8302, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x8302, 0x0000, 0x0000,
"Option", "Option",
"GI 033x SD-Card", "GI 033x SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0000,
"Option", "Option",
"GI 033x SD-Card", "GI 033x SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0xc100, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0xc100, 0x0000, 0x0000,
"Option", "Option",
"GI 070x SD-Card", "GI 070x SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0xd057, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0xd057, 0x0000, 0x0000,
"Option", "Option",
"GI 1505 SD-Card", "GI 1505 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0xd058, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0xd058, 0x0000, 0x0000,
"Option", "Option",
"GI 1509 SD-Card", "GI 1509 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0xd157, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0xd157, 0x0000, 0x0000,
"Option", "Option",
"GI 1515 SD-Card", "GI 1515 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0xd257, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0xd257, 0x0000, 0x0000,
"Option", "Option",
"GI 1215 SD-Card", "GI 1215 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
UNUSUAL_DEV( 0x0af0, 0xd357, 0x0000, 0x0000, UNUSUAL_DEV( 0x0af0, 0xd357, 0x0000, 0x0000,
"Option", "Option",
"GI 1505 SD-Card", "GI 1505 SD-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
/* Reported by Ben Efros <ben@pc-doctor.com> */ /* Reported by Ben Efros <ben@pc-doctor.com> */
UNUSUAL_DEV( 0x0bc2, 0x3010, 0x0000, 0x0000, UNUSUAL_DEV( 0x0bc2, 0x3010, 0x0000, 0x0000,
"Seagate", "Seagate",
"FreeAgent Pro", "FreeAgent Pro",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SANE_SENSE ), US_FL_SANE_SENSE ),
UNUSUAL_DEV( 0x0d49, 0x7310, 0x0000, 0x9999, UNUSUAL_DEV( 0x0d49, 0x7310, 0x0000, 0x9999,
"Maxtor", "Maxtor",
"USB to SATA", "USB to SATA",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SANE_SENSE), US_FL_SANE_SENSE),
/* /*
...@@ -1260,14 +1260,14 @@ UNUSUAL_DEV( 0x0d49, 0x7310, 0x0000, 0x9999, ...@@ -1260,14 +1260,14 @@ UNUSUAL_DEV( 0x0d49, 0x7310, 0x0000, 0x9999,
UNUSUAL_DEV( 0x0c45, 0x1060, 0x0100, 0x0100, UNUSUAL_DEV( 0x0c45, 0x1060, 0x0100, 0x0100,
"Unknown", "Unknown",
"Unknown", "Unknown",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SINGLE_LUN ), US_FL_SINGLE_LUN ),
/* Submitted by Joris Struyve <joris@struyve.be> */ /* Submitted by Joris Struyve <joris@struyve.be> */
UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xffff, UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xffff,
"Medion", "Medion",
"MD 7425", "MD 7425",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY), US_FL_FIX_INQUIRY),
/* /*
...@@ -1278,13 +1278,13 @@ UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xffff, ...@@ -1278,13 +1278,13 @@ UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xffff,
UNUSUAL_DEV( 0x0d96, 0x5200, 0x0001, 0x0200, UNUSUAL_DEV( 0x0d96, 0x5200, 0x0001, 0x0200,
"Jenoptik", "Jenoptik",
"JD 5200 z3", "JD 5200 z3",
US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY), USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
/* Reported by Jason Johnston <killean@shaw.ca> */ /* Reported by Jason Johnston <killean@shaw.ca> */
UNUSUAL_DEV( 0x0dc4, 0x0073, 0x0000, 0x0000, UNUSUAL_DEV( 0x0dc4, 0x0073, 0x0000, 0x0000,
"Macpower Technology Co.LTD.", "Macpower Technology Co.LTD.",
"USB 2.0 3.5\" DEVICE", "USB 2.0 3.5\" DEVICE",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY), US_FL_FIX_CAPACITY),
/* Reported by Lubomir Blaha <tritol@trilogic.cz> /* Reported by Lubomir Blaha <tritol@trilogic.cz>
...@@ -1295,7 +1295,7 @@ UNUSUAL_DEV( 0x0dc4, 0x0073, 0x0000, 0x0000, ...@@ -1295,7 +1295,7 @@ UNUSUAL_DEV( 0x0dc4, 0x0073, 0x0000, 0x0000,
UNUSUAL_DEV( 0x0dd8, 0x1060, 0x0000, 0xffff, UNUSUAL_DEV( 0x0dd8, 0x1060, 0x0000, 0xffff,
"Netac", "Netac",
"USB-CF-Card", "USB-CF-Card",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
/* Reported by Edward Chapman (taken from linux-usb mailing list) /* Reported by Edward Chapman (taken from linux-usb mailing list)
...@@ -1303,7 +1303,7 @@ UNUSUAL_DEV( 0x0dd8, 0x1060, 0x0000, 0xffff, ...@@ -1303,7 +1303,7 @@ UNUSUAL_DEV( 0x0dd8, 0x1060, 0x0000, 0xffff,
UNUSUAL_DEV( 0x0dd8, 0xd202, 0x0000, 0x9999, UNUSUAL_DEV( 0x0dd8, 0xd202, 0x0000, 0x9999,
"Netac", "Netac",
"USB Flash Disk", "USB Flash Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
...@@ -1312,28 +1312,28 @@ UNUSUAL_DEV( 0x0dd8, 0xd202, 0x0000, 0x9999, ...@@ -1312,28 +1312,28 @@ UNUSUAL_DEV( 0x0dd8, 0xd202, 0x0000, 0x9999,
UNUSUAL_DEV( 0x0dda, 0x0001, 0x0012, 0x0012, UNUSUAL_DEV( 0x0dda, 0x0001, 0x0012, 0x0012,
"WINWARD", "WINWARD",
"Music Disk", "Music Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Ian McConnell <ian at emit.demon.co.uk> */ /* Reported by Ian McConnell <ian at emit.demon.co.uk> */
UNUSUAL_DEV( 0x0dda, 0x0301, 0x0012, 0x0012, UNUSUAL_DEV( 0x0dda, 0x0301, 0x0012, 0x0012,
"PNP_MP3", "PNP_MP3",
"PNP_MP3 PLAYER", "PNP_MP3 PLAYER",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Jim McCloskey <mcclosk@ucsc.edu> */ /* Reported by Jim McCloskey <mcclosk@ucsc.edu> */
UNUSUAL_DEV( 0x0e21, 0x0520, 0x0100, 0x0100, UNUSUAL_DEV( 0x0e21, 0x0520, 0x0100, 0x0100,
"Cowon Systems", "Cowon Systems",
"iAUDIO M5", "iAUDIO M5",
US_SC_DEVICE, US_PR_BULK, NULL, USB_SC_DEVICE, USB_PR_BULK, NULL,
US_FL_NEED_OVERRIDE ), US_FL_NEED_OVERRIDE ),
/* Submitted by Antoine Mairesse <antoine.mairesse@free.fr> */ /* Submitted by Antoine Mairesse <antoine.mairesse@free.fr> */
UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300, UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300,
"USB", "USB",
"Solid state disk", "Solid state disk",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY ), US_FL_FIX_INQUIRY ),
/* Submitted by Daniel Drake <dsd@gentoo.org> /* Submitted by Daniel Drake <dsd@gentoo.org>
...@@ -1341,14 +1341,14 @@ UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300, ...@@ -1341,14 +1341,14 @@ UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300,
UNUSUAL_DEV( 0x0ea0, 0x2168, 0x0110, 0x0110, UNUSUAL_DEV( 0x0ea0, 0x2168, 0x0110, 0x0110,
"Ours Technology", "Ours Technology",
"Flash Disk", "Flash Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Rastislav Stanik <rs_kernel@yahoo.com> */ /* Reported by Rastislav Stanik <rs_kernel@yahoo.com> */
UNUSUAL_DEV( 0x0ea0, 0x6828, 0x0110, 0x0110, UNUSUAL_DEV( 0x0ea0, 0x6828, 0x0110, 0x0110,
"USB", "USB",
"Flash Disk", "Flash Disk",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Benjamin Schiller <sbenni@gmx.de> /* Reported by Benjamin Schiller <sbenni@gmx.de>
...@@ -1356,7 +1356,7 @@ UNUSUAL_DEV( 0x0ea0, 0x6828, 0x0110, 0x0110, ...@@ -1356,7 +1356,7 @@ UNUSUAL_DEV( 0x0ea0, 0x6828, 0x0110, 0x0110,
UNUSUAL_DEV( 0x0ed1, 0x7636, 0x0103, 0x0103, UNUSUAL_DEV( 0x0ed1, 0x7636, 0x0103, 0x0103,
"Typhoon", "Typhoon",
"My DJ 1820", "My DJ 1820",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_GO_SLOW | US_FL_MAX_SECTORS_64), US_FL_IGNORE_RESIDUE | US_FL_GO_SLOW | US_FL_MAX_SECTORS_64),
/* Patch by Leonid Petrov mail at lpetrov.net /* Patch by Leonid Petrov mail at lpetrov.net
...@@ -1367,7 +1367,7 @@ UNUSUAL_DEV( 0x0ed1, 0x7636, 0x0103, 0x0103, ...@@ -1367,7 +1367,7 @@ UNUSUAL_DEV( 0x0ed1, 0x7636, 0x0103, 0x0103,
UNUSUAL_DEV( 0x0f19, 0x0103, 0x0100, 0x0100, UNUSUAL_DEV( 0x0f19, 0x0103, 0x0100, 0x0100,
"Oracom Co., Ltd", "Oracom Co., Ltd",
"ORC-200M", "ORC-200M",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* David Kuehling <dvdkhlng@gmx.de>: /* David Kuehling <dvdkhlng@gmx.de>:
...@@ -1377,21 +1377,21 @@ UNUSUAL_DEV( 0x0f19, 0x0103, 0x0100, 0x0100, ...@@ -1377,21 +1377,21 @@ UNUSUAL_DEV( 0x0f19, 0x0103, 0x0100, 0x0100,
UNUSUAL_DEV( 0x0f19, 0x0105, 0x0100, 0x0100, UNUSUAL_DEV( 0x0f19, 0x0105, 0x0100, 0x0100,
"C-MEX", "C-MEX",
"A-VOX", "A-VOX",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Michael Stattmann <michael@stattmann.com> */ /* Reported by Michael Stattmann <michael@stattmann.com> */
UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000, UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000,
"Sony Ericsson", "Sony Ericsson",
"V800-Vodafone 802", "V800-Vodafone 802",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_NO_WP_DETECT ), US_FL_NO_WP_DETECT ),
/* Reported by The Solutor <thesolutor@gmail.com> */ /* Reported by The Solutor <thesolutor@gmail.com> */
UNUSUAL_DEV( 0x0fce, 0xd0e1, 0x0000, 0x0000, UNUSUAL_DEV( 0x0fce, 0xd0e1, 0x0000, 0x0000,
"Sony Ericsson", "Sony Ericsson",
"MD400", "MD400",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_DEVICE), US_FL_IGNORE_DEVICE),
/* Reported by Jan Mate <mate@fiit.stuba.sk> /* Reported by Jan Mate <mate@fiit.stuba.sk>
...@@ -1399,21 +1399,21 @@ UNUSUAL_DEV( 0x0fce, 0xd0e1, 0x0000, 0x0000, ...@@ -1399,21 +1399,21 @@ UNUSUAL_DEV( 0x0fce, 0xd0e1, 0x0000, 0x0000,
UNUSUAL_DEV( 0x0fce, 0xe030, 0x0000, 0x0000, UNUSUAL_DEV( 0x0fce, 0xe030, 0x0000, 0x0000,
"Sony Ericsson", "Sony Ericsson",
"P990i", "P990i",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ), US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ),
/* Reported by Emmanuel Vasilakis <evas@forthnet.gr> */ /* Reported by Emmanuel Vasilakis <evas@forthnet.gr> */
UNUSUAL_DEV( 0x0fce, 0xe031, 0x0000, 0x0000, UNUSUAL_DEV( 0x0fce, 0xe031, 0x0000, 0x0000,
"Sony Ericsson", "Sony Ericsson",
"M600i", "M600i",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ), US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
/* Reported by Ricardo Barberis <ricardo@dattatec.com> */ /* Reported by Ricardo Barberis <ricardo@dattatec.com> */
UNUSUAL_DEV( 0x0fce, 0xe092, 0x0000, 0x0000, UNUSUAL_DEV( 0x0fce, 0xe092, 0x0000, 0x0000,
"Sony Ericsson", "Sony Ericsson",
"P1i", "P1i",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Kevin Cernekee <kpc-usbdev@gelato.uiuc.edu> /* Reported by Kevin Cernekee <kpc-usbdev@gelato.uiuc.edu>
...@@ -1425,13 +1425,13 @@ UNUSUAL_DEV( 0x0fce, 0xe092, 0x0000, 0x0000, ...@@ -1425,13 +1425,13 @@ UNUSUAL_DEV( 0x0fce, 0xe092, 0x0000, 0x0000,
UNUSUAL_DEV( 0x1019, 0x0c55, 0x0000, 0x0110, UNUSUAL_DEV( 0x1019, 0x0c55, 0x0000, 0x0110,
"Desknote", "Desknote",
"UCR-61S2B", "UCR-61S2B",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_ucr61s2b_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_ucr61s2b_init,
0 ), 0 ),
UNUSUAL_DEV( 0x1058, 0x0704, 0x0000, 0x9999, UNUSUAL_DEV( 0x1058, 0x0704, 0x0000, 0x9999,
"Western Digital", "Western Digital",
"External HDD", "External HDD",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_SANE_SENSE), US_FL_SANE_SENSE),
/* Reported by Fabio Venturi <f.venturi@tdnet.it> /* Reported by Fabio Venturi <f.venturi@tdnet.it>
...@@ -1440,7 +1440,7 @@ UNUSUAL_DEV( 0x1058, 0x0704, 0x0000, 0x9999, ...@@ -1440,7 +1440,7 @@ UNUSUAL_DEV( 0x1058, 0x0704, 0x0000, 0x9999,
UNUSUAL_DEV( 0x10d6, 0x2200, 0x0100, 0x0100, UNUSUAL_DEV( 0x10d6, 0x2200, 0x0100, 0x0100,
"Actions Semiconductor", "Actions Semiconductor",
"Mtp device", "Mtp device",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0), 0),
/* Reported by Pascal Terjan <pterjan@mandriva.com> /* Reported by Pascal Terjan <pterjan@mandriva.com>
...@@ -1449,7 +1449,7 @@ UNUSUAL_DEV( 0x10d6, 0x2200, 0x0100, 0x0100, ...@@ -1449,7 +1449,7 @@ UNUSUAL_DEV( 0x10d6, 0x2200, 0x0100, 0x0100,
UNUSUAL_DEV( 0x1186, 0x3e04, 0x0000, 0x0000, UNUSUAL_DEV( 0x1186, 0x3e04, 0x0000, 0x0000,
"D-Link", "D-Link",
"USB Mass Storage", "USB Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, option_ms_init, US_FL_IGNORE_DEVICE), USB_SC_DEVICE, USB_PR_DEVICE, option_ms_init, US_FL_IGNORE_DEVICE),
/* Reported by Kevin Lloyd <linux@sierrawireless.com> /* Reported by Kevin Lloyd <linux@sierrawireless.com>
* Entry is needed for the initializer function override, * Entry is needed for the initializer function override,
...@@ -1459,7 +1459,7 @@ UNUSUAL_DEV( 0x1186, 0x3e04, 0x0000, 0x0000, ...@@ -1459,7 +1459,7 @@ UNUSUAL_DEV( 0x1186, 0x3e04, 0x0000, 0x0000,
UNUSUAL_DEV( 0x1199, 0x0fff, 0x0000, 0x9999, UNUSUAL_DEV( 0x1199, 0x0fff, 0x0000, 0x9999,
"Sierra Wireless", "Sierra Wireless",
"USB MMC Storage", "USB MMC Storage",
US_SC_DEVICE, US_PR_DEVICE, sierra_ms_init, USB_SC_DEVICE, USB_PR_DEVICE, sierra_ms_init,
0), 0),
/* Reported by Jaco Kroon <jaco@kroon.co.za> /* Reported by Jaco Kroon <jaco@kroon.co.za>
...@@ -1469,7 +1469,7 @@ UNUSUAL_DEV( 0x1199, 0x0fff, 0x0000, 0x9999, ...@@ -1469,7 +1469,7 @@ UNUSUAL_DEV( 0x1199, 0x0fff, 0x0000, 0x9999,
UNUSUAL_DEV( 0x1210, 0x0003, 0x0100, 0x0100, UNUSUAL_DEV( 0x1210, 0x0003, 0x0100, 0x0100,
"Digitech HMG", "Digitech HMG",
"DigiTech Mass Storage", "DigiTech Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by fangxiaozhi <huananhu@huawei.com> /* Reported by fangxiaozhi <huananhu@huawei.com>
...@@ -1478,353 +1478,353 @@ UNUSUAL_DEV( 0x1210, 0x0003, 0x0100, 0x0100, ...@@ -1478,353 +1478,353 @@ UNUSUAL_DEV( 0x1210, 0x0003, 0x0100, 0x0100,
UNUSUAL_DEV( 0x12d1, 0x1001, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1001, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1004, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1004, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1401, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1401, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1402, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1402, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1403, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1403, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1404, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1404, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1405, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1405, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1406, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1406, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1407, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1407, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1408, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1408, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1409, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1409, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x140A, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x140A, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x140B, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x140B, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x140C, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x140C, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x140D, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x140D, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x140E, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x140E, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x140F, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x140F, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1410, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1410, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1411, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1411, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1412, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1412, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1413, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1413, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1414, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1414, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1415, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1415, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1416, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1416, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1417, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1417, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1418, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1418, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1419, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1419, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x141A, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x141A, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x141B, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x141B, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x141C, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x141C, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x141D, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x141D, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x141E, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x141E, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x141F, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x141F, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1420, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1420, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1421, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1421, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1422, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1422, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1423, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1423, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1424, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1424, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1425, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1425, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1426, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1426, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1427, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1427, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1428, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1428, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1429, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1429, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x142A, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x142A, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x142B, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x142B, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x142C, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x142C, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x142D, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x142D, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x142E, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x142E, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x142F, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x142F, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1430, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1430, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1431, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1431, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1432, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1432, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1433, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1433, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1434, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1434, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1435, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1435, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1436, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1436, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1437, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1437, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1438, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1438, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x1439, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x1439, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x143A, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x143A, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x143B, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x143B, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x143C, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x143C, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x143D, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x143D, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x143E, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x143E, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
UNUSUAL_DEV( 0x12d1, 0x143F, 0x0000, 0x0000, UNUSUAL_DEV( 0x12d1, 0x143F, 0x0000, 0x0000,
"HUAWEI MOBILE", "HUAWEI MOBILE",
"Mass Storage", "Mass Storage",
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
0), 0),
/* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */ /* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */
UNUSUAL_DEV( 0x132b, 0x000b, 0x0001, 0x0001, UNUSUAL_DEV( 0x132b, 0x000b, 0x0001, 0x0001,
"Minolta", "Minolta",
"Dimage Z10", "Dimage Z10",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
0 ), 0 ),
/* Reported by Kotrla Vitezslav <kotrla@ceb.cz> */ /* Reported by Kotrla Vitezslav <kotrla@ceb.cz> */
UNUSUAL_DEV( 0x1370, 0x6828, 0x0110, 0x0110, UNUSUAL_DEV( 0x1370, 0x6828, 0x0110, 0x0110,
"SWISSBIT", "SWISSBIT",
"Black Silver", "Black Silver",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Francesco Foresti <frafore@tiscali.it> */ /* Reported by Francesco Foresti <frafore@tiscali.it> */
UNUSUAL_DEV( 0x14cd, 0x6600, 0x0201, 0x0201, UNUSUAL_DEV( 0x14cd, 0x6600, 0x0201, 0x0201,
"Super Top", "Super Top",
"IDE DEVICE", "IDE DEVICE",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Alexandre Oliva <oliva@lsd.ic.unicamp.br> /* Reported by Alexandre Oliva <oliva@lsd.ic.unicamp.br>
...@@ -1833,7 +1833,7 @@ UNUSUAL_DEV( 0x14cd, 0x6600, 0x0201, 0x0201, ...@@ -1833,7 +1833,7 @@ UNUSUAL_DEV( 0x14cd, 0x6600, 0x0201, 0x0201,
UNUSUAL_DEV( 0x152d, 0x2329, 0x0100, 0x0100, UNUSUAL_DEV( 0x152d, 0x2329, 0x0100, 0x0100,
"JMicron", "JMicron",
"USB to ATA/ATAPI Bridge", "USB to ATA/ATAPI Bridge",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE | US_FL_SANE_SENSE ), US_FL_IGNORE_RESIDUE | US_FL_SANE_SENSE ),
/* Reported by Robert Schedel <r.schedel@yahoo.de> /* Reported by Robert Schedel <r.schedel@yahoo.de>
...@@ -1841,7 +1841,7 @@ UNUSUAL_DEV( 0x152d, 0x2329, 0x0100, 0x0100, ...@@ -1841,7 +1841,7 @@ UNUSUAL_DEV( 0x152d, 0x2329, 0x0100, 0x0100,
UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201, UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201,
"Teac", "Teac",
"HD-35PUK-B", "HD-35PUK-B",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Hans de Goede <hdegoede@redhat.com> /* Reported by Hans de Goede <hdegoede@redhat.com>
...@@ -1851,18 +1851,18 @@ UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201, ...@@ -1851,18 +1851,18 @@ UNUSUAL_DEV( 0x1652, 0x6600, 0x0201, 0x0201,
UNUSUAL_DEV( 0x1908, 0x1315, 0x0000, 0x0000, UNUSUAL_DEV( 0x1908, 0x1315, 0x0000, 0x0000,
"BUILDWIN", "BUILDWIN",
"Photo Frame", "Photo Frame",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_BAD_SENSE ), US_FL_BAD_SENSE ),
UNUSUAL_DEV( 0x1908, 0x1320, 0x0000, 0x0000, UNUSUAL_DEV( 0x1908, 0x1320, 0x0000, 0x0000,
"BUILDWIN", "BUILDWIN",
"Photo Frame", "Photo Frame",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_BAD_SENSE ), US_FL_BAD_SENSE ),
UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001, UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001,
"ST", "ST",
"2A", "2A",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY), US_FL_FIX_CAPACITY),
/* patch submitted by Davide Perini <perini.davide@dpsoftware.org> /* patch submitted by Davide Perini <perini.davide@dpsoftware.org>
...@@ -1871,7 +1871,7 @@ UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001, ...@@ -1871,7 +1871,7 @@ UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001,
UNUSUAL_DEV( 0x22b8, 0x3010, 0x0001, 0x0001, UNUSUAL_DEV( 0x22b8, 0x3010, 0x0001, 0x0001,
"Motorola", "Motorola",
"RAZR V3x", "RAZR V3x",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ), US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ),
/* /*
...@@ -1882,14 +1882,14 @@ UNUSUAL_DEV( 0x22b8, 0x3010, 0x0001, 0x0001, ...@@ -1882,14 +1882,14 @@ UNUSUAL_DEV( 0x22b8, 0x3010, 0x0001, 0x0001,
UNUSUAL_DEV( 0x22b8, 0x6426, 0x0101, 0x0101, UNUSUAL_DEV( 0x22b8, 0x6426, 0x0101, 0x0101,
"Motorola", "Motorola",
"MSnc.", "MSnc.",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_FIX_INQUIRY | US_FL_FIX_CAPACITY | US_FL_BULK_IGNORE_TAG), US_FL_FIX_INQUIRY | US_FL_FIX_CAPACITY | US_FL_BULK_IGNORE_TAG),
/* Reported by Radovan Garabik <garabik@kassiopeia.juls.savba.sk> */ /* Reported by Radovan Garabik <garabik@kassiopeia.juls.savba.sk> */
UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999, UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999,
"MPIO", "MPIO",
"HS200", "HS200",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_GO_SLOW ), US_FL_GO_SLOW ),
/* Reported by Frederic Marchal <frederic.marchal@wowcompany.com> /* Reported by Frederic Marchal <frederic.marchal@wowcompany.com>
...@@ -1898,21 +1898,21 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999, ...@@ -1898,21 +1898,21 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999,
UNUSUAL_DEV( 0x3340, 0xffff, 0x0000, 0x0000, UNUSUAL_DEV( 0x3340, 0xffff, 0x0000, 0x0000,
"Mitac", "Mitac",
"Mio DigiWalker USB Sync", "Mio DigiWalker USB Sync",
US_SC_DEVICE,US_PR_DEVICE,NULL, USB_SC_DEVICE,USB_PR_DEVICE,NULL,
US_FL_MAX_SECTORS_64 ), US_FL_MAX_SECTORS_64 ),
/* Reported by Andrey Rahmatullin <wrar@altlinux.org> */ /* Reported by Andrey Rahmatullin <wrar@altlinux.org> */
UNUSUAL_DEV( 0x4102, 0x1020, 0x0100, 0x0100, UNUSUAL_DEV( 0x4102, 0x1020, 0x0100, 0x0100,
"iRiver", "iRiver",
"MP3 T10", "MP3 T10",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ), US_FL_IGNORE_RESIDUE ),
/* Reported by Sergey Pinaev <dfo@antex.ru> */ /* Reported by Sergey Pinaev <dfo@antex.ru> */
UNUSUAL_DEV( 0x4102, 0x1059, 0x0000, 0x0000, UNUSUAL_DEV( 0x4102, 0x1059, 0x0000, 0x0000,
"iRiver", "iRiver",
"P7K", "P7K",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64 ), US_FL_MAX_SECTORS_64 ),
/* /*
...@@ -1922,41 +1922,41 @@ UNUSUAL_DEV( 0x4102, 0x1059, 0x0000, 0x0000, ...@@ -1922,41 +1922,41 @@ UNUSUAL_DEV( 0x4102, 0x1059, 0x0000, 0x0000,
UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100,
"Iomega", "Iomega",
"Micro Mini 1GB", "Micro Mini 1GB",
US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
/* Reported by Andrew Simmons <andrew.simmons@gmail.com> */ /* Reported by Andrew Simmons <andrew.simmons@gmail.com> */
UNUSUAL_DEV( 0xed06, 0x4500, 0x0001, 0x0001, UNUSUAL_DEV( 0xed06, 0x4500, 0x0001, 0x0001,
"DataStor", "DataStor",
"USB4500 FW1.04", "USB4500 FW1.04",
US_SC_DEVICE, US_PR_DEVICE, NULL, USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_CAPACITY_HEURISTICS), US_FL_CAPACITY_HEURISTICS),
/* Reported by Alessio Treglia <quadrispro@ubuntu.com> */ /* Reported by Alessio Treglia <quadrispro@ubuntu.com> */
UNUSUAL_DEV( 0xed10, 0x7636, 0x0001, 0x0001, UNUSUAL_DEV( 0xed10, 0x7636, 0x0001, 0x0001,
"TGE", "TGE",
"Digital MP3 Audio Player", "Digital MP3 Audio Player",
US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
/* Control/Bulk transport for all SubClass values */ /* Control/Bulk transport for all SubClass values */
USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_RBC, USB_PR_CB, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_8020, US_PR_CB, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_8020, USB_PR_CB, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_QIC, US_PR_CB, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_QIC, USB_PR_CB, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_UFI, US_PR_CB, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_UFI, USB_PR_CB, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_8070, US_PR_CB, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_8070, USB_PR_CB, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_SCSI, US_PR_CB, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_SCSI, USB_PR_CB, USB_US_TYPE_STOR),
/* Control/Bulk/Interrupt transport for all SubClass values */ /* Control/Bulk/Interrupt transport for all SubClass values */
USUAL_DEV(US_SC_RBC, US_PR_CBI, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_RBC, USB_PR_CBI, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_8020, US_PR_CBI, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_8020, USB_PR_CBI, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_QIC, US_PR_CBI, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_QIC, USB_PR_CBI, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_UFI, US_PR_CBI, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_UFI, USB_PR_CBI, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_8070, US_PR_CBI, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_8070, USB_PR_CBI, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_SCSI, US_PR_CBI, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_SCSI, USB_PR_CBI, USB_US_TYPE_STOR),
/* Bulk-only transport for all SubClass values */ /* Bulk-only transport for all SubClass values */
USUAL_DEV(US_SC_RBC, US_PR_BULK, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_RBC, USB_PR_BULK, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_8020, US_PR_BULK, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_8020, USB_PR_BULK, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_QIC, US_PR_BULK, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_QIC, USB_PR_BULK, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_UFI, US_PR_BULK, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_UFI, USB_PR_BULK, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_8070, US_PR_BULK, USB_US_TYPE_STOR), USUAL_DEV(USB_SC_8070, USB_PR_BULK, USB_US_TYPE_STOR),
USUAL_DEV(US_SC_SCSI, US_PR_BULK, 0), USUAL_DEV(USB_SC_SCSI, USB_PR_BULK, 0),
...@@ -21,6 +21,6 @@ ...@@ -21,6 +21,6 @@
UNUSUAL_DEV( 0x07ab, 0xfc01, 0x0000, 0x9999, UNUSUAL_DEV( 0x07ab, 0xfc01, 0x0000, 0x9999,
"Freecom", "Freecom",
"USB-IDE", "USB-IDE",
US_SC_QIC, US_PR_FREECOM, init_freecom, 0), USB_SC_QIC, USB_PR_FREECOM, init_freecom, 0),
#endif /* defined(CONFIG_USB_STORAGE_FREECOM) || ... */ #endif /* defined(CONFIG_USB_STORAGE_FREECOM) || ... */
...@@ -21,37 +21,37 @@ ...@@ -21,37 +21,37 @@
UNUSUAL_DEV( 0x054c, 0x002b, 0x0100, 0x0110, UNUSUAL_DEV( 0x054c, 0x002b, 0x0100, 0x0110,
"Sony", "Sony",
"Portable USB Harddrive V2", "Portable USB Harddrive V2",
US_SC_ISD200, US_PR_BULK, isd200_Initialization, USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
0), 0),
UNUSUAL_DEV( 0x05ab, 0x0031, 0x0100, 0x0110, UNUSUAL_DEV( 0x05ab, 0x0031, 0x0100, 0x0110,
"In-System", "In-System",
"USB/IDE Bridge (ATA/ATAPI)", "USB/IDE Bridge (ATA/ATAPI)",
US_SC_ISD200, US_PR_BULK, isd200_Initialization, USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
0), 0),
UNUSUAL_DEV( 0x05ab, 0x0301, 0x0100, 0x0110, UNUSUAL_DEV( 0x05ab, 0x0301, 0x0100, 0x0110,
"In-System", "In-System",
"Portable USB Harddrive V2", "Portable USB Harddrive V2",
US_SC_ISD200, US_PR_BULK, isd200_Initialization, USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
0), 0),
UNUSUAL_DEV( 0x05ab, 0x0351, 0x0100, 0x0110, UNUSUAL_DEV( 0x05ab, 0x0351, 0x0100, 0x0110,
"In-System", "In-System",
"Portable USB Harddrive V2", "Portable USB Harddrive V2",
US_SC_ISD200, US_PR_BULK, isd200_Initialization, USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
0), 0),
UNUSUAL_DEV( 0x05ab, 0x5701, 0x0100, 0x0110, UNUSUAL_DEV( 0x05ab, 0x5701, 0x0100, 0x0110,
"In-System", "In-System",
"USB Storage Adapter V2", "USB Storage Adapter V2",
US_SC_ISD200, US_PR_BULK, isd200_Initialization, USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
0), 0),
UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110,
"ATI", "ATI",
"USB Cable 205", "USB Cable 205",
US_SC_ISD200, US_PR_BULK, isd200_Initialization, USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
0), 0),
#endif /* defined(CONFIG_USB_STORAGE_ISD200) || ... */ #endif /* defined(CONFIG_USB_STORAGE_ISD200) || ... */
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
UNUSUAL_DEV( 0x05dc, 0x0001, 0x0000, 0x0001, UNUSUAL_DEV( 0x05dc, 0x0001, 0x0000, 0x0001,
"Lexar", "Lexar",
"Jumpshot USB CF Reader", "Jumpshot USB CF Reader",
US_SC_SCSI, US_PR_JUMPSHOT, NULL, USB_SC_SCSI, USB_PR_JUMPSHOT, NULL,
US_FL_NEED_OVERRIDE), US_FL_NEED_OVERRIDE),
#endif /* defined(CONFIG_USB_STORAGE_JUMPSHOT) || ... */ #endif /* defined(CONFIG_USB_STORAGE_JUMPSHOT) || ... */
...@@ -21,6 +21,6 @@ ...@@ -21,6 +21,6 @@
UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x0101, UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x0101,
"Rio", "Rio",
"Rio Karma", "Rio Karma",
US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0), USB_SC_SCSI, USB_PR_KARMA, rio_karma_init, 0),
#endif /* defined(CONFIG_USB_STORAGE_KARMA) || ... */ #endif /* defined(CONFIG_USB_STORAGE_KARMA) || ... */
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
UNUSUAL_DEV( 0x0d49, 0x7000, 0x0000, 0x9999, UNUSUAL_DEV( 0x0d49, 0x7000, 0x0000, 0x9999,
"Maxtor", "Maxtor",
"OneTouch External Harddrive", "OneTouch External Harddrive",
US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input, USB_SC_DEVICE, USB_PR_DEVICE, onetouch_connect_input,
0), 0),
UNUSUAL_DEV( 0x0d49, 0x7010, 0x0000, 0x9999, UNUSUAL_DEV( 0x0d49, 0x7010, 0x0000, 0x9999,
"Maxtor", "Maxtor",
"OneTouch External Harddrive", "OneTouch External Harddrive",
US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input, USB_SC_DEVICE, USB_PR_DEVICE, onetouch_connect_input,
0), 0),
#endif /* defined(CONFIG_USB_STORAGE_ONETOUCH) || ... */ #endif /* defined(CONFIG_USB_STORAGE_ONETOUCH) || ... */
...@@ -21,36 +21,36 @@ ...@@ -21,36 +21,36 @@
UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100, UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100,
"Microtech", "Microtech",
"CameraMate (DPCM_USB)", "CameraMate (DPCM_USB)",
US_SC_SCSI, US_PR_DPCM_USB, NULL, 0), USB_SC_SCSI, USB_PR_DPCM_USB, NULL, 0),
UNUSUAL_DEV( 0x04e6, 0x0003, 0x0000, 0x9999, UNUSUAL_DEV( 0x04e6, 0x0003, 0x0000, 0x9999,
"Sandisk", "Sandisk",
"ImageMate SDDR09", "ImageMate SDDR09",
US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init, USB_SC_SCSI, USB_PR_EUSB_SDDR09, usb_stor_sddr09_init,
0), 0),
/* This entry is from Andries.Brouwer@cwi.nl */ /* This entry is from Andries.Brouwer@cwi.nl */
UNUSUAL_DEV( 0x04e6, 0x0005, 0x0100, 0x0208, UNUSUAL_DEV( 0x04e6, 0x0005, 0x0100, 0x0208,
"SCM Microsystems", "SCM Microsystems",
"eUSB SmartMedia / CompactFlash Adapter", "eUSB SmartMedia / CompactFlash Adapter",
US_SC_SCSI, US_PR_DPCM_USB, usb_stor_sddr09_dpcm_init, USB_SC_SCSI, USB_PR_DPCM_USB, usb_stor_sddr09_dpcm_init,
0), 0),
UNUSUAL_DEV( 0x066b, 0x0105, 0x0100, 0x0100, UNUSUAL_DEV( 0x066b, 0x0105, 0x0100, 0x0100,
"Olympus", "Olympus",
"Camedia MAUSB-2", "Camedia MAUSB-2",
US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init, USB_SC_SCSI, USB_PR_EUSB_SDDR09, usb_stor_sddr09_init,
0), 0),
UNUSUAL_DEV( 0x0781, 0x0200, 0x0000, 0x9999, UNUSUAL_DEV( 0x0781, 0x0200, 0x0000, 0x9999,
"Sandisk", "Sandisk",
"ImageMate SDDR-09", "ImageMate SDDR-09",
US_SC_SCSI, US_PR_EUSB_SDDR09, usb_stor_sddr09_init, USB_SC_SCSI, USB_PR_EUSB_SDDR09, usb_stor_sddr09_init,
0), 0),
UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100, UNUSUAL_DEV( 0x07af, 0x0006, 0x0100, 0x0100,
"Microtech", "Microtech",
"CameraMate (DPCM_USB)", "CameraMate (DPCM_USB)",
US_SC_SCSI, US_PR_DPCM_USB, NULL, 0), USB_SC_SCSI, USB_PR_DPCM_USB, NULL, 0),
#endif /* defined(CONFIG_USB_STORAGE_SDDR09) || ... */ #endif /* defined(CONFIG_USB_STORAGE_SDDR09) || ... */
...@@ -22,23 +22,23 @@ ...@@ -22,23 +22,23 @@
UNUSUAL_DEV( 0x07c4, 0xa103, 0x0000, 0x9999, UNUSUAL_DEV( 0x07c4, 0xa103, 0x0000, 0x9999,
"Datafab", "Datafab",
"MDSM-B reader", "MDSM-B reader",
US_SC_SCSI, US_PR_SDDR55, NULL, USB_SC_SCSI, USB_PR_SDDR55, NULL,
US_FL_FIX_INQUIRY), US_FL_FIX_INQUIRY),
/* SM part - aeb <Andries.Brouwer@cwi.nl> */ /* SM part - aeb <Andries.Brouwer@cwi.nl> */
UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff, UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff,
"Datafab Systems, Inc.", "Datafab Systems, Inc.",
"USB to CF + SM Combo (LC1)", "USB to CF + SM Combo (LC1)",
US_SC_SCSI, US_PR_SDDR55, NULL, 0), USB_SC_SCSI, USB_PR_SDDR55, NULL, 0),
UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff, UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff,
"Acomdata", "Acomdata",
"SM", "SM",
US_SC_SCSI, US_PR_SDDR55, NULL, 0), USB_SC_SCSI, USB_PR_SDDR55, NULL, 0),
UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x9999, UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x9999,
"Sandisk", "Sandisk",
"ImageMate SDDR55", "ImageMate SDDR55",
US_SC_SCSI, US_PR_SDDR55, NULL, 0), USB_SC_SCSI, USB_PR_SDDR55, NULL, 0),
#endif /* defined(CONFIG_USB_STORAGE_SDDR55) || ... */ #endif /* defined(CONFIG_USB_STORAGE_SDDR55) || ... */
...@@ -21,23 +21,23 @@ ...@@ -21,23 +21,23 @@
UNUSUAL_DEV( 0x03f0, 0x0207, 0x0001, 0x0001, UNUSUAL_DEV( 0x03f0, 0x0207, 0x0001, 0x0001,
"HP", "HP",
"CD-Writer+ 8200e", "CD-Writer+ 8200e",
US_SC_8070, US_PR_USBAT, init_usbat_cd, 0), USB_SC_8070, USB_PR_USBAT, init_usbat_cd, 0),
UNUSUAL_DEV( 0x03f0, 0x0307, 0x0001, 0x0001, UNUSUAL_DEV( 0x03f0, 0x0307, 0x0001, 0x0001,
"HP", "HP",
"CD-Writer+ CD-4e", "CD-Writer+ CD-4e",
US_SC_8070, US_PR_USBAT, init_usbat_cd, 0), USB_SC_8070, USB_PR_USBAT, init_usbat_cd, 0),
UNUSUAL_DEV( 0x04e6, 0x1010, 0x0000, 0x9999, UNUSUAL_DEV( 0x04e6, 0x1010, 0x0000, 0x9999,
"Shuttle/SCM", "Shuttle/SCM",
"USBAT-02", "USBAT-02",
US_SC_SCSI, US_PR_USBAT, init_usbat_flash, USB_SC_SCSI, USB_PR_USBAT, init_usbat_flash,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
UNUSUAL_DEV( 0x0781, 0x0005, 0x0005, 0x0005, UNUSUAL_DEV( 0x0781, 0x0005, 0x0005, 0x0005,
"Sandisk", "Sandisk",
"ImageMate SDDR-05b", "ImageMate SDDR-05b",
US_SC_SCSI, US_PR_USBAT, init_usbat_flash, USB_SC_SCSI, USB_PR_USBAT, init_usbat_flash,
US_FL_SINGLE_LUN), US_FL_SINGLE_LUN),
#endif /* defined(CONFIG_USB_STORAGE_USBAT) || ... */ #endif /* defined(CONFIG_USB_STORAGE_USBAT) || ... */
...@@ -512,10 +512,10 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id, ...@@ -512,10 +512,10 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id,
/* Store the entries */ /* Store the entries */
us->unusual_dev = unusual_dev; us->unusual_dev = unusual_dev;
us->subclass = (unusual_dev->useProtocol == US_SC_DEVICE) ? us->subclass = (unusual_dev->useProtocol == USB_SC_DEVICE) ?
idesc->bInterfaceSubClass : idesc->bInterfaceSubClass :
unusual_dev->useProtocol; unusual_dev->useProtocol;
us->protocol = (unusual_dev->useTransport == US_PR_DEVICE) ? us->protocol = (unusual_dev->useTransport == USB_PR_DEVICE) ?
idesc->bInterfaceProtocol : idesc->bInterfaceProtocol :
unusual_dev->useTransport; unusual_dev->useTransport;
us->fflags = USB_US_ORIG_FLAGS(id->driver_info); us->fflags = USB_US_ORIG_FLAGS(id->driver_info);
...@@ -552,10 +552,10 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id, ...@@ -552,10 +552,10 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id,
struct usb_device_descriptor *ddesc = &dev->descriptor; struct usb_device_descriptor *ddesc = &dev->descriptor;
int msg = -1; int msg = -1;
if (unusual_dev->useProtocol != US_SC_DEVICE && if (unusual_dev->useProtocol != USB_SC_DEVICE &&
us->subclass == idesc->bInterfaceSubClass) us->subclass == idesc->bInterfaceSubClass)
msg += 1; msg += 1;
if (unusual_dev->useTransport != US_PR_DEVICE && if (unusual_dev->useTransport != USB_PR_DEVICE &&
us->protocol == idesc->bInterfaceProtocol) us->protocol == idesc->bInterfaceProtocol)
msg += 2; msg += 2;
if (msg >= 0 && !(us->fflags & US_FL_NEED_OVERRIDE)) if (msg >= 0 && !(us->fflags & US_FL_NEED_OVERRIDE))
...@@ -582,21 +582,21 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id, ...@@ -582,21 +582,21 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id,
static void get_transport(struct us_data *us) static void get_transport(struct us_data *us)
{ {
switch (us->protocol) { switch (us->protocol) {
case US_PR_CB: case USB_PR_CB:
us->transport_name = "Control/Bulk"; us->transport_name = "Control/Bulk";
us->transport = usb_stor_CB_transport; us->transport = usb_stor_CB_transport;
us->transport_reset = usb_stor_CB_reset; us->transport_reset = usb_stor_CB_reset;
us->max_lun = 7; us->max_lun = 7;
break; break;
case US_PR_CBI: case USB_PR_CBI:
us->transport_name = "Control/Bulk/Interrupt"; us->transport_name = "Control/Bulk/Interrupt";
us->transport = usb_stor_CB_transport; us->transport = usb_stor_CB_transport;
us->transport_reset = usb_stor_CB_reset; us->transport_reset = usb_stor_CB_reset;
us->max_lun = 7; us->max_lun = 7;
break; break;
case US_PR_BULK: case USB_PR_BULK:
us->transport_name = "Bulk"; us->transport_name = "Bulk";
us->transport = usb_stor_Bulk_transport; us->transport = usb_stor_Bulk_transport;
us->transport_reset = usb_stor_Bulk_reset; us->transport_reset = usb_stor_Bulk_reset;
...@@ -608,35 +608,35 @@ static void get_transport(struct us_data *us) ...@@ -608,35 +608,35 @@ static void get_transport(struct us_data *us)
static void get_protocol(struct us_data *us) static void get_protocol(struct us_data *us)
{ {
switch (us->subclass) { switch (us->subclass) {
case US_SC_RBC: case USB_SC_RBC:
us->protocol_name = "Reduced Block Commands (RBC)"; us->protocol_name = "Reduced Block Commands (RBC)";
us->proto_handler = usb_stor_transparent_scsi_command; us->proto_handler = usb_stor_transparent_scsi_command;
break; break;
case US_SC_8020: case USB_SC_8020:
us->protocol_name = "8020i"; us->protocol_name = "8020i";
us->proto_handler = usb_stor_pad12_command; us->proto_handler = usb_stor_pad12_command;
us->max_lun = 0; us->max_lun = 0;
break; break;
case US_SC_QIC: case USB_SC_QIC:
us->protocol_name = "QIC-157"; us->protocol_name = "QIC-157";
us->proto_handler = usb_stor_pad12_command; us->proto_handler = usb_stor_pad12_command;
us->max_lun = 0; us->max_lun = 0;
break; break;
case US_SC_8070: case USB_SC_8070:
us->protocol_name = "8070i"; us->protocol_name = "8070i";
us->proto_handler = usb_stor_pad12_command; us->proto_handler = usb_stor_pad12_command;
us->max_lun = 0; us->max_lun = 0;
break; break;
case US_SC_SCSI: case USB_SC_SCSI:
us->protocol_name = "Transparent SCSI"; us->protocol_name = "Transparent SCSI";
us->proto_handler = usb_stor_transparent_scsi_command; us->proto_handler = usb_stor_transparent_scsi_command;
break; break;
case US_SC_UFI: case USB_SC_UFI:
us->protocol_name = "Uniform Floppy Interface (UFI)"; us->protocol_name = "Uniform Floppy Interface (UFI)";
us->proto_handler = usb_stor_ufi_command; us->proto_handler = usb_stor_ufi_command;
break; break;
...@@ -679,7 +679,7 @@ static int get_pipes(struct us_data *us) ...@@ -679,7 +679,7 @@ static int get_pipes(struct us_data *us)
} }
} }
if (!ep_in || !ep_out || (us->protocol == US_PR_CBI && !ep_int)) { if (!ep_in || !ep_out || (us->protocol == USB_PR_CBI && !ep_int)) {
US_DEBUGP("Endpoint sanity check failed! Rejecting dev.\n"); US_DEBUGP("Endpoint sanity check failed! Rejecting dev.\n");
return -EIO; return -EIO;
} }
...@@ -834,7 +834,7 @@ static int usb_stor_scan_thread(void * __us) ...@@ -834,7 +834,7 @@ static int usb_stor_scan_thread(void * __us)
if (!test_bit(US_FLIDX_DONT_SCAN, &us->dflags)) { if (!test_bit(US_FLIDX_DONT_SCAN, &us->dflags)) {
/* For bulk-only devices, determine the max LUN value */ /* For bulk-only devices, determine the max LUN value */
if (us->protocol == US_PR_BULK && if (us->protocol == USB_PR_BULK &&
!(us->fflags & US_FL_SINGLE_LUN)) { !(us->fflags & US_FL_SINGLE_LUN)) {
mutex_lock(&us->dev_mutex); mutex_lock(&us->dev_mutex);
us->max_lun = usb_stor_Bulk_max_lun(us); us->max_lun = usb_stor_Bulk_max_lun(us);
......
...@@ -81,35 +81,36 @@ enum { US_DO_ALL_FLAGS }; ...@@ -81,35 +81,36 @@ enum { US_DO_ALL_FLAGS };
/* Sub Classes */ /* Sub Classes */
#define US_SC_RBC 0x01 /* Typically, flash devices */ #define USB_SC_RBC 0x01 /* Typically, flash devices */
#define US_SC_8020 0x02 /* CD-ROM */ #define USB_SC_8020 0x02 /* CD-ROM */
#define US_SC_QIC 0x03 /* QIC-157 Tapes */ #define USB_SC_QIC 0x03 /* QIC-157 Tapes */
#define US_SC_UFI 0x04 /* Floppy */ #define USB_SC_UFI 0x04 /* Floppy */
#define US_SC_8070 0x05 /* Removable media */ #define USB_SC_8070 0x05 /* Removable media */
#define US_SC_SCSI 0x06 /* Transparent */ #define USB_SC_SCSI 0x06 /* Transparent */
#define US_SC_LOCKABLE 0x07 /* Password-protected */ #define USB_SC_LOCKABLE 0x07 /* Password-protected */
#define US_SC_ISD200 0xf0 /* ISD200 ATA */ #define USB_SC_ISD200 0xf0 /* ISD200 ATA */
#define US_SC_CYP_ATACB 0xf1 /* Cypress ATACB */ #define USB_SC_CYP_ATACB 0xf1 /* Cypress ATACB */
#define US_SC_DEVICE 0xff /* Use device's value */ #define USB_SC_DEVICE 0xff /* Use device's value */
/* Protocols */ /* Storage protocol codes */
#define US_PR_CBI 0x00 /* Control/Bulk/Interrupt */ #define USB_PR_CBI 0x00 /* Control/Bulk/Interrupt */
#define US_PR_CB 0x01 /* Control/Bulk w/o interrupt */ #define USB_PR_CB 0x01 /* Control/Bulk w/o interrupt */
#define US_PR_BULK 0x50 /* bulk only */ #define USB_PR_BULK 0x50 /* bulk only */
#define USB_PR_UAS 0x62 /* USB Attached SCSI */
#define US_PR_USBAT 0x80 /* SCM-ATAPI bridge */
#define US_PR_EUSB_SDDR09 0x81 /* SCM-SCSI bridge for SDDR-09 */ #define USB_PR_USBAT 0x80 /* SCM-ATAPI bridge */
#define US_PR_SDDR55 0x82 /* SDDR-55 (made up) */ #define USB_PR_EUSB_SDDR09 0x81 /* SCM-SCSI bridge for SDDR-09 */
#define US_PR_DPCM_USB 0xf0 /* Combination CB/SDDR09 */ #define USB_PR_SDDR55 0x82 /* SDDR-55 (made up) */
#define US_PR_FREECOM 0xf1 /* Freecom */ #define USB_PR_DPCM_USB 0xf0 /* Combination CB/SDDR09 */
#define US_PR_DATAFAB 0xf2 /* Datafab chipsets */ #define USB_PR_FREECOM 0xf1 /* Freecom */
#define US_PR_JUMPSHOT 0xf3 /* Lexar Jumpshot */ #define USB_PR_DATAFAB 0xf2 /* Datafab chipsets */
#define US_PR_ALAUDA 0xf4 /* Alauda chipsets */ #define USB_PR_JUMPSHOT 0xf3 /* Lexar Jumpshot */
#define US_PR_KARMA 0xf5 /* Rio Karma */ #define USB_PR_ALAUDA 0xf4 /* Alauda chipsets */
#define USB_PR_KARMA 0xf5 /* Rio Karma */
#define US_PR_DEVICE 0xff /* Use device's value */
#define USB_PR_DEVICE 0xff /* Use device's value */
/* /*
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment