Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[platform/kernel/u-boot.git] / common / usb_storage.c

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 69ecf18..94f659f 100644 (file)
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -52,14 +52,12 @@
 
 #include <common.h>
 #include <command.h>
+#include <asm/byteorder.h>
 #include <asm/processor.h>
 
-
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#include <part.h>
 #include <usb.h>
 
-#ifdef CONFIG_USB_STORAGE
-
 #undef USB_STOR_DEBUG
 #undef BBB_COMDAT_TRACE
 #undef BBB_XPORT_TRACE
@@ -168,13 +166,13 @@ static struct us_data usb_stor[USB_MAX_STOR_DEV];
 
 int usb_stor_get_info(struct usb_device *dev, struct us_data *us, block_dev_desc_t *dev_desc);
 int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,struct us_data *ss);
-unsigned long usb_stor_read(int device, unsigned long blknr, unsigned long blkcnt, unsigned long *buffer);
+unsigned long usb_stor_read(int device, unsigned long blknr, unsigned long blkcnt, void *buffer);
 struct usb_device * usb_get_dev_index(int index);
 void uhci_show_temp_int_td(void);
 
 block_dev_desc_t *usb_stor_get_dev(int index)
 {
-       return &usb_dev_desc[index];
+       return (index < USB_MAX_STOR_DEV) ? &usb_dev_desc[index] : NULL;
 }
 
 
@@ -187,17 +185,20 @@ void usb_show_progress(void)
  * show info on storage devices; 'usb start/init' must be invoked earlier
  * as we only retrieve structures populated during devices initialization
  */
-void usb_stor_info(void)
+int usb_stor_info(void)
 {
        int i;
 
-       if (usb_max_devs > 0)
+       if (usb_max_devs > 0) {
                for (i = 0; i < usb_max_devs; i++) {
                        printf ("  Device %d: ", i);
                        dev_print(&usb_dev_desc[i]);
                }
-       else
-               printf("No storage devices, perhaps not 'usb start'ed..?\n");
+               return 0;
+       }
+
+       printf("No storage devices, perhaps not 'usb start'ed..?\n");
+       return 1;
 }
 
 /*********************************************************************************
@@ -470,9 +471,9 @@ int usb_stor_BBB_comdat(ccb *srb, struct us_data *us)
        /* always OUT to the ep */
        pipe = usb_sndbulkpipe(us->pusb_dev, us->ep_out);
 
-       cbw.dCBWSignature = swap_32(CBWSIGNATURE);
-       cbw.dCBWTag = swap_32(CBWTag++);
-       cbw.dCBWDataTransferLength = swap_32(srb->datalen);
+       cbw.dCBWSignature = cpu_to_le32(CBWSIGNATURE);
+       cbw.dCBWTag = cpu_to_le32(CBWTag++);
+       cbw.dCBWDataTransferLength = cpu_to_le32(srb->datalen);
        cbw.bCBWFlags = (dir_in? CBWFLAGS_IN : CBWFLAGS_OUT);
        cbw.bCBWLUN = srb->lun;
        cbw.bCDBLength = srb->cmdlen;
@@ -688,14 +689,14 @@ int usb_stor_BBB_transport(ccb *srb, struct us_data *us)
        printf("\n");
 #endif
        /* misuse pipe to get the residue */
-       pipe = swap_32(csw.dCSWDataResidue);
+       pipe = le32_to_cpu(csw.dCSWDataResidue);
        if (pipe == 0 && srb->datalen != 0 && srb->datalen - data_actlen != 0)
                pipe = srb->datalen - data_actlen;
-       if (CSWSIGNATURE != swap_32(csw.dCSWSignature)) {
+       if (CSWSIGNATURE != le32_to_cpu(csw.dCSWSignature)) {
                USB_STOR_PRINTF("!CSWSIGNATURE\n");
                usb_stor_BBB_reset(us);
                return USB_STOR_TRANSPORT_FAILED;
-       } else if ((CBWTag - 1) != swap_32(csw.dCSWTag)) {
+       } else if ((CBWTag - 1) != le32_to_cpu(csw.dCSWTag)) {
                USB_STOR_PRINTF("!Tag\n");
                usb_stor_BBB_reset(us);
                return USB_STOR_TRANSPORT_FAILED;
@@ -726,7 +727,7 @@ int usb_stor_CB_transport(ccb *srb, struct us_data *us)
        ccb reqsrb;
        int retry,notready;
 
-       psrb=&reqsrb;
+       psrb = &reqsrb;
        status=USB_STOR_TRANSPORT_GOOD;
        retry=0;
        notready=0;
@@ -771,7 +772,7 @@ do_retry:
        psrb->cmd[1]=srb->lun<<5;
        psrb->cmd[4]=18;
        psrb->datalen=18;
-       psrb->pdata=&srb->sense_buf[0];
+       psrb->pdata = &srb->sense_buf[0];
        psrb->cmdlen=12;
        /* issue the command */
        result=usb_stor_CB_comdat(psrb,us);
@@ -853,7 +854,7 @@ static int usb_request_sense(ccb *srb,struct us_data *ss)
        srb->cmd[1]=srb->lun<<5;
        srb->cmd[4]=18;
        srb->datalen=18;
-       srb->pdata=&srb->sense_buf[0];
+       srb->pdata = &srb->sense_buf[0];
        srb->cmdlen=12;
        ss->transport(srb,ss);
        USB_STOR_PRINTF("Request Sense returned %02X %02X %02X\n",srb->sense_buf[2],srb->sense_buf[12],srb->sense_buf[13]);
@@ -932,15 +933,15 @@ static void usb_bin_fixup(struct usb_device_descriptor descriptor,
        const unsigned char max_vendor_len = 40;
        const unsigned char max_product_len = 20;
        if (descriptor.idVendor == 0x0424 && descriptor.idProduct == 0x223a) {
-               strncpy(vendor, "SMSC", max_vendor_len);
-               strncpy(product, "Flash Media Cntrller", max_product_len);
+               strncpy ((char *)vendor, "SMSC", max_vendor_len);
+               strncpy ((char *)product, "Flash Media Cntrller", max_product_len);
        }
 }
 #endif /* CONFIG_USB_BIN_FIXUP */
 
 #define USB_MAX_READ_BLK 20
 
-unsigned long usb_stor_read(int device, unsigned long blknr, unsigned long blkcnt, unsigned long *buffer)
+unsigned long usb_stor_read(int device, unsigned long blknr, unsigned long blkcnt, void *buffer)
 {
        unsigned long start,blks, buf_addr;
        unsigned short smallblks;
@@ -1194,7 +1195,7 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
        dev_desc->product[16] = 0;
        dev_desc->revision[4] = 0;
 #ifdef CONFIG_USB_BIN_FIXUP
-       usb_bin_fixup(dev->descriptor, dev_desc->vendor, dev_desc->product);
+       usb_bin_fixup(dev->descriptor, (uchar *)dev_desc->vendor, (uchar *)dev_desc->product);
 #endif /* CONFIG_USB_BIN_FIXUP */
        USB_STOR_PRINTF("ISO Vers %X, Response Data %X\n",usb_stor_buf[2],usb_stor_buf[3]);
        if(usb_test_unit_ready(pccb,ss)) {
@@ -1218,18 +1219,9 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
        if(cap[0]>(0x200000 * 10)) /* greater than 10 GByte */
                cap[0]>>=16;
 #endif
-#ifdef LITTLEENDIAN
-       cap[0] = ((unsigned long)(
-               (((unsigned long)(cap[0]) & (unsigned long)0x000000ffUL) << 24) |
-               (((unsigned long)(cap[0]) & (unsigned long)0x0000ff00UL) <<  8) |
-               (((unsigned long)(cap[0]) & (unsigned long)0x00ff0000UL) >>  8) |
-               (((unsigned long)(cap[0]) & (unsigned long)0xff000000UL) >> 24) ));
-       cap[1] = ((unsigned long)(
-               (((unsigned long)(cap[1]) & (unsigned long)0x000000ffUL) << 24) |
-               (((unsigned long)(cap[1]) & (unsigned long)0x0000ff00UL) <<  8) |
-               (((unsigned long)(cap[1]) & (unsigned long)0x00ff0000UL) >>  8) |
-               (((unsigned long)(cap[1]) & (unsigned long)0xff000000UL) >> 24) ));
-#endif
+       cap[0] = cpu_to_be32(cap[0]);
+       cap[1] = cpu_to_be32(cap[1]);
+
        /* this assumes bigendian! */
        cap[0] += 1;
        capacity = &cap[0];
@@ -1246,6 +1238,3 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
        USB_STOR_PRINTF("partype: %d\n",dev_desc->part_type);
        return 1;
 }
-
-#endif /* CONFIG_USB_STORAGE */
-#endif /* CFG_CMD_USB */