|
|
@@ -46,6 +46,7 @@
|
|
|
*/
|
|
|
|
|
|
#include <linux/errno.h>
|
|
|
+#include <linux/module.h>
|
|
|
#include <linux/slab.h>
|
|
|
|
|
|
#include <scsi/scsi.h>
|
|
|
@@ -55,9 +56,57 @@
|
|
|
#include "transport.h"
|
|
|
#include "protocol.h"
|
|
|
#include "debug.h"
|
|
|
-#include "jumpshot.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) }
|
|
|
+
|
|
|
+struct usb_device_id jumpshot_usb_ids[] = {
|
|
|
+# include "unusual_jumpshot.h"
|
|
|
+ { } /* Terminating entry */
|
|
|
+};
|
|
|
+MODULE_DEVICE_TABLE(usb, jumpshot_usb_ids);
|
|
|
+
|
|
|
+#undef UNUSUAL_DEV
|
|
|
+
|
|
|
+/*
|
|
|
+ * The flags table
|
|
|
+ */
|
|
|
+#define UNUSUAL_DEV(idVendor, idProduct, bcdDeviceMin, bcdDeviceMax, \
|
|
|
+ vendor_name, product_name, use_protocol, use_transport, \
|
|
|
+ init_function, Flags) \
|
|
|
+{ \
|
|
|
+ .vendorName = vendor_name, \
|
|
|
+ .productName = product_name, \
|
|
|
+ .useProtocol = use_protocol, \
|
|
|
+ .useTransport = use_transport, \
|
|
|
+ .initFunction = init_function, \
|
|
|
+}
|
|
|
+
|
|
|
+static struct us_unusual_dev jumpshot_unusual_dev_list[] = {
|
|
|
+# include "unusual_jumpshot.h"
|
|
|
+ { } /* Terminating entry */
|
|
|
+};
|
|
|
+
|
|
|
+#undef UNUSUAL_DEV
|
|
|
+
|
|
|
+
|
|
|
+struct jumpshot_info {
|
|
|
+ unsigned long sectors; /* total sector count */
|
|
|
+ unsigned long ssize; /* sector size in bytes */
|
|
|
+
|
|
|
+ /* the following aren't used yet */
|
|
|
+ unsigned char sense_key;
|
|
|
+ unsigned long sense_asc; /* additional sense code */
|
|
|
+ unsigned long sense_ascq; /* additional sense code qualifier */
|
|
|
+};
|
|
|
+
|
|
|
static inline int jumpshot_bulk_read(struct us_data *us,
|
|
|
unsigned char *data,
|
|
|
unsigned int len)
|
|
|
@@ -429,7 +478,7 @@ static void jumpshot_info_destructor(void *extra)
|
|
|
|
|
|
// Transport for the Lexar 'Jumpshot'
|
|
|
//
|
|
|
-int jumpshot_transport(struct scsi_cmnd * srb, struct us_data *us)
|
|
|
+static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
|
|
|
{
|
|
|
struct jumpshot_info *info;
|
|
|
int rc;
|
|
|
@@ -592,3 +641,49 @@ int jumpshot_transport(struct scsi_cmnd * srb, struct us_data *us)
|
|
|
info->sense_ascq = 0x00;
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
}
|
|
|
+
|
|
|
+static int jumpshot_probe(struct usb_interface *intf,
|
|
|
+ const struct usb_device_id *id)
|
|
|
+{
|
|
|
+ struct us_data *us;
|
|
|
+ int result;
|
|
|
+
|
|
|
+ result = usb_stor_probe1(&us, intf, id,
|
|
|
+ (id - jumpshot_usb_ids) + jumpshot_unusual_dev_list);
|
|
|
+ if (result)
|
|
|
+ return result;
|
|
|
+
|
|
|
+ us->transport_name = "Lexar Jumpshot Control/Bulk";
|
|
|
+ us->transport = jumpshot_transport;
|
|
|
+ us->transport_reset = usb_stor_Bulk_reset;
|
|
|
+ us->max_lun = 1;
|
|
|
+
|
|
|
+ result = usb_stor_probe2(us);
|
|
|
+ return result;
|
|
|
+}
|
|
|
+
|
|
|
+static struct usb_driver jumpshot_driver = {
|
|
|
+ .name = "ums-jumpshot",
|
|
|
+ .probe = jumpshot_probe,
|
|
|
+ .disconnect = usb_stor_disconnect,
|
|
|
+ .suspend = usb_stor_suspend,
|
|
|
+ .resume = usb_stor_resume,
|
|
|
+ .reset_resume = usb_stor_reset_resume,
|
|
|
+ .pre_reset = usb_stor_pre_reset,
|
|
|
+ .post_reset = usb_stor_post_reset,
|
|
|
+ .id_table = jumpshot_usb_ids,
|
|
|
+ .soft_unbind = 1,
|
|
|
+};
|
|
|
+
|
|
|
+static int __init jumpshot_init(void)
|
|
|
+{
|
|
|
+ return usb_register(&jumpshot_driver);
|
|
|
+}
|
|
|
+
|
|
|
+static void __exit jumpshot_exit(void)
|
|
|
+{
|
|
|
+ usb_deregister(&jumpshot_driver);
|
|
|
+}
|
|
|
+
|
|
|
+module_init(jumpshot_init);
|
|
|
+module_exit(jumpshot_exit);
|
Alan Stern