PATCH: usb-storage: 3 of 3
Attached is a patch to usb-storage. Linus, please apply.
This patch does the following:
(o) Keeps CVS versions in the kernel in sync with mine (the min() changes forced this one).
(o) A one-line fix to the (experimental) sddr-09 driver.
(o) Switch much of transport.c to use the new struct completion. This shows a slight performance gain (less CPU used) and eliminates some bug reports. I don't know what was wrong with the old code, but this new code is clearly correct and works better, anyway.
(o) Adds a few unusual device entries, removes a bogus entry, and fixes a comment in the same file.
Matt Dharm
Signature · 7 lines
Matthew Dharm Home: [email protected] Maintainer, Linux USB Mass Storage Driver E: You run this ship with Windows?! YOU IDIOT! L: Give me a break, it came bundled with the computer! -- ESR and Lan Solaris User Friendly, 12/8/1998
usb/storage/scsiglue.c renamed from usb/storage.old/scsiglue.c +1 -1
@@ -1,7 +1,7 @@/* Driver for USB Mass Storage compliant devices * SCSI layer glue code * -* $Id: scsiglue.c,v 1.21 2001/07/29 23:41:52 mdharm Exp $ +* $Id: scsiglue.c,v 1.22 2001/09/02 04:29:27 mdharm Exp $ * * Current development and maintenance by: * (c) 1999, 2000 Matthew Dharm ([email protected])
usb/storage/sddr09.c renamed from usb/storage.old/sddr09.c +2 -2
@@ -1,6 +1,6 @@/* Driver for SanDisk SDDR-09 SmartMedia reader * -* $Id: sddr09.c,v 1.18 2001/06/11 02:54:25 mdharm Exp $ +* $Id: sddr09.c,v 1.19 2001/09/02 06:07:20 mdharm Exp $ * * SDDR09 driver v0.1: *
@@ -693,7 +693,7 @@// scatterlist block i*64/128k = i*(2^6)*(2^-17) = i*(2^-11) for (i=0 ; i<numblocks; i++) { - ptr = sg[i>>11 ].address+(i<<6 ); + ptr = sg[i>>11 ].address+((i&0x7ff )<<6 );if (ptr[0 ]!=0xFF || ptr[1 ]!=0xFF || ptr[2 ]!=0xFF || ptr[3 ]!=0xFF || ptr[4 ]!=0xFF || ptr[5 ]!=0xFF ) { US_DEBUGP("PBA %04X has no logical mapping: reserved area = "
usb/storage/transport.c renamed from usb/storage.old/transport.c +11 -34
122 lines not on this page · raw message
usb/storage/unusual_devs.h renamed from usb/storage.old/unusual_devs.h +22 -8
@@ -1,7 +1,7 @@/* Driver for USB Mass Storage compliant devices * Ununsual Devices File * -* $Id: unusual_devs.h,v 1.16 2001/07/30 00:27:59 mdharm Exp $ +* $Id: unusual_devs.h,v 1.20 2001/09/02 05:12:57 mdharm Exp $ * * Current development and maintenance by: * (c) 2000 Matthew Dharm ([email protected])
@@ -68,6 +68,19 @@ US_FL_START_STOP ), #endif +/* Made with the help of Edd Dumbill <[email protected]> */ +UNUSUAL_DEV (0x0451 ,0x5409 ,0x0001 ,0x0001 , +"Frontier Labs" , +"Nex II Digital" , +US_SC_SCSI ,US_PR_BULK ,NULL ,US_FL_START_STOP ), + +/* Reported by Paul Stewart <[email protected]> +* This entry is needed because the device reports Sub=ff */ +UNUSUAL_DEV (0x04a4 ,0x0004 ,0x0001 ,0x0001 , +"Hitachi" , +"DVD-CAM DZ-MV100A Camcorder" , +US_SC_SCSI ,US_PR_CB ,NULL ,US_FL_SINGLE_LUN ), + UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210, "Fujifilm", "FinePix 1400Zoom",
@@ -155,13 +168,20 @@ US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP | US_FL_MODE_XLATE ), +/* Reported by [email protected] */ +UNUSUAL_DEV (0x054c ,0x0025 ,0x0100 ,0x0100 , +"Sony" , +"Memorystick NW-MS7" , +US_SC_UFI ,US_PR_CB ,NULL , +US_FL_SINGLE_LUN |US_FL_START_STOP ), +UNUSUAL_DEV (0x054c ,0x002d ,0x0100 ,0x0100 ,"Sony" ,"Memorystick MSAC-US1" ,US_SC_UFI ,US_PR_CB ,NULL ,US_FL_SINGLE_LUN |US_FL_START_STOP ), -/* Submitted by Klaus Mueller <[email protected]> */ +/* Submitted by Klaus Mueller <[email protected]> */ UNUSUAL_DEV( 0x054c, 0x002e, 0x0106, 0x0310, "Sony", "Handycam",
@@ -195,12 +215,6 @@UNUSUAL_DEV (0x05ab ,0x0031 ,0x0100 ,0x0110 ,"In-System" ,"USB/IDE Bridge (ATA/ATAPI)" , -US_SC_ISD200 ,US_PR_BULK , isd200_Initialization, -0 ), - -UNUSUAL_DEV (0x05ab ,0x0060 ,0x0100 ,0x0110 , -"In-System" , -"USB 2.0/IDE Bridge (ATA/ATAPI)" ,US_SC_ISD200 ,US_PR_BULK , isd200_Initialization, 0 ),