Greg, please apply this to 2.4 Matt
----- Forwarded message from Alan Stern <[EMAIL PROTECTED]> -----
Date: Wed, 18 Jun 2003 16:58:05 -0400 (EDT)
From: Alan Stern <[EMAIL PROTECTED]>
Subject: [usb-storage] PATCH: (as36) US_SC_DEVICE and US_PR_DEVICE for 2.4
To: Matthew Dharm <[EMAIL PROTECTED]>
cc: USB Storage List <[EMAIL PROTECTED]>
List-Id: Linux USB Mass Storage Driver Developers List <usb-storage.one-eyed-alien.net>
X-Spam-Status: No, hits=-4.0 required=5.0 tests=UNIFIED_PATCH,RCVD_IN_ORBZ version=2.11
Matt:
This patch implements the new subclass and protocol unusual_devs.h codes
for 2.4.21. Now new entries can remain consistent between 2.4 and 2.5.
Alan Stern
--- usb-2.4/drivers/usb/storage/protocol.h.orig Wed Jun 18 15:55:19 2003
+++ usb-2.4/drivers/usb/storage/protocol.h Wed Jun 18 15:56:57 2003
@@ -57,6 +57,8 @@
#define US_SC_MIN US_SC_RBC
#define US_SC_MAX US_SC_ISD200
+#define US_SC_DEVICE 0xff /* Use device's value */
+
extern void usb_stor_ATAPI_command(Scsi_Cmnd*, struct us_data*);
extern void usb_stor_qic157_command(Scsi_Cmnd*, struct us_data*);
extern void usb_stor_ufi_command(Scsi_Cmnd*, struct us_data*);
--- usb-2.4/drivers/usb/storage/transport.h.orig Wed Jun 18 15:55:15 2003
+++ usb-2.4/drivers/usb/storage/transport.h Wed Jun 18 15:56:16 2003
@@ -75,6 +75,8 @@
#define US_PR_JUMPSHOT 0xf3 /* Lexar Jumpshot */
#endif
+#define US_PR_DEVICE 0xff /* Use device's value */
+
/*
* Bulk only data structures
*/
--- usb-2.4/drivers/usb/storage/usb.c.orig Wed Jun 18 16:00:27 2003
+++ usb-2.4/drivers/usb/storage/usb.c Wed Jun 18 16:04:33 2003
@@ -621,8 +621,12 @@
US_DEBUGP("USB Mass Storage device detected\n");
/* Determine subclass and protocol, or copy from the interface */
- subclass = unusual_dev->useProtocol;
- protocol = unusual_dev->useTransport;
+ subclass = (unusual_dev->useProtocol == US_SC_DEVICE) ?
+ altsetting->bInterfaceSubClass :
+ unusual_dev->useProtocol;
+ protocol = (unusual_dev->useTransport == US_PR_DEVICE) ?
+ altsetting->bInterfaceProtocol :
+ unusual_dev->useTransport;
flags = unusual_dev->flags;
/*
_______________________________________________
usb-storage mailing list
[EMAIL PROTECTED]
http://www2.one-eyed-alien.net/mailman/listinfo/usb-storage
----- End forwarded message -----
--
Matthew Dharm Home: [EMAIL PROTECTED]
Maintainer, Linux USB Mass Storage Driver
P: Nine more messages in admin.policy.
M: I know, I'm typing as fast as I can!
-- Pitr and Mike
User Friendly, 11/27/97
pgp00000.pgp
Description: PGP signature
