ChangeSet 1.1557.49.16, 2004/02/17 16:47:56-08:00, [EMAIL PROTECTED]

[PATCH] USB Storage: unusual_devs.h fixup

On 15 Feb 2004, Frank D. Cringle wrote:

> Hi,
>
> my syslog requests that I send this message.  See below regarding
> usb-storage: This device ... has an unneeded SubClass entry in unusual_devs.h

> Feb 15 00:11:16 dagger usb-storage: This device (07cf,1001,1000 S 05 P 00) has an 
> unneeded SubClass entry in unusual_devs.h
> Feb 15 00:11:16 dagger Please send a copy of this message to <[EMAIL PROTECTED]>

Thank you for sending this in.

Greg, it looks like an earlier patch changed too much.  Here is the fix.
Also included in this patch:

        Moved several entries that were in the wrong positions.

        Removed an entry (0x08ca, 0x2011) that could never be used
        because the preceding entry always would take precedence.


 drivers/usb/storage/unusual_devs.h |   64 ++++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 32 deletions(-)


diff -Nru a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
--- a/drivers/usb/storage/unusual_devs.h        Thu Feb 19 17:21:47 2004
+++ b/drivers/usb/storage/unusual_devs.h        Thu Feb 19 17:21:47 2004
@@ -108,6 +108,15 @@
                "Finecam S5",
                US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
 
+/* Patch for Kyocera Finecam L3
+ * Submitted by Michael Krauth <[EMAIL PROTECTED]>
+ */
+UNUSUAL_DEV(  0x0482, 0x0105, 0x0100, 0x0100,
+               "Kyocera",
+               "Finecam L3",
+               US_SC_SCSI, US_PR_BULK, NULL,
+               US_FL_FIX_INQUIRY),
+
 /* Reported by Paul Stewart <[EMAIL PROTECTED]>
  * This entry is needed because the device reports Sub=ff */
 UNUSUAL_DEV(  0x04a4, 0x0004, 0x0001, 0x0001,
@@ -414,6 +423,28 @@
                US_FL_SINGLE_LUN ),
 #endif
 
+/* Following three Minolta cameras reported by Martin Pool
+ * <[EMAIL PROTECTED]>.  Originally discovered by Kedar Petankar,
+ * Matthew Geier, Mikael Lofj"ard, Marcel de Boer.
+ */
+UNUSUAL_DEV( 0x0686, 0x4006, 0x0001, 0x0001,
+               "Minolta",
+               "DiMAGE 7",
+               US_SC_SCSI, US_PR_DEVICE, NULL,
+               0 ),
+
+UNUSUAL_DEV( 0x0686, 0x400b, 0x0001, 0x0001,
+               "Minolta",
+               "DiMAGE 7i",
+               US_SC_SCSI, US_PR_DEVICE, NULL,
+               0 ),
+
+UNUSUAL_DEV( 0x0686, 0x400f, 0x0001, 0x0001,
+               "Minolta",
+               "DiMAGE 7Hi",
+               US_SC_SCSI, US_PR_DEVICE, NULL,
+               0 ),
+
 /* Submitted by Benny Sjostrand <[EMAIL PROTECTED]> */
 UNUSUAL_DEV( 0x0686, 0x4011, 0x0001, 0x0001,
                "Minolta",
@@ -426,28 +457,6 @@
                 "DIMAGE E223",
                 US_SC_SCSI, US_PR_DEVICE, NULL, 0 ),
 
-/* Following three Minolta cameras reported by Martin Pool
- * <[EMAIL PROTECTED]>.  Originally discovered by Kedar Petankar,
- * Matthew Geier, Mikael Lofj"ard, Marcel de Boer.
- */
-UNUSUAL_DEV( 0x0686, 0x4006, 0x0001, 0x0001,
-             "Minolta",
-             "DiMAGE 7",
-             US_SC_SCSI, US_PR_DEVICE, NULL,
-             0 ),
-
-UNUSUAL_DEV( 0x0686, 0x400b, 0x0001, 0x0001,
-             "Minolta",
-             "DiMAGE 7i",
-             US_SC_SCSI, US_PR_DEVICE, NULL,
-             0 ),
-
-UNUSUAL_DEV( 0x0686, 0x400f, 0x0001, 0x0001,
-             "Minolta",
-             "DiMAGE 7Hi",
-             US_SC_SCSI, US_PR_DEVICE, NULL,
-             0 ),
-
 UNUSUAL_DEV(  0x0693, 0x0002, 0x0100, 0x0100, 
                "Hagiwara",
                "FlashGate SmartMedia",
@@ -607,7 +616,7 @@
 UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9009,
                "Casio",
                "QV DigitalCamera",
-               US_SC_8070, US_PR_CB, NULL,
+               US_SC_DEVICE, US_PR_CB, NULL,
                US_FL_FIX_INQUIRY ),
 
 /* Later Casio cameras apparently tell the truth */
@@ -631,15 +640,6 @@
                "AIPTEK",
                "PocketCAM 3Mega",
                US_SC_DEVICE, US_PR_DEVICE, NULL,
-               US_FL_MODE_XLATE ),
-
-/*Medion 6047 Digital Camera
-Davide Andrian <[EMAIL PROTECTED]>
-*/
-UNUSUAL_DEV( 0x08ca, 0x2011, 0x0001, 0x0001,
-               "3MegaCam",
-               "3MegaCam",
-               US_SC_DEVICE, US_PR_BULK, NULL,
                US_FL_MODE_XLATE ),
 
 /* Trumpion Microelectronics MP3 player ([EMAIL PROTECTED]) */



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id56&alloc_id438&op=click
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to