Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6e244b6 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

usb-storage: prepare for subdriver separation 



This patch (as1206) is the first step in converting usb-storage's
subdrivers into separate modules.  It makes the following large-scale
changes:

	Remove a bunch of unnecessary #ifdef's from usb_usual.h.
	Not truly necessary, but it does clean things up.

	Move the USB device-ID table (which is duplicated between
	libusual and usb-storage) into its own source file,
	usual-tables.c, and arrange for this to be linked with
	either libusual or usb-storage according to whether
	USB_LIBUSUAL is configured.

	Add to usual-tables.c a new usb_usual_ignore_device()
	function to detect whether a particular device needs to be
	managed by a subdriver and not by the standard handlers
	in usb-storage.

	Export a whole bunch of functions in usb-storage, renaming
	some of them because their names don't already begin with
	"usb_stor_".  These functions will be needed by the new
	subdriver modules.

	Split usb-storage's probe routine into two functions.
	The subdrivers will call the probe1 routine, then fill in
	their transport and protocol settings, and then call the
	probe2 routine.

	Take the default cases and error checking out of
	get_transport() and get_protocol(), which run during
	probe1, and instead put a check for invalid transport
	or protocol values into the probe2 function.

	Add a new probe routine to be used for standard devices,
	i.e., those that don't need a subdriver.  This new routine
	checks whether the device should be ignored (because it
	should be handled by ub or by a subdriver), and if not,
	calls the probe1 and probe2 functions.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e4abe665

drivers/block/ub.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum); 
 */

#ifdef CONFIG_USB_LIBUSUAL



#define ub_usb_ids  storage_usb_ids

#define ub_usb_ids  usb_storage_usb_ids

#else



static struct usb_device_id ub_usb_ids[] = {

drivers/usb/storage/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += cypress_atacb.o 
usb-storage-objs :=	scsiglue.o protocol.o transport.o usb.o \

			initializers.o sierra_ms.o option_ms.o $(usb-storage-obj-y)



ifneq ($(CONFIG_USB_LIBUSUAL),)

	obj-$(CONFIG_USB)	+= libusual.o

ifeq ($(CONFIG_USB_LIBUSUAL),)

	usb-storage-objs	+= usual-tables.o

else

	obj-$(CONFIG_USB)	+= libusual.o usual-tables.o

endif

drivers/usb/storage/libusual.c

+1 −32
Original line number Diff line number Diff line
@@ -37,37 +37,6 @@ static atomic_t total_threads = ATOMIC_INIT(0); 


static int usu_probe_thread(void *arg);



/*

 * The table.

 */

#define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \

		    vendorName, productName,useProtocol, useTransport, \

		    initFunction, flags) \

{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \

  .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }



#define COMPLIANT_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \

		    vendorName, productName, useProtocol, useTransport, \

		    initFunction, flags) \

{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \

  .driver_info = (flags) }



#define USUAL_DEV(useProto, useTrans, useType) \

{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \

  .driver_info = ((useType)<<24) }



struct usb_device_id storage_usb_ids [] = {

#	include "unusual_devs.h"

	{ } /* Terminating entry */

};



#undef USUAL_DEV

#undef UNUSUAL_DEV

#undef COMPLIANT_DEV



MODULE_DEVICE_TABLE(usb, storage_usb_ids);

EXPORT_SYMBOL_GPL(storage_usb_ids);



/*

 * @type: the module type as an integer

 */
@@ -167,7 +136,7 @@ static struct usb_driver usu_driver = { 
	.name =		"libusual",

	.probe =	usu_probe,

	.disconnect =	usu_disconnect,

	.id_table =	storage_usb_ids,

	.id_table =	usb_storage_usb_ids,

};



/*

drivers/usb/storage/protocol.c

+3 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ void usb_stor_transparent_scsi_command(struct scsi_cmnd *srb, 
	/* send the command to the transport layer */

	usb_stor_invoke_transport(srb, us);

}

EXPORT_SYMBOL_GPL(usb_stor_transparent_scsi_command);



/***********************************************************************

 * Scatter-gather transfer buffer access routines
@@ -199,6 +200,7 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer, 
	/* Return the amount actually transferred */

	return cnt;

}

EXPORT_SYMBOL_GPL(usb_stor_access_xfer_buf);



/* Store the contents of buffer into srb's transfer buffer and set the

 * SCSI residue.
@@ -215,3 +217,4 @@ void usb_stor_set_xfer_buf(unsigned char *buffer, 
	if (buflen < scsi_bufflen(srb))

		scsi_set_resid(srb, scsi_bufflen(srb) - buflen);

}

EXPORT_SYMBOL_GPL(usb_stor_set_xfer_buf);

drivers/usb/storage/scsiglue.c

+1 −1
Original line number Diff line number Diff line
@@ -569,4 +569,4 @@ unsigned char usb_stor_sense_invalidCDB[18] = { 
	[7]	= 0x0a,			    /* additional length */

	[12]	= 0x24			    /* Invalid Field in CDB */

};

EXPORT_SYMBOL_GPL(usb_stor_sense_invalidCDB);