Greg, please apply.
Signed-off-by: Phil Dibowitz <[EMAIL PROTECTED]>
-- Phil Dibowitz [EMAIL PROTECTED] Freeware and Technical Pages Insanity Palace of Metallica http://www.phildev.net/ http://www.ipom.com/
"They that can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety." - Benjamin Franklin, 1759
diff -puN drivers/usb/storage/unusual_devs.h~unusual_clean24
drivers/usb/storage/unusual_devs.h
--- linux-2.6.10-rc1/drivers/usb/storage/unusual_devs.h~unusual_clean24
2004-12-12 22:19:35.000000000 -0800
+++ linux-2.6.10-rc1-phil/drivers/usb/storage/unusual_devs.h 2004-12-12
22:27:51.000000000 -0800
@@ -310,14 +310,14 @@ UNUSUAL_DEV( 0x054c, 0x0010, 0x0106, 0x
"Sony",
"DSC-S30/S70/S75/505V/F505/F707/F717/P8",
US_SC_SCSI, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN | US_FL_MODE_XLATE ),
+ US_FL_SINGLE_LUN ),
/* This entry is needed because the device reports Sub=ff */
UNUSUAL_DEV( 0x054c, 0x0010, 0x0500, 0x0500,
"Sony",
"DSC-T1",
US_SC_8070, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN | US_FL_MODE_XLATE ),
+ US_FL_SINGLE_LUN ),
/* Reported by [EMAIL PROTECTED] */
@@ -346,14 +346,14 @@ UNUSUAL_DEV( 0x054c, 0x002e, 0x0106, 0x
"Sony",
"Handycam",
US_SC_SCSI, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN | US_FL_MODE_XLATE),
+ US_FL_SINGLE_LUN ),
/* Submitted by Rajesh Kumble Nayak <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x054c, 0x002e, 0x0500, 0x0500,
"Sony",
"Handycam HC-85",
US_SC_UFI, US_PR_DEVICE, NULL,
- US_FL_SINGLE_LUN | US_FL_MODE_XLATE),
+ US_FL_SINGLE_LUN ),
UNUSUAL_DEV( 0x054c, 0x0032, 0x0000, 0x9999,
"Sony",
@@ -476,7 +476,7 @@ UNUSUAL_DEV( 0x05dc, 0x0001, 0x0000, 0x
"Lexar",
"Jumpshot USB CF Reader",
US_SC_SCSI, US_PR_JUMPSHOT, NULL,
- US_FL_NEED_OVERRIDE | US_FL_MODE_XLATE ),
+ US_FL_NEED_OVERRIDE ),
#endif
/* Reported by Blake Matheny <[EMAIL PROTECTED]> */
@@ -492,7 +492,7 @@ UNUSUAL_DEV( 0x0636, 0x0003, 0x0000, 0x
"Vivitar",
"Vivicam 35Xx",
US_SC_SCSI, US_PR_BULK, NULL,
- US_FL_FIX_INQUIRY | US_FL_MODE_XLATE),
+ US_FL_FIX_INQUIRY ),
UNUSUAL_DEV( 0x0644, 0x0000, 0x0100, 0x0100,
"TEAC",
@@ -609,48 +609,48 @@ UNUSUAL_DEV( 0x07c4, 0xa000, 0x0000, 0x
"Datafab",
"MDCFE-B USB CF Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
- /*
- * The following Datafab-based devices may or may not work
- * using the current driver...the 0xffff is arbitrary since I
- * don't know what device versions exist for these guys.
- *
- * The 0xa003 and 0xa004 devices in particular I'm curious about.
- * I'm told they exist but so far nobody has come forward to say that
- * they work with this driver. Given the success we've had getting
- * other Datafab-based cards operational with this driver, I've decided
- * to leave these two devices in the list.
- */
+/*
+ * The following Datafab-based devices may or may not work
+ * using the current driver...the 0xffff is arbitrary since I
+ * don't know what device versions exist for these guys.
+ *
+ * The 0xa003 and 0xa004 devices in particular I'm curious about.
+ * I'm told they exist but so far nobody has come forward to say that
+ * they work with this driver. Given the success we've had getting
+ * other Datafab-based cards operational with this driver, I've decided
+ * to leave these two devices in the list.
+ */
UNUSUAL_DEV( 0x07c4, 0xa001, 0x0000, 0xffff,
"SIIG/Datafab",
"SIIG/Datafab Memory Stick+CF Reader/Writer",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
UNUSUAL_DEV( 0x07c4, 0xa003, 0x0000, 0xffff,
"Datafab/Unknown",
"Datafab-based Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
UNUSUAL_DEV( 0x07c4, 0xa004, 0x0000, 0xffff,
"Datafab/Unknown",
"Datafab-based Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
UNUSUAL_DEV( 0x07c4, 0xa005, 0x0000, 0xffff,
"PNY/Datafab",
"PNY/Datafab CF+SM Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
UNUSUAL_DEV( 0x07c4, 0xa006, 0x0000, 0xffff,
"Simple Tech/Datafab",
"Simple Tech/Datafab CF+SM Reader",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
#endif
#ifdef CONFIG_USB_STORAGE_SDDR55
@@ -668,7 +668,7 @@ UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0x
"Datafab Systems, Inc.",
"USB to CF + SM Combo (LC1)",
US_SC_SCSI, US_PR_DATAFAB, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
#endif
#ifdef CONFIG_USB_STORAGE_SDDR55
/* SM part - aeb <[EMAIL PROTECTED]> */
@@ -722,7 +722,7 @@ UNUSUAL_DEV( 0x08ca, 0x2011, 0x0000, 0x
"AIPTEK",
"PocketCAM 3Mega",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
/* Entry needed for flags. Moreover, all devices with this ID use
* bulk-only transport, but _some_ falsely report Control/Bulk instead.
@@ -733,14 +733,14 @@ UNUSUAL_DEV( 0x090a, 0x1001, 0x0100, 0x
"Trumpion",
"t33520 USB Flash Card Controller",
US_SC_DEVICE, US_PR_BULK, NULL,
- US_FL_NEED_OVERRIDE | US_FL_MODE_XLATE),
+ US_FL_NEED_OVERRIDE ),
/* Trumpion Microelectronics MP3 player ([EMAIL PROTECTED]) */
UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999,
"Trumpion",
"MP3 player",
US_SC_RBC, US_PR_BULK, NULL,
- US_FL_MODE_XLATE),
+ 0 ),
/* aeb */
UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,
@@ -753,7 +753,7 @@ UNUSUAL_DEV( 0x097a, 0x0001, 0x0000, 0x
"[EMAIL PROTECTED]",
"Digital Wallet",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
/* This Pentax still camera is not conformant
* to the USB storage specification: -
@@ -868,7 +868,7 @@ UNUSUAL_DEV( 0x1065, 0x2136, 0x0000, 0x
"CCYU TECHNOLOGY",
"EasyDisk Portable Device",
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_MODE_XLATE ),
+ 0 ),
/* Reported by Kotrla Vitezslav <[EMAIL PROTECTED]> */
UNUSUAL_DEV( 0x1370, 0x6828, 0x0110, 0x0110,
_
signature.asc
Description: OpenPGP digital signature
