UMS for the Gigabeat S. Bootloader USB mode. Has a couple quirks 1) First plug has problems if cold. Replug if it doesn't connect or not at high speed 2) Linux doesn't like the odd bootable flag value used in the partitions so it won't mount but Windows works. Fix minor OTG driver bugs and clean up device memory handling. Generic name for ARC controller driver.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17154 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 33 insertions, 23 deletions

diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index 5bd18fb..084b889 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -5,7 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:  $
+ * $Id$
  *
  * Copyright (C) 2007 by Bj�rn Stenberg
  *
@@ -244,7 +244,7 @@ static struct usb_class_driver drivers[USB_NUM_DRIVERS] =
 static void usb_core_control_request_handler(struct usb_ctrlrequest* req);
 static int ack_control(struct usb_ctrlrequest* req);
 
-static unsigned char response_data[256] NOCACHEBSS_ATTR;
+static unsigned char response_data[256] USBDEVBSS_ATTR;
 
 static struct usb_transfer_completion_event_data events[NUM_ENDPOINTS];
 
@@ -558,9 +558,7 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
                                          sizeof(struct usb_string_descriptor*)))
                             {
                                 size = usb_strings[index]->bLength;
-                                memcpy(&response_data[0],usb_strings[index],
-                                       size);
-                                ptr = response_data;
+                                ptr = usb_strings[index];
                             }
                             else {
                                 logf("bad string id %d", index);
@@ -580,9 +578,13 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
                     }
 
                     if (ptr) {
-                        unsigned char *uncached = (void*)UNCACHED_ADDR(ptr);
                         length = MIN(size, length);
-                        if(usb_drv_send(EP_CONTROL, uncached, length)!=0)
+
+                        if (ptr != response_data) {
+                            memcpy(response_data, ptr, length);
+                        }
+
+                        if(usb_drv_send(EP_CONTROL, response_data, length)!=0)
                             break;
                     }
                     ack_control(req);
diff --git a/firmware/usbstack/usb_serial.c b/firmware/usbstack/usb_serial.c
index 55b76ad..f390354 100644
--- a/firmware/usbstack/usb_serial.c
+++ b/firmware/usbstack/usb_serial.c
@@ -5,7 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:  $
+ * $Id$
  *
  * Copyright (C) 2007 by Christian Gmeiner
  *
@@ -53,11 +53,10 @@ struct usb_endpoint_descriptor __attribute__((aligned(2))) endpoint_descriptor =
 };
 
 #define BUFFER_SIZE 512 /* Max 16k because of controller limitations */
-static unsigned char _send_buffer[BUFFER_SIZE] __attribute__((aligned(32)));
-static unsigned char* send_buffer;
-
-static unsigned char _receive_buffer[512] __attribute__((aligned(32)));
-static unsigned char* receive_buffer;
+static unsigned char send_buffer[BUFFER_SIZE]
+    USBDEVBSS_ATTR __attribute__((aligned(32)));
+static unsigned char receive_buffer[512]
+    USBDEVBSS_ATTR __attribute__((aligned(32)));
 static bool busy_sending = false;
 static int buffer_start;
 static int buffer_length;
@@ -66,7 +65,7 @@ static bool active = false;
 static int usb_endpoint;
 static int usb_interface;
 
-static struct mutex sendlock;
+static struct mutex sendlock SHAREDBSS_ATTR;
 
 static void sendout(void)
 {
@@ -111,7 +110,7 @@ void usb_serial_init_connection(int interface,int endpoint)
     usb_endpoint = endpoint;
 
     /* prime rx endpoint */
-    usb_drv_recv(usb_endpoint, receive_buffer, sizeof _receive_buffer);
+    usb_drv_recv(usb_endpoint, receive_buffer, sizeof receive_buffer);
 
     /* we come here too after a bus reset, so reset some data */
     mutex_lock(&sendlock);
@@ -127,8 +126,6 @@ void usb_serial_init_connection(int interface,int endpoint)
 void usb_serial_init(void)
 {
     logf("serial: init");
-    send_buffer = (void*)UNCACHED_ADDR(&_send_buffer);
-    receive_buffer = (void*)UNCACHED_ADDR(&_receive_buffer);
     busy_sending = false;
     buffer_start = 0;
     buffer_length = 0;
@@ -190,7 +187,7 @@ void usb_serial_transfer_complete(bool in, int status, int length)
         case false:
             logf("serial: %s", receive_buffer);
             /* Data received. TODO : Do something with it ? */
-            usb_drv_recv(usb_endpoint, receive_buffer, sizeof _receive_buffer);
+            usb_drv_recv(usb_endpoint, receive_buffer, sizeof receive_buffer);
             break;
 
         case true:
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index dfcd51b..9e9e356 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -5,7 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id:  $
+ * $Id$
  *
  * Copyright (C) 2007 by Björn Stenberg
  *
@@ -352,9 +352,6 @@ int usb_storage_get_config_descriptor(unsigned char *dest,int max_packet_size,
 
 void usb_storage_init_connection(int interface,int endpoint)
 {
-    size_t bufsize;
-    unsigned char * audio_buffer;
-
     usb_interface = interface;
     usb_endpoint = endpoint;
 
@@ -362,10 +359,20 @@ void usb_storage_init_connection(int interface,int endpoint)
     /* prime rx endpoint. We only need room for commands */
     state = WAITING_FOR_COMMAND;
 
+#if CONFIG_CPU == IMX31L
+    static unsigned char _transfer_buffer[BUFFER_SIZE*2]
+        USBDEVBSS_ATTR __attribute__((aligned(32)));
+    tb.transfer_buffer = (void *)_transfer_buffer;
+#else
     /* TODO : check if bufsize is at least 32K ? */
+    size_t bufsize;
+    unsigned char * audio_buffer;
+
     audio_buffer = audio_get_buffer(false,&bufsize);
     tb.transfer_buffer =
         (void *)UNCACHED_ADDR((unsigned int)(audio_buffer + 31) & 0xffffffe0);
+    invalidate_icache();
+#endif
     usb_drv_recv(usb_endpoint, tb.transfer_buffer, 1024);
 }
 
@@ -519,7 +526,7 @@ bool usb_storage_control_request(struct usb_ctrlrequest* req)
             *tb.max_lun = NUM_VOLUMES - 1;
 #endif
             logf("ums: getmaxlun");
-            usb_drv_send(EP_CONTROL, UNCACHED_ADDR(tb.max_lun), 1);
+            usb_drv_send(EP_CONTROL, tb.max_lun, 1);
             usb_drv_recv(EP_CONTROL, NULL, 0); /* ack */
             handled = true;
             break;
@@ -1042,7 +1049,11 @@ static void identify2inquiry(int lun)
 #endif
     /* Mac OSX 10.5 doesn't like this driver if DEVICE_REMOVABLE is not set.
        TODO : this can probably be solved by providing caching mode page */
+#ifdef TOSHIBA_GIGABEAT_S
+    tb.inquiry->DeviceTypeModifier = 0;
+#else
     tb.inquiry->DeviceTypeModifier = DEVICE_REMOVABLE;
+#endif
 }
 
 #endif /* USB_STORAGE */