This patch uses the USB IDs to determine whether to treat an attached
shuttle usbat adapter as connected to a CDROM or a flash device.
unusual_devs.h already has the code to match the exact device that's
attached; use it instead of probing. The patch is bigger than it
might otherwise be because of the probe removal.
Signed-off-by: Peter Chubb <[EMAIL PROTECTED]>
drivers/usb/storage/shuttle_usbat.c | 83 ++++++++++--------------------------
drivers/usb/storage/shuttle_usbat.h | 3 -
drivers/usb/storage/unusual_devs.h | 8 +--
3 files changed, 30 insertions(+), 64 deletions(-)
Index: linux-2.6/drivers/usb/storage/shuttle_usbat.c
===================================================================
--- linux-2.6.orig/drivers/usb/storage/shuttle_usbat.c 2006-04-05
15:30:10.000000000 +1000
+++ linux-2.6/drivers/usb/storage/shuttle_usbat.c 2006-04-05
15:30:18.000000000 +1000
@@ -843,68 +843,23 @@
}
/*
- * Determine whether we are controlling a flash-based reader/writer,
- * or a HP8200-based CD drive.
- * Sets transport functions as appropriate.
- */
-static int usbat_identify_device(struct us_data *us,
- struct usbat_info *info)
-{
- int rc;
- unsigned char status;
-
- if (!us || !info)
- return USB_STOR_TRANSPORT_ERROR;
-
- rc = usbat_device_reset(us);
- if (rc != USB_STOR_TRANSPORT_GOOD)
- return rc;
- msleep(500);
-
- /*
- * In attempt to distinguish between HP CDRW's and Flash readers, we now
- * execute the IDENTIFY PACKET DEVICE command. On ATA devices (i.e.
flash
- * readers), this command should fail with error. On ATAPI devices (i.e.
- * CDROM drives), it should succeed.
- */
- rc = usbat_write(us, USBAT_ATA, USBAT_ATA_CMD, 0xA1);
- if (rc != USB_STOR_XFER_GOOD)
- return USB_STOR_TRANSPORT_ERROR;
-
- rc = usbat_get_status(us, &status);
- if (rc != USB_STOR_XFER_GOOD)
- return USB_STOR_TRANSPORT_ERROR;
-
- /* Check for error bit, or if the command 'fell through' */
- if (status == 0xA1 || !(status & 0x01)) {
- /* Device is HP 8200 */
- US_DEBUGP("usbat_identify_device: Detected HP8200 CDRW\n");
- info->devicetype = USBAT_DEV_HP8200;
- } else {
- /* Device is a CompactFlash reader/writer */
- US_DEBUGP("usbat_identify_device: Detected Flash
reader/writer\n");
- info->devicetype = USBAT_DEV_FLASH;
- }
-
- return USB_STOR_TRANSPORT_GOOD;
-}
-
-/*
* Set the transport function based on the device type
*/
static int usbat_set_transport(struct us_data *us,
- struct usbat_info *info)
+ struct usbat_info *info,
+ int devicetype)
{
- int rc;
-
if (!info->devicetype) {
- rc = usbat_identify_device(us, info);
- if (rc != USB_STOR_TRANSPORT_GOOD) {
- US_DEBUGP("usbat_set_transport: Could not identify
device\n");
- return 1;
- }
+ int rc = usbat_device_reset(us);
+ if (rc)
+ return rc;
+ msleep(500);
+ info->devicetype = devicetype;
}
+ if (!info->devicetype)
+ return USB_STOR_TRANSPORT_ERROR;
+
if (usbat_get_device_type(us) == USBAT_DEV_HP8200)
us->transport = usbat_hp8200e_transport;
else if (usbat_get_device_type(us) == USBAT_DEV_FLASH)
@@ -1316,7 +1271,7 @@
/*
* Initialize the USBAT processor and the storage device
*/
-int init_usbat(struct us_data *us)
+static int init_usbat(struct us_data *us, int devicetype)
{
int rc;
struct usbat_info *info;
@@ -1398,7 +1353,7 @@
US_DEBUGP("INIT 9\n");
/* At this point, we need to detect which device we are using */
- if (usbat_set_transport(us, info))
+ if (usbat_set_transport(us, info, devicetype))
return USB_STOR_TRANSPORT_ERROR;
US_DEBUGP("INIT 10\n");
@@ -1701,6 +1656,17 @@
return USB_STOR_TRANSPORT_FAILED;
}
+int init_usbat_cd(struct us_data *us)
+{
+ return init_usbat(us, USBAT_DEV_HP8200);
+}
+
+
+int init_usbat_flash(struct us_data *us)
+{
+ return init_usbat(us, USBAT_DEV_FLASH);
+}
+
/*
* Default transport function. Attempts to detect which transport function
* should be called, makes it the new default, and calls it.
@@ -1714,9 +1680,8 @@
{
struct usbat_info *info = (struct usbat_info*) (us->extra);
- if (usbat_set_transport(us, info))
+ if (usbat_set_transport(us, info, 0))
return USB_STOR_TRANSPORT_ERROR;
return us->transport(srb, us);
}
-
Index: linux-2.6/drivers/usb/storage/shuttle_usbat.h
===================================================================
--- linux-2.6.orig/drivers/usb/storage/shuttle_usbat.h 2006-04-05
15:29:56.000000000 +1000
+++ linux-2.6/drivers/usb/storage/shuttle_usbat.h 2006-04-05
15:30:18.000000000 +1000
@@ -106,7 +106,8 @@
#define USBAT_FEAT_ET2 0x01
extern int usbat_transport(struct scsi_cmnd *srb, struct us_data *us);
-extern int init_usbat(struct us_data *us);
+extern int init_usbat_cd(struct us_data *us);
+extern int init_usbat_flash(struct us_data *us);
struct usbat_info {
int devicetype;
Index: linux-2.6/drivers/usb/storage/unusual_devs.h
===================================================================
--- linux-2.6.orig/drivers/usb/storage/unusual_devs.h 2006-04-05
15:29:56.000000000 +1000
+++ linux-2.6/drivers/usb/storage/unusual_devs.h 2006-04-05
15:30:18.000000000 +1000
@@ -78,12 +78,12 @@
UNUSUAL_DEV( 0x03f0, 0x0207, 0x0001, 0x0001,
"HP",
"CD-Writer+ 8200e",
- US_SC_8070, US_PR_USBAT, init_usbat, 0),
+ US_SC_8070, US_PR_USBAT, init_usbat_cd, 0),
UNUSUAL_DEV( 0x03f0, 0x0307, 0x0001, 0x0001,
"HP",
"CD-Writer+ CD-4e",
- US_SC_8070, US_PR_USBAT, init_usbat, 0),
+ US_SC_8070, US_PR_USBAT, init_usbat_cd, 0),
#endif
/* Reported by Sebastian Kapfer <[EMAIL PROTECTED]>
@@ -393,7 +393,7 @@
UNUSUAL_DEV( 0x04e6, 0x1010, 0x0000, 0x9999,
"Shuttle/SCM",
"USBAT-02",
- US_SC_SCSI, US_PR_USBAT, init_usbat,
+ US_SC_SCSI, US_PR_USBAT, init_usbat_flash,
US_FL_SINGLE_LUN),
#endif
@@ -790,7 +790,7 @@
UNUSUAL_DEV( 0x0781, 0x0005, 0x0005, 0x0005,
"Sandisk",
"ImageMate SDDR-05b",
- US_SC_SCSI, US_PR_USBAT, init_usbat,
+ US_SC_SCSI, US_PR_USBAT, init_usbat_flash,
US_FL_SINGLE_LUN ),
#endif
--
Dr Peter Chubb http://www.gelato.unsw.edu.au peterc AT gelato.unsw.edu.au
http://www.ertos.nicta.com.au ERTOS within National ICT Australia
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
