X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fscsi_devinfo.c;h=ea19077e5852dbe149ec4dbaf8c34780162dbc42;hb=6367666f534ee8fa9c6a7b667f38b5e445f85918;hp=4347594a6bc09631220e18c3581519113db57b01;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index 4347594a6..ea19077e5 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -83,7 +83,6 @@ static struct { {"SONY", "CD-ROM CDU-55S", "1.0i", BLIST_NOLUN}, {"SONY", "CD-ROM CDU-561", "1.7x", BLIST_NOLUN}, {"SONY", "CD-ROM CDU-8012", NULL, BLIST_NOLUN}, - {"SONY", "SDT-5000", "3.17", BLIST_SELECT_NO_ATN}, {"TANDBERG", "TDC 3600", "U07", BLIST_NOLUN}, /* locks up */ {"TEAC", "CD-R55S", "1.0H", BLIST_NOLUN}, /* locks up */ /* @@ -116,15 +115,10 @@ static struct { /* * Other types of devices that have special flags. - * Note that all USB devices should have the BLIST_INQUIRY_36 flag. */ - {"3PARdata", "VV", NULL, BLIST_REPORTLUN2}, {"ADAPTEC", "AACRAID", NULL, BLIST_FORCELUN}, {"ADAPTEC", "Adaptec 5400S", NULL, BLIST_FORCELUN}, - {"AFT PRO", "-IX CF", "0.0>", BLIST_FORCELUN}, - {"BELKIN", "USB 2 HS-CF", "1.95", BLIST_FORCELUN | BLIST_INQUIRY_36}, {"CANON", "IPUBJD", NULL, BLIST_SPARSELUN}, - {"CBOX3", "USB Storage-SMC", "300A", BLIST_FORCELUN | BLIST_INQUIRY_36}, {"CMD", "CRA-7280", NULL, BLIST_SPARSELUN}, /* CMD RAID Controller */ {"CNSI", "G7324", NULL, BLIST_SPARSELUN}, /* Chaparral G7324 RAID */ {"CNSi", "G8324", NULL, BLIST_SPARSELUN}, /* Chaparral G8324 RAID */ @@ -145,9 +139,6 @@ static struct { {"EMC", "SYMMETRIX", NULL, BLIST_SPARSELUN | BLIST_LARGELUN | BLIST_FORCELUN}, {"EMULEX", "MD21/S2 ESDI", NULL, BLIST_SINGLELUN}, {"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, - {"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN | BLIST_INQUIRY_36}, - {"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN | BLIST_INQUIRY_36}, - {"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN | BLIST_INQUIRY_36}, {"HITACHI", "DF400", "*", BLIST_SPARSELUN}, {"HITACHI", "DF500", "*", BLIST_SPARSELUN}, {"HITACHI", "DF600", "*", BLIST_SPARSELUN}, @@ -156,7 +147,6 @@ static struct { {"HP", "NetRAID-4M", NULL, BLIST_FORCELUN}, {"HP", "HSV100", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD}, {"HP", "C1557A", NULL, BLIST_FORCELUN}, - {"HP", "C3323-300", "4269", BLIST_NOTQ}, {"IBM", "AuSaV1S2", NULL, BLIST_FORCELUN}, {"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, {"iomega", "jaz 1GB", "J.86", BLIST_NOTQ | BLIST_NOLUN}, @@ -168,7 +158,6 @@ static struct { {"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, {"MATSHITA", "DMC-LC5", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, {"MATSHITA", "DMC-LC40", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, - {"Medion", "Flash XL MMC/SD", "2.6D", BLIST_FORCELUN}, {"MegaRAID", "LD", NULL, BLIST_FORCELUN}, {"MICROP", "4110", NULL, BLIST_NOTQ}, {"MYLEX", "DACARMRB", "*", BLIST_REPORTLUN2}, @@ -182,14 +171,9 @@ static struct { {"PIONEER", "CD-ROM DRM-602X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, {"PIONEER", "CD-ROM DRM-604X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN}, {"REGAL", "CDC-4X", NULL, BLIST_MAX5LUN | BLIST_SINGLELUN}, - {"SanDisk", "ImageMate CF-SD1", NULL, BLIST_FORCELUN}, - {"SEAGATE", "ST34555N", "0930", BLIST_NOTQ}, /* Chokes on tagged INQUIRY */ - {"SEAGATE", "ST3390N", "9546", BLIST_NOTQ}, {"SGI", "RAID3", "*", BLIST_SPARSELUN}, {"SGI", "RAID5", "*", BLIST_SPARSELUN}, {"SGI", "TP9100", "*", BLIST_REPORTLUN2}, - {"SGI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, - {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36}, {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN}, {"SONY", "TSL", NULL, BLIST_FORCELUN}, /* DDS3 & DDS4 autoloaders */ {"SUN", "T300", "*", BLIST_SPARSELUN}, @@ -197,13 +181,41 @@ static struct { {"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN}, {"TOSHIBA", "CDROM", NULL, BLIST_ISROM}, {"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM}, - {"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36}, - {"WangDAT", "Model 2600", "01.7", BLIST_SELECT_NO_ATN}, - {"WangDAT", "Model 3200", "02.2", BLIST_SELECT_NO_ATN}, - {"WangDAT", "Model 1300", "02.4", BLIST_SELECT_NO_ATN}, {"XYRATEX", "RS", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, {"Zzyzx", "RocketStor 500S", NULL, BLIST_SPARSELUN}, {"Zzyzx", "RocketStor 2000", NULL, BLIST_SPARSELUN}, + + /* + * USB multi card readers. Only these should use BLIST_FORCELUN. + */ + {"AFT PRO", "-IX CF", "0.0>", BLIST_FORCELUN}, + {"BELKIN", "USB 2 HS-CF", "1.95", BLIST_FORCELUN}, + {"CBOX3", "USB Storage-SMC", "300A", BLIST_FORCELUN}, + {"DMI", "MultiFlash", "3.00", BLIST_FORCELUN}, + {"eUSB", "Compact Flash", NULL, BLIST_FORCELUN}, + {"GENERIC", "Card Reader CF", "v26F", BLIST_FORCELUN}, + {"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN}, + {"Generic", "USB Storage-SMC", "0090", BLIST_FORCELUN}, + {"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN}, + {"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN}, + {"generic", "USB Storage-SMC", "0207", BLIST_FORCELUN}, + {"IC", "USB Storage-CFC", "322E", BLIST_FORCELUN}, + {"ICSI", "SD Card", "2.7C", BLIST_FORCELUN}, + {"IOI", "Media Bay", "*", BLIST_FORCELUN}, + {"Lexar", "Media Inc. SM/xD", "009E", BLIST_FORCELUN}, + {"Medion", "Flash XL MMC/SD", "2.6D", BLIST_FORCELUN}, + {"OEI-USB2", "CompactFlash", "2.00", BLIST_FORCELUN}, + {"SanDisk", "ImageMate CF-SD1", NULL, BLIST_FORCELUN}, + {"SMSC", "223 U HS-CF", "1.95", BLIST_FORCELUN}, + {"SMSC", "USB 2 HS-CF", NULL, BLIST_FORCELUN}, + {"TwinMOS", "7-in-1 Card RWCF", "0100", BLIST_FORCELUN}, + {"USB2.0", "CardReader SM RW", "0814", BLIST_FORCELUN}, + {"USB2.0", "CardReader CF RW", "0.0>", BLIST_FORCELUN}, + {"USB2.0", "CF CardReader", NULL, BLIST_FORCELUN}, + {"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN}, + {"Y-E DATA", "CF Card Reader", "1.03", BLIST_FORCELUN}, + {"Zynet", "USB Storage-SMC", "I03A", BLIST_FORCELUN}, + { NULL, NULL, NULL, 0 }, }; @@ -520,7 +532,7 @@ void scsi_exit_devinfo(void) * Add command line @dev_list entries, then add * scsi_static_device_list entries to the scsi device info list. **/ -int __init scsi_init_devinfo(void) +int scsi_init_devinfo(void) { #ifdef CONFIG_SCSI_PROC_FS struct proc_dir_entry *p;