e6e244b6cb
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: Alan Stern <stern@rowland.harvard.edu> CC: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
106 lines
3.0 KiB
C
106 lines
3.0 KiB
C
/* Driver for USB Mass Storage devices
|
|
* Usual Tables File for usb-storage and libusual
|
|
*
|
|
* Copyright (C) 2009 Alan Stern (stern@rowland.harvard.edu)
|
|
*
|
|
* Please see http://www.one-eyed-alien.net/~mdharm/linux-usb for more
|
|
* information about this driver.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2, or (at your option) any
|
|
* later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/usb_usual.h>
|
|
|
|
|
|
/*
|
|
* The table of devices
|
|
*/
|
|
#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 usb_storage_usb_ids[] = {
|
|
# include "unusual_devs.h"
|
|
{ } /* Terminating entry */
|
|
};
|
|
EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
|
|
|
|
MODULE_DEVICE_TABLE(usb, usb_storage_usb_ids);
|
|
|
|
#undef UNUSUAL_DEV
|
|
#undef COMPLIANT_DEV
|
|
#undef USUAL_DEV
|
|
|
|
|
|
/*
|
|
* The table of devices to ignore
|
|
*/
|
|
struct ignore_entry {
|
|
u16 vid, pid, bcdmin, bcdmax;
|
|
};
|
|
|
|
#define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
|
|
vendorName, productName, useProtocol, useTransport, \
|
|
initFunction, flags) \
|
|
{ \
|
|
.vid = id_vendor, \
|
|
.pid = id_product, \
|
|
.bcdmin = bcdDeviceMin, \
|
|
.bcdmax = bcdDeviceMax, \
|
|
}
|
|
|
|
static struct ignore_entry ignore_ids[] = {
|
|
{ } /* Terminating entry */
|
|
};
|
|
|
|
#undef UNUSUAL_DEV
|
|
|
|
|
|
/* Return an error if a device is in the ignore_ids list */
|
|
int usb_usual_ignore_device(struct usb_interface *intf)
|
|
{
|
|
struct usb_device *udev;
|
|
unsigned vid, pid, bcd;
|
|
struct ignore_entry *p;
|
|
|
|
udev = interface_to_usbdev(intf);
|
|
vid = le16_to_cpu(udev->descriptor.idVendor);
|
|
pid = le16_to_cpu(udev->descriptor.idProduct);
|
|
bcd = le16_to_cpu(udev->descriptor.bcdDevice);
|
|
|
|
for (p = ignore_ids; p->vid; ++p) {
|
|
if (p->vid == vid && p->pid == pid &&
|
|
p->bcdmin <= bcd && p->bcdmax >= bcd)
|
|
return -ENXIO;
|
|
}
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(usb_usual_ignore_device);
|