1 files changed, 127 insertions, 20 deletions

diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index 531ae5c5abf..ab5f9f37575 100644
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -41,6 +41,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 
 #include <scsi/scsi.h>
@@ -51,7 +52,53 @@
 #include "transport.h"
 #include "protocol.h"
 #include "debug.h"
-#include "sddr09.h"
+
+MODULE_DESCRIPTION("Driver for SanDisk SDDR-09 SmartMedia reader");
+MODULE_AUTHOR("Andries Brouwer <aeb@cwi.nl>, Robert Baruch <autophile@starband.net>");
+MODULE_LICENSE("GPL");
+
+static int usb_stor_sddr09_dpcm_init(struct us_data *us);
+static int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us);
+static int usb_stor_sddr09_init(struct us_data *us);
+
+
+/*
+ * 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 sddr09_usb_ids[] = {
+#       include "unusual_sddr09.h"
+        { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(usb, sddr09_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 sddr09_unusual_dev_list[] = {
+#       include "unusual_sddr09.h"
+        { }             /* Terminating entry */
+};
+
+#undef UNUSUAL_DEV
 
 
 #define short_pack(lsb,msb) ( ((u16)(lsb)) | ( ((u16)(msb))<<8 ) )
@@ -723,7 +770,7 @@ sddr09_read_data(struct us_data *us,
         len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;
         buffer = kmalloc(len, GFP_NOIO);
         if (buffer == NULL) {
-                printk("sddr09_read_data: Out of memory\n");
+                printk(KERN_WARNING "sddr09_read_data: Out of memory\n");
                 return -ENOMEM;
         }
 
@@ -838,7 +885,8 @@ sddr09_write_lba(struct us_data *us, unsigned int lba,
         if (pba == UNDEF) {
                 pba = sddr09_find_unused_pba(info, lba);
                 if (!pba) {
-                        printk("sddr09_write_lba: Out of unused blocks\n");
+                        printk(KERN_WARNING
+                               "sddr09_write_lba: Out of unused blocks\n");
                         return -ENOSPC;
                 }
                 info->pba_to_lba[pba] = lba;
@@ -849,7 +897,7 @@ sddr09_write_lba(struct us_data *us, unsigned int lba,
         if (pba == 1) {
                 /* Maybe it is impossible to write to PBA 1.
                    Fake success, but don't do anything. */
-                printk("sddr09: avoid writing to pba 1\n");
+                printk(KERN_WARNING "sddr09: avoid writing to pba 1\n");
                 return 0;
         }
 
@@ -954,7 +1002,7 @@ sddr09_write_data(struct us_data *us,
         blocklen = (pagelen << info->blockshift);
         blockbuffer = kmalloc(blocklen, GFP_NOIO);
         if (!blockbuffer) {
-                printk("sddr09_write_data: Out of memory\n");
+                printk(KERN_WARNING "sddr09_write_data: Out of memory\n");
                 return -ENOMEM;
         }
 
@@ -965,7 +1013,7 @@ sddr09_write_data(struct us_data *us,
         len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;
         buffer = kmalloc(len, GFP_NOIO);
         if (buffer == NULL) {
-                printk("sddr09_write_data: Out of memory\n");
+                printk(KERN_WARNING "sddr09_write_data: Out of memory\n");
                 kfree(blockbuffer);
                 return -ENOMEM;
         }
@@ -1112,7 +1160,7 @@ sddr09_get_cardinfo(struct us_data *us, unsigned char flags) {
 
         if (result) {
                 US_DEBUGP("Result of read_deviceID is %d\n", result);
-                printk("sddr09: could not read card info\n");
+                printk(KERN_WARNING "sddr09: could not read card info\n");
                 return NULL;
         }
 
@@ -1153,7 +1201,7 @@ sddr09_get_cardinfo(struct us_data *us, unsigned char flags) {
                 sprintf(blurbtxt + strlen(blurbtxt),
                         ", WP");
 
-        printk("%s\n", blurbtxt);
+        printk(KERN_WARNING "%s\n", blurbtxt);
 
         return cardinfo;
 }
@@ -1184,7 +1232,7 @@ sddr09_read_map(struct us_data *us) {
         alloc_len = (alloc_blocks << CONTROL_SHIFT);
         buffer = kmalloc(alloc_len, GFP_NOIO);
         if (buffer == NULL) {
-                printk("sddr09_read_map: out of memory\n");
+                printk(KERN_WARNING "sddr09_read_map: out of memory\n");
                 result = -1;
                 goto done;
         }
@@ -1198,7 +1246,7 @@ sddr09_read_map(struct us_data *us) {
         info->pba_to_lba = kmalloc(numblocks*sizeof(int), GFP_NOIO);
 
         if (info->lba_to_pba == NULL || info->pba_to_lba == NULL) {
-                printk("sddr09_read_map: out of memory\n");
+                printk(KERN_WARNING "sddr09_read_map: out of memory\n");
                 result = -1;
                 goto done;
         }
@@ -1238,7 +1286,8 @@ sddr09_read_map(struct us_data *us) {
                         if (ptr[j] != 0)
                                 goto nonz;
                 info->pba_to_lba[i] = UNUSABLE;
-                printk("sddr09: PBA %d has no logical mapping\n", i);
+                printk(KERN_WARNING "sddr09: PBA %d has no logical mapping\n",
+                       i);
                 continue;
 
         nonz:
@@ -1251,7 +1300,8 @@ sddr09_read_map(struct us_data *us) {
         nonff:
                 /* normal PBAs start with six FFs */
                 if (j < 6) {
-                        printk("sddr09: PBA %d has no logical mapping: "
+                        printk(KERN_WARNING
+                               "sddr09: PBA %d has no logical mapping: "
                                "reserved area = %02X%02X%02X%02X "
                                "data status %02X block status %02X\n",
                                i, ptr[0], ptr[1], ptr[2], ptr[3],
@@ -1261,7 +1311,8 @@ sddr09_read_map(struct us_data *us) {
                 }
 
                 if ((ptr[6] >> 4) != 0x01) {
-                        printk("sddr09: PBA %d has invalid address field "
+                        printk(KERN_WARNING
+                               "sddr09: PBA %d has invalid address field "
                                "%02X%02X/%02X%02X\n",
                                i, ptr[6], ptr[7], ptr[11], ptr[12]);
                         info->pba_to_lba[i] = UNUSABLE;
@@ -1270,7 +1321,8 @@ sddr09_read_map(struct us_data *us) {
 
                 /* check even parity */
                 if (parity[ptr[6] ^ ptr[7]]) {
-                        printk("sddr09: Bad parity in LBA for block %d"
+                        printk(KERN_WARNING
+                               "sddr09: Bad parity in LBA for block %d"
                                " (%02X %02X)\n", i, ptr[6], ptr[7]);
                         info->pba_to_lba[i] = UNUSABLE;
                         continue;
@@ -1289,7 +1341,8 @@ sddr09_read_map(struct us_data *us) {
                  */
 
                 if (lba >= 1000) {
-                        printk("sddr09: Bad low LBA %d for block %d\n",
+                        printk(KERN_WARNING
+                               "sddr09: Bad low LBA %d for block %d\n",
                                lba, i);
                         goto possibly_erase;
                 }
@@ -1297,7 +1350,8 @@ sddr09_read_map(struct us_data *us) {
                 lba += 1000*(i/0x400);
 
                 if (info->lba_to_pba[lba] != UNDEF) {
-                        printk("sddr09: LBA %d seen for PBA %d and %d\n",
+                        printk(KERN_WARNING
+                               "sddr09: LBA %d seen for PBA %d and %d\n",
                                lba, info->lba_to_pba[lba], i);
                         goto possibly_erase;
                 }
@@ -1399,7 +1453,7 @@ sddr09_common_init(struct us_data *us) {
  * unusual devices list but called from here then LUN 0 of the combo reader
  * is not recognized. But I do not know what precisely these calls do.
  */
-int
+static int
 usb_stor_sddr09_dpcm_init(struct us_data *us) {
         int result;
         unsigned char *data = us->iobuf;
@@ -1449,7 +1503,7 @@ usb_stor_sddr09_dpcm_init(struct us_data *us) {
 /*
  * Transport for the Microtech DPCM-USB
  */
-int dpcm_transport(struct scsi_cmnd *srb, struct us_data *us)
+static int dpcm_transport(struct scsi_cmnd *srb, struct us_data *us)
 {
         int ret;
 
@@ -1491,7 +1545,7 @@ int dpcm_transport(struct scsi_cmnd *srb, struct us_data *us)
 /*
  * Transport for the Sandisk SDDR-09
  */
-int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us)
+static int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us)
 {
         static unsigned char sensekey = 0, sensecode = 0;
         static unsigned char havefakesense = 0;
@@ -1690,7 +1744,60 @@ int sddr09_transport(struct scsi_cmnd *srb, struct us_data *us)
 /*
  * Initialization routine for the sddr09 subdriver
  */
-int
+static int
 usb_stor_sddr09_init(struct us_data *us) {
         return sddr09_common_init(us);
 }
+
+static int sddr09_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 - sddr09_usb_ids) + sddr09_unusual_dev_list);
+        if (result)
+                return result;
+
+        if (us->protocol == US_PR_DPCM_USB) {
+                us->transport_name = "Control/Bulk-EUSB/SDDR09";
+                us->transport = dpcm_transport;
+                us->transport_reset = usb_stor_CB_reset;
+                us->max_lun = 1;
+        } else {
+                us->transport_name = "EUSB/SDDR09";
+                us->transport = sddr09_transport;
+                us->transport_reset = usb_stor_CB_reset;
+                us->max_lun = 0;
+        }
+
+        result = usb_stor_probe2(us);
+        return result;
+}
+
+static struct usb_driver sddr09_driver = {
+        .name =         "ums-sddr09",
+        .probe =        sddr09_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 =     sddr09_usb_ids,
+        .soft_unbind =  1,
+};
+
+static int __init sddr09_init(void)
+{
+        return usb_register(&sddr09_driver);
+}
+
+static void __exit sddr09_exit(void)
+{
+        usb_deregister(&sddr09_driver);
+}
+
+module_init(sddr09_init);
+module_exit(sddr09_exit);