6 files changed, 139 insertions, 158 deletions

diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index fed33ca4d0..2b3452db25 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -95,8 +95,7 @@ enum {
     USB_DRIVER_CHARGING_ONLY,
     USB_NUM_DRIVERS
 };
-#endif
-#ifdef HAVE_USBSTACK
+
 struct usb_transfer_completion_event_data
 {
     unsigned char endpoint;
diff --git a/firmware/usb.c b/firmware/usb.c
index fa7eef40d2..3d94ccfce7 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -42,7 +42,7 @@
 #ifdef HAVE_USBSTACK
 #include "usb_core.h"
 #endif
-#include "logf.h"  
+#include "logf.h"
 #include "screendump.h"
 
 /* Conditions under which we want the entire driver */
@@ -162,7 +162,7 @@ void usb_signal_transfer_completion(
 static inline void usb_slave_mode(bool on)
 {
     int rc;
-    
+
     if(on)
     {
         DEBUGF("Entering USB slave mode\n");
@@ -180,13 +180,13 @@ static inline void usb_slave_mode(bool on)
 
         /* Let the ISDx00 settle */
         sleep(HZ*1);
-        
+
         usb_enable(false);
 
         rc = storage_init();
         if(rc)
             panicf("storage: %d",rc);
-    
+
         rc = disk_mount_all();
         if (rc <= 0) /* no partition */
             panicf("mount: %d",rc);
@@ -272,10 +272,10 @@ static void usb_thread(void)
 #ifdef HAVE_USBSTACK
 #ifdef USB_STORAGE
                     usb_core_enable_driver(USB_DRIVER_MASS_STORAGE, false);
-#endif                
+#endif
 #ifdef USB_CHARGING_ONLY
                     usb_core_enable_driver(USB_DRIVER_CHARGING_ONLY, true);
-#endif                
+#endif
                     usb_attach();
 #endif
                     break;
@@ -290,10 +290,10 @@ static void usb_thread(void)
 #endif
 #ifdef USB_STORAGE
                 usb_core_enable_driver(USB_DRIVER_MASS_STORAGE, true);
-#endif                
+#endif
 #ifdef USB_CHARGING_ONLY
                 usb_core_enable_driver(USB_DRIVER_CHARGING_ONLY, false);
-#endif                
+#endif
 
                 /* Check any drivers enabled at this point for exclusive storage
                  * access requirements. */
@@ -493,7 +493,7 @@ static void usb_tick(void)
 #endif /* USB_FIREWIRE_HANDLING */
 
         current_status = usb_detect();
-    
+
         /* Only report when the status has changed */
         if(current_status != last_usb_status)
         {
@@ -561,7 +561,7 @@ void usb_init(void)
     usb_enable(false);
 
     queue_init(&usb_queue, true);
-    
+
     usb_thread_entry = create_thread(usb_thread, usb_stack,
                        sizeof(usb_stack), 0, usb_thread_name
                        IF_PRIO(, PRIORITY_SYSTEM) IF_COP(, CPU));
diff --git a/firmware/usbstack/usb_charging_only.c b/firmware/usbstack/usb_charging_only.c
index 145d0f684c..3cbc4c3e96 100644
--- a/firmware/usbstack/usb_charging_only.c
+++ b/firmware/usbstack/usb_charging_only.c
@@ -46,7 +46,6 @@ static struct usb_interface_descriptor __attribute__((aligned(2)))
     .iInterface         = 0
 };
 
-
 static int usb_interface;
 
 int usb_charging_only_request_endpoints(struct usb_class_driver *drv)
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index 3f67407c72..f6373b8945 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -88,7 +88,7 @@ static const struct usb_device_descriptor __attribute__((aligned(2)))
 } ;
 
 static struct usb_config_descriptor __attribute__((aligned(2)))
-                                    config_descriptor = 
+                                    config_descriptor =
 {
     .bLength             = sizeof(struct usb_config_descriptor),
     .bDescriptorType     = USB_DT_CONFIG,
@@ -100,7 +100,6 @@ static struct usb_config_descriptor __attribute__((aligned(2)))
     .bMaxPower           = (USB_MAX_CURRENT+1) / 2, /* In 2mA units */
 };
 
-
 static const struct usb_qualifier_descriptor __attribute__((aligned(2)))
                                              qualifier_descriptor =
 {
@@ -242,7 +241,6 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req);
 
 static unsigned char response_data[256] USB_DEVBSS_ATTR;
 
-
 static short hex[16] = {'0','1','2','3','4','5','6','7',
                         '8','9','A','B','C','D','E','F'};
 #ifdef IPOD_ARCH
@@ -357,15 +355,15 @@ void usb_core_exit(void)
     for(i=0;i<USB_NUM_DRIVERS;i++) {
         if(drivers[i].enabled && drivers[i].disconnect != NULL)
         {
-            drivers[i].disconnect ();
+            drivers[i].disconnect();
             drivers[i].enabled = false;
         }
     }
 
     if (initialized) {
         usb_drv_exit();
+        initialized = false;
     }
-    initialized = false;
     usb_state = DEFAULT;
     logf("usb_core_exit() finished");
 }
@@ -373,6 +371,7 @@ void usb_core_exit(void)
 void usb_core_handle_transfer_completion(
               struct usb_transfer_completion_event_data* event)
 {
+    completion_handler_t handler;
     int ep = event->endpoint;
 
     switch(ep) {
@@ -382,9 +381,9 @@ void usb_core_handle_transfer_completion(
                                     (struct usb_ctrlrequest*)event->data);
             break;
         default:
-            if(ep_data[ep].completion_handler[event->dir>>7] != NULL)
-                ep_data[ep].completion_handler[event->dir>>7](ep,event->dir,
-                                              event->status,event->length);
+            handler = ep_data[ep].completion_handler[event->dir>>7];
+            if(handler != NULL)
+                handler(ep,event->dir,event->status,event->length);
             break;
     }
 }
@@ -403,8 +402,7 @@ bool usb_core_any_exclusive_storage(void)
 {
     int i;
     for(i=0;i<USB_NUM_DRIVERS;i++) {
-        if(drivers[i].enabled &&
-           drivers[i].needs_exclusive_storage)
+        if(drivers[i].enabled && drivers[i].needs_exclusive_storage)
         {
             return true;
         }
@@ -418,8 +416,7 @@ void usb_core_hotswap_event(int volume,bool inserted)
 {
     int i;
     for(i=0;i<USB_NUM_DRIVERS;i++) {
-        if(drivers[i].enabled &&
-           drivers[i].notify_hotswap!=NULL)
+        if(drivers[i].enabled && drivers[i].notify_hotswap!=NULL)
         {
             drivers[i].notify_hotswap(volume,inserted);
         }
@@ -481,7 +478,7 @@ static void allocate_interfaces_and_endpoints(void)
         usb_drv_release_endpoint(i | USB_DIR_IN);
     }
 
-    for(i=0; i < USB_NUM_DRIVERS; i++) {
+    for(i=0;i<USB_NUM_DRIVERS;i++) {
         if(drivers[i].enabled) {
             drivers[i].first_interface = interface;
 
@@ -762,19 +759,23 @@ void usb_core_bus_reset(void)
 /* called by usb_drv_transfer_completed() */
 void usb_core_transfer_complete(int endpoint, int dir, int status,int length)
 {
+    struct usb_transfer_completion_event_data *completion_event;
+
     switch (endpoint) {
         case EP_CONTROL:
             /* already handled */
             break;
 
         default:
-            ep_data[endpoint].completion_event.endpoint=endpoint;
-            ep_data[endpoint].completion_event.dir=dir;
-            ep_data[endpoint].completion_event.data=0;
-            ep_data[endpoint].completion_event.status=status;
-            ep_data[endpoint].completion_event.length=length;
+            completion_event = &ep_data[endpoint].completion_event;
+
+            completion_event->endpoint=endpoint;
+            completion_event->dir=dir;
+            completion_event->data=0;
+            completion_event->status=status;
+            completion_event->length=length;
             /* All other endoints. Let the thread deal with it */
-            usb_signal_transfer_completion(&ep_data[endpoint].completion_event);
+            usb_signal_transfer_completion(completion_event);
             break;
     }
 }
@@ -782,18 +783,21 @@ void usb_core_transfer_complete(int endpoint, int dir, int status,int length)
 /* called by usb_drv_int() */
 void usb_core_control_request(struct usb_ctrlrequest* req)
 {
-    ep_data[0].completion_event.endpoint=0;
-    ep_data[0].completion_event.dir=0;
-    ep_data[0].completion_event.data=(void *)req;
-    ep_data[0].completion_event.status=0;
-    ep_data[0].completion_event.length=0;
+    struct usb_transfer_completion_event_data *completion_event =
+        &ep_data[0].completion_event;
+
+    completion_event->endpoint=0;
+    completion_event->dir=0;
+    completion_event->data=(void *)req;
+    completion_event->status=0;
+    completion_event->length=0;
     logf("ctrl received %ld",current_tick);
-    usb_signal_transfer_completion(&ep_data[0].completion_event);
+    usb_signal_transfer_completion(completion_event);
 }
 
 int usb_core_ack_control(struct usb_ctrlrequest* req)
 {
-    if (req->bRequestType & 0x80)
+    if (req->bRequestType & USB_DIR_IN)
         return usb_drv_recv(EP_CONTROL, NULL, 0);
     else
         return usb_drv_send(EP_CONTROL, NULL, 0);
@@ -802,13 +806,6 @@ int usb_core_ack_control(struct usb_ctrlrequest* req)
 #ifdef HAVE_USB_POWER
 unsigned short usb_allowed_current()
 {
-    if (usb_state == CONFIGURED)
-    {
-        return MAX(USB_MAX_CURRENT, 100);
-    }
-    else
-    {
-        return 100;
-    }
+    return (usb_state == CONFIGURED) ? MAX(USB_MAX_CURRENT, 100) : 100;
 }
 #endif
diff --git a/firmware/usbstack/usb_serial.c b/firmware/usbstack/usb_serial.c
index 520a4b3370..50e4699b28 100644
--- a/firmware/usbstack/usb_serial.c
+++ b/firmware/usbstack/usb_serial.c
@@ -32,7 +32,7 @@
 
 /* serial interface */
 static struct usb_interface_descriptor __attribute__((aligned(2)))
-                                interface_descriptor =
+    interface_descriptor =
 {
     .bLength            = sizeof(struct usb_interface_descriptor),
     .bDescriptorType    = USB_DT_INTERFACE,
@@ -46,7 +46,8 @@ static struct usb_interface_descriptor __attribute__((aligned(2)))
 };
 
 
-static struct usb_endpoint_descriptor __attribute__((aligned(2))) endpoint_descriptor =
+static struct usb_endpoint_descriptor __attribute__((aligned(2)))
+    endpoint_descriptor =
 {
     .bLength          = sizeof(struct usb_endpoint_descriptor),
     .bDescriptorType  = USB_DT_ENDPOINT,
@@ -77,12 +78,10 @@ static int usb_interface;
 int usb_serial_request_endpoints(struct usb_class_driver *drv)
 {
     ep_in = usb_core_request_endpoint(USB_DIR_IN, drv);
-
     if (ep_in < 0)
         return -1;
-    
-    ep_out = usb_core_request_endpoint(USB_DIR_OUT, drv);
 
+    ep_out = usb_core_request_endpoint(USB_DIR_OUT, drv);
     if (ep_out < 0) {
         usb_core_release_endpoint(ep_in);
         return -1;
@@ -97,8 +96,7 @@ int usb_serial_set_first_interface(int interface)
     return interface + 1;
 }
 
-
-int usb_serial_get_config_descriptor(unsigned char *dest,int max_packet_size)
+int usb_serial_get_config_descriptor(unsigned char *dest, int max_packet_size)
 {
     unsigned char *orig_dest = dest;
 
@@ -186,7 +184,7 @@ void usb_serial_send(unsigned char *data,int length)
         return;
     int freestart=(buffer_start+buffer_length+buffer_transitlength)%BUFFER_SIZE;
     if(buffer_start+buffer_transitlength+buffer_length >= BUFFER_SIZE)
-    { 
+    {
         /* current buffer wraps, so new data can't */
         int available_space = BUFFER_SIZE - buffer_length - buffer_transitlength;
         length=MIN(length,available_space);
@@ -245,12 +243,9 @@ void usb_serial_transfer_complete(int ep,int dir, int status, int length)
             }
 
             if(buffer_length>0)
-            {
                 sendout();
-            }
             break;
     }
 }
 
-
 #endif /*USB_SERIAL*/
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index be785da321..d7f542e64f 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -103,7 +103,7 @@
 #define USB_PROT_BULK    0x50            /* bulk only */
 
 static struct usb_interface_descriptor __attribute__((aligned(2)))
-                                       interface_descriptor = 
+                                       interface_descriptor =
 {
     .bLength            = sizeof(struct usb_interface_descriptor),
     .bDescriptorType    = USB_DT_INTERFACE,
@@ -131,7 +131,7 @@ struct inquiry_data {
     unsigned char DeviceType;
     unsigned char DeviceTypeModifier;
     unsigned char Versions;
-    unsigned char Format; 
+    unsigned char Format;
     unsigned char AdditionalLength;
     unsigned char Reserved[2];
     unsigned char Capability;
@@ -309,12 +309,12 @@ static bool check_disk_present(IF_MV_NONVOID(int volume))
 
 void usb_storage_try_release_storage(void)
 {
-    /* Check if there is a connected drive left. If not, 
+    /* Check if there is a connected drive left. If not,
        release excusive access */
     bool canrelease=true;
     int i;
     for(i=0;i<NUM_VOLUMES;i++) {
-        if(ejected[i]==false && locked[i]==true){
+        if(ejected[i]==false && locked[i]==true) {
             canrelease=false;
             break;
         }
@@ -329,7 +329,7 @@ void usb_storage_try_release_storage(void)
 void usb_storage_notify_hotswap(int volume,bool inserted)
 {
     logf("notify %d",inserted);
-    if(inserted  && check_disk_present(IF_MV(volume))) {
+    if(inserted && check_disk_present(IF_MV(volume))) {
         ejected[volume] = false;
     }
     else {
@@ -351,12 +351,12 @@ int usb_storage_request_endpoints(struct usb_class_driver *drv)
 {
     ep_in = usb_core_request_endpoint(USB_DIR_IN, drv);
 
-    if (ep_in < 0)
+    if(ep_in<0)
         return -1;
-    
+
     ep_out = usb_core_request_endpoint(USB_DIR_OUT, drv);
 
-    if (ep_out < 0) {
+    if(ep_out<0) {
         usb_core_release_endpoint(ep_in);
         return -1;
     }
@@ -410,7 +410,7 @@ void usb_storage_init_connection(void)
 
     audio_buffer = audio_get_buffer(false,&bufsize);
     tb.transfer_buffer =
-        (void *)UNCACHED_ADDR((unsigned int)(audio_buffer + 31) & 0xffffffe0);
+        (void *)UNCACHED_ADDR((unsigned int)(audio_buffer+31) & 0xffffffe0);
     cpucache_invalidate();
 #ifdef USB_USE_RAMDISK
     ramdisk_buffer = tb.transfer_buffer + BUFFER_SIZE*2;
@@ -452,7 +452,7 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
             }
             logf("scsi write %d %d", cur_cmd.sector, cur_cmd.count);
             if(status==0) {
-                if((unsigned int)length!=(SECTOR_SIZE*cur_cmd.count)
+                if((unsigned int)length!=(SECTOR_SIZE* cur_cmd.count)
                   && (unsigned int)length!=BUFFER_SIZE) {
                     logf("unexpected length :%d",length);
                 }
@@ -473,14 +473,13 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
                    sending the next bit */
 #ifdef USB_USE_RAMDISK
                 memcpy(ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE,
-                       cur_cmd.data[cur_cmd.data_select],
-                       MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE);
+                        cur_cmd.data[cur_cmd.data_select],
+                        MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE);
 #else
                 int result = storage_write_sectors(cur_cmd.lun,
-                                         cur_cmd.sector,
-                                         MIN(BUFFER_SIZE/SECTOR_SIZE,
-                                             cur_cmd.count),
-                                         cur_cmd.data[cur_cmd.data_select]);
+                        cur_cmd.sector,
+                        MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count),
+                        cur_cmd.data[cur_cmd.data_select]);
                 if(result != 0) {
                     send_csw(UMS_STATUS_FAIL);
                     cur_sense_data.sense_key=SENSE_MEDIUM_ERROR;
@@ -488,8 +487,7 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
                     cur_sense_data.ascq=0;
                     break;
                 }
-#endif                
-
+#endif
                 if(next_count==0) {
                     send_csw(UMS_STATUS_GOOD);
                 }
@@ -499,7 +497,6 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
 
                 cur_cmd.sector = next_sector;
                 cur_cmd.count = next_count;
-
             }
             else {
                 logf("Transfer failed %X",status);
@@ -516,7 +513,7 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
                 logf("IN received in WAITING_FOR_COMMAND");
             }
             //logf("command received");
-            if(letoh32(cbw->signature) == CBW_SIGNATURE){
+            if(letoh32(cbw->signature) == CBW_SIGNATURE) {
                 handle_scsi(cbw);
             }
             else {
@@ -622,7 +619,6 @@ bool usb_storage_control_request(struct usb_ctrlrequest* req, unsigned char* des
             usb_drv_reset_endpoint(ep_in, false);
             usb_drv_reset_endpoint(ep_out, true);
 #endif
-            
             usb_drv_send(EP_CONTROL, NULL, 0);  /* ack */
             handled = true;
             break;
@@ -650,19 +646,18 @@ static void send_and_read_next(void)
     cur_cmd.sector+=(BUFFER_SIZE/SECTOR_SIZE);
     cur_cmd.count-=MIN(cur_cmd.count,BUFFER_SIZE/SECTOR_SIZE);
 
-    if(cur_cmd.count!=0){
+    if(cur_cmd.count!=0) {
         /* already read the next bit, so we can send it out immediately when the
          * current transfer completes.  */
 #ifdef USB_USE_RAMDISK
         memcpy(cur_cmd.data[cur_cmd.data_select],
-               ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE,
-               MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE);
+                ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE,
+                MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE);
 #else
         cur_cmd.last_result = storage_read_sectors(cur_cmd.lun,
-                                           cur_cmd.sector,
-                                           MIN(BUFFER_SIZE/SECTOR_SIZE,
-                                               cur_cmd.count),
-                                           cur_cmd.data[cur_cmd.data_select]);
+                cur_cmd.sector,
+                MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count),
+                cur_cmd.data[cur_cmd.data_select]);
 #endif
     }
 }
@@ -781,7 +776,7 @@ static void handle_scsi(struct command_block_wrapper* cbw)
         }
 
         case SCSI_MODE_SENSE_10: {
-            if(! lun_present) {
+            if(!lun_present) {
                 send_command_failed_result();
                 cur_sense_data.sense_key=SENSE_NOT_READY;
                 cur_sense_data.asc=ASC_MEDIUM_NOT_PRESENT;
@@ -794,7 +789,7 @@ static void handle_scsi(struct command_block_wrapper* cbw)
             switch(page_code) {
                 case 0x3f:
                     tb.ms_data_10->mode_data_length =
-                                   htobe16(sizeof(struct mode_sense_data_10)-2);
+                        htobe16(sizeof(struct mode_sense_data_10)-2);
                     tb.ms_data_10->medium_type = 0;
                     tb.ms_data_10->device_specific = 0;
                     tb.ms_data_10->reserved = 0;
@@ -806,24 +801,24 @@ static void handle_scsi(struct command_block_wrapper* cbw)
                     memset(tb.ms_data_10->block_descriptor.num_blocks,0,8);
 
                     tb.ms_data_10->block_descriptor.num_blocks[4] =
-                               ((block_count/block_size_mult) & 0xff000000)>>24;
+                        ((block_count/block_size_mult) & 0xff000000)>>24;
                     tb.ms_data_10->block_descriptor.num_blocks[5] =
-                               ((block_count/block_size_mult) & 0x00ff0000)>>16;
+                        ((block_count/block_size_mult) & 0x00ff0000)>>16;
                     tb.ms_data_10->block_descriptor.num_blocks[6] =
-                               ((block_count/block_size_mult) & 0x0000ff00)>>8;
+                        ((block_count/block_size_mult) & 0x0000ff00)>>8;
                     tb.ms_data_10->block_descriptor.num_blocks[7] =
-                               ((block_count/block_size_mult) & 0x000000ff);
+                        ((block_count/block_size_mult) & 0x000000ff);
 
                     tb.ms_data_10->block_descriptor.block_size[0] =
-                                ((block_size*block_size_mult) & 0xff000000)>>24;
+                        ((block_size*block_size_mult) & 0xff000000)>>24;
                     tb.ms_data_10->block_descriptor.block_size[1] =
-                                ((block_size*block_size_mult) & 0x00ff0000)>>16;
+                        ((block_size*block_size_mult) & 0x00ff0000)>>16;
                     tb.ms_data_10->block_descriptor.block_size[2] =
-                                ((block_size*block_size_mult) & 0x0000ff00)>>8;
+                        ((block_size*block_size_mult) & 0x0000ff00)>>8;
                     tb.ms_data_10->block_descriptor.block_size[3] =
-                                ((block_size*block_size_mult) & 0x000000ff);
+                        ((block_size*block_size_mult) & 0x000000ff);
                     send_command_result(tb.ms_data_10,
-                              MIN(sizeof(struct mode_sense_data_10), length));
+                            MIN(sizeof(struct mode_sense_data_10), length));
                     break;
                 default:
                     send_command_failed_result();
@@ -831,11 +826,12 @@ static void handle_scsi(struct command_block_wrapper* cbw)
                     cur_sense_data.asc=ASC_INVALID_FIELD_IN_CBD;
                     cur_sense_data.ascq=0;
                     break;
-                }
+            }
             break;
         }
+
         case SCSI_MODE_SENSE_6: {
-            if(! lun_present) {
+            if(!lun_present) {
                 send_command_failed_result();
                 cur_sense_data.sense_key=SENSE_NOT_READY;
                 cur_sense_data.asc=ASC_MEDIUM_NOT_PRESENT;
@@ -849,34 +845,34 @@ static void handle_scsi(struct command_block_wrapper* cbw)
                 case 0x3f:
                     /* All supported pages. */
                     tb.ms_data_6->mode_data_length =
-                         sizeof(struct mode_sense_data_6)-1;
+                        sizeof(struct mode_sense_data_6)-1;
                     tb.ms_data_6->medium_type = 0;
                     tb.ms_data_6->device_specific = 0;
                     tb.ms_data_6->block_descriptor_length =
-                            sizeof(struct mode_sense_bdesc_shortlba);
+                        sizeof(struct mode_sense_bdesc_shortlba);
                     tb.ms_data_6->block_descriptor.density_code = 0;
                     tb.ms_data_6->block_descriptor.reserved = 0;
-                    if(block_count/block_size_mult > 0xffffff){
+                    if(block_count/block_size_mult > 0xffffff) {
                         tb.ms_data_6->block_descriptor.num_blocks[0] = 0xff;
                         tb.ms_data_6->block_descriptor.num_blocks[1] = 0xff;
                         tb.ms_data_6->block_descriptor.num_blocks[2] = 0xff;
                     }
                     else {
                         tb.ms_data_6->block_descriptor.num_blocks[0] =
-                             ((block_count/block_size_mult) & 0xff0000)>>16;
+                            ((block_count/block_size_mult) & 0xff0000)>>16;
                         tb.ms_data_6->block_descriptor.num_blocks[1] =
-                             ((block_count/block_size_mult) & 0x00ff00)>>8;
+                            ((block_count/block_size_mult) & 0x00ff00)>>8;
                         tb.ms_data_6->block_descriptor.num_blocks[2] =
-                             ((block_count/block_size_mult) & 0x0000ff);
+                            ((block_count/block_size_mult) & 0x0000ff);
                     }
                     tb.ms_data_6->block_descriptor.block_size[0] =
-                         ((block_size*block_size_mult) & 0xff0000)>>16;
+                        ((block_size*block_size_mult) & 0xff0000)>>16;
                     tb.ms_data_6->block_descriptor.block_size[1] =
-                         ((block_size*block_size_mult) & 0x00ff00)>>8;
+                        ((block_size*block_size_mult) & 0x00ff00)>>8;
                     tb.ms_data_6->block_descriptor.block_size[2] =
-                         ((block_size*block_size_mult) & 0x0000ff);
+                        ((block_size*block_size_mult) & 0x0000ff);
                     send_command_result(tb.ms_data_6,
-                              MIN(sizeof(struct mode_sense_data_6), length));
+                        MIN(sizeof(struct mode_sense_data_6), length));
                     break;
                 default:
                     send_command_failed_result();
@@ -907,57 +903,55 @@ static void handle_scsi(struct command_block_wrapper* cbw)
 
         case SCSI_ALLOW_MEDIUM_REMOVAL:
             logf("scsi allow_medium_removal %d",lun);
-            if((cbw->command_block[4] & 0x03) == 0) 
-            {
+            if((cbw->command_block[4] & 0x03) == 0) {
                 locked[lun]=false;
                 queue_broadcast(SYS_USB_LUN_LOCKED, (lun<<16)+0);
             }
-            else
-            {
+            else {
                 locked[lun]=true;
                 queue_broadcast(SYS_USB_LUN_LOCKED, (lun<<16)+1);
             }
             send_csw(UMS_STATUS_GOOD);
             break;
+
         case SCSI_READ_FORMAT_CAPACITY: {
             logf("scsi read_format_capacity %d",lun);
             if(lun_present) {
                 tb.format_capacity_data->following_length=htobe32(8);
                 /* "block count" actually means "number of last block" */
                 tb.format_capacity_data->block_count =
-                     htobe32(block_count/block_size_mult - 1);
+                    htobe32(block_count/block_size_mult - 1);
                 tb.format_capacity_data->block_size =
-                     htobe32(block_size*block_size_mult);
+                    htobe32(block_size*block_size_mult);
                 tb.format_capacity_data->block_size |=
-                     htobe32(SCSI_FORMAT_CAPACITY_FORMATTED_MEDIA);
+                    htobe32(SCSI_FORMAT_CAPACITY_FORMATTED_MEDIA);
 
                 send_command_result(tb.format_capacity_data,
-                          MIN(sizeof(struct format_capacity), length));
-            }
-            else
-            {
-                send_command_failed_result();
-                cur_sense_data.sense_key=SENSE_NOT_READY;
-                cur_sense_data.asc=ASC_MEDIUM_NOT_PRESENT;
-                cur_sense_data.ascq=0;
-            }
-            break;
+                    MIN(sizeof(struct format_capacity), length));
+           }
+           else {
+               send_command_failed_result();
+               cur_sense_data.sense_key=SENSE_NOT_READY;
+               cur_sense_data.asc=ASC_MEDIUM_NOT_PRESENT;
+               cur_sense_data.ascq=0;
+           }
+           break;
         }
+
         case SCSI_READ_CAPACITY: {
             logf("scsi read_capacity %d",lun);
 
             if(lun_present) {
                 /* "block count" actually means "number of last block" */
                 tb.capacity_data->block_count =
-                     htobe32(block_count/block_size_mult - 1);
+                    htobe32(block_count/block_size_mult - 1);
                 tb.capacity_data->block_size =
-                     htobe32(block_size*block_size_mult);
+                    htobe32(block_size*block_size_mult);
 
                 send_command_result(tb.capacity_data,
-                     MIN(sizeof(struct capacity), length));
+                    MIN(sizeof(struct capacity), length));
             }
-            else
-            {
+            else {
                 send_command_failed_result();
                 cur_sense_data.sense_key=SENSE_NOT_READY;
                 cur_sense_data.asc=ASC_MEDIUM_NOT_PRESENT;
@@ -968,7 +962,7 @@ static void handle_scsi(struct command_block_wrapper* cbw)
 
         case SCSI_READ_10:
             logf("scsi read10 %d",lun);
-            if(! lun_present) {
+            if(!lun_present) {
                 send_command_failed_result();
                 cur_sense_data.sense_key=SENSE_NOT_READY;
                 cur_sense_data.asc=ASC_MEDIUM_NOT_PRESENT;
@@ -979,13 +973,13 @@ static void handle_scsi(struct command_block_wrapper* cbw)
             cur_cmd.data[1] = &tb.transfer_buffer[BUFFER_SIZE];
             cur_cmd.data_select=0;
             cur_cmd.sector = block_size_mult *
-               (cbw->command_block[2] << 24 |
-                cbw->command_block[3] << 16 |
-                cbw->command_block[4] << 8  |
-                cbw->command_block[5] );
+                (cbw->command_block[2] << 24 |
+                 cbw->command_block[3] << 16 |
+                 cbw->command_block[4] << 8  |
+                 cbw->command_block[5] );
             cur_cmd.count = block_size_mult *
-               (cbw->command_block[7] << 8 |
-                cbw->command_block[8]);
+                (cbw->command_block[7] << 8 |
+                 cbw->command_block[8]);
             cur_cmd.orig_count = cur_cmd.count;
 
             //logf("scsi read %d %d", cur_cmd.sector, cur_cmd.count);
@@ -999,17 +993,16 @@ static void handle_scsi(struct command_block_wrapper* cbw)
             else {
 #ifdef USB_USE_RAMDISK
                 memcpy(cur_cmd.data[cur_cmd.data_select],
-                       ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE,
-                       MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count)*SECTOR_SIZE);
+                        ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE,
+                        MIN(BUFFER_SIZE/SECTOR_SIZE,cur_cmd.count)*SECTOR_SIZE);
 #else
                 cur_cmd.last_result = storage_read_sectors(cur_cmd.lun,
-                                             cur_cmd.sector,
-                                             MIN(BUFFER_SIZE/SECTOR_SIZE,
-                                                 cur_cmd.count),
-                                             cur_cmd.data[cur_cmd.data_select]);
+                        cur_cmd.sector,
+                        MIN(BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count),
+                        cur_cmd.data[cur_cmd.data_select]);
 
 #ifdef TOSHIBA_GIGABEAT_S
-                if (cur_cmd.sector == 0) {
+                if(cur_cmd.sector == 0) {
                     fix_mbr(cur_cmd.data[cur_cmd.data_select]);
                 }
 #endif
@@ -1020,7 +1013,7 @@ static void handle_scsi(struct command_block_wrapper* cbw)
 
         case SCSI_WRITE_10:
             logf("scsi write10 %d",lun);
-            if(! lun_present) {
+            if(!lun_present) {
                 send_csw(UMS_STATUS_FAIL);
                 cur_sense_data.sense_key=SENSE_NOT_READY;
                 cur_sense_data.asc=ASC_MEDIUM_NOT_PRESENT;
@@ -1031,13 +1024,13 @@ static void handle_scsi(struct command_block_wrapper* cbw)
             cur_cmd.data[1] = &tb.transfer_buffer[BUFFER_SIZE];
             cur_cmd.data_select=0;
             cur_cmd.sector = block_size_mult *
-               (cbw->command_block[2] << 24 |
-                cbw->command_block[3] << 16 |
-                cbw->command_block[4] << 8  |
-                cbw->command_block[5] );
+                (cbw->command_block[2] << 24 |
+                 cbw->command_block[3] << 16 |
+                 cbw->command_block[4] << 8  |
+                 cbw->command_block[5] );
             cur_cmd.count = block_size_mult *
-               (cbw->command_block[7] << 8 |
-                cbw->command_block[8]);
+                (cbw->command_block[7] << 8 |
+                 cbw->command_block[8]);
             cur_cmd.orig_count = cur_cmd.count;
 
             /* expect data */
@@ -1049,10 +1042,8 @@ static void handle_scsi(struct command_block_wrapper* cbw)
             }
             else {
                 receive_block_data(cur_cmd.data[0],
-                                   MIN(BUFFER_SIZE,
-                                   cur_cmd.count*SECTOR_SIZE));
+                        MIN(BUFFER_SIZE, cur_cmd.count*SECTOR_SIZE));
             }
-
             break;
 
         default:
@@ -1097,7 +1088,7 @@ static void send_csw(int status)
     tb.csw->status = status;
 
     usb_drv_send_nonblocking(ep_in, tb.csw,
-                             sizeof(struct command_status_wrapper));
+            sizeof(struct command_status_wrapper));
     state = SENDING_CSW;
     //logf("CSW: %X",status);
 
@@ -1127,8 +1118,8 @@ static void copy_padded(char *dest, char *src, int len)
 /* build SCSI INQUIRY */
 static void fill_inquiry(IF_MV_NONVOID(int lun))
 {
-    memset(tb.inquiry, 0, sizeof(struct inquiry_data));
     struct storage_info info;
+    memset(tb.inquiry, 0, sizeof(struct inquiry_data));
     storage_get_info(lun,&info);
     copy_padded(tb.inquiry->VendorId,info.vendor,sizeof(tb.inquiry->VendorId));
     copy_padded(tb.inquiry->ProductId,info.product,sizeof(tb.inquiry->ProductId));
@@ -1138,7 +1129,7 @@ static void fill_inquiry(IF_MV_NONVOID(int lun))
     tb.inquiry->AdditionalLength = 0x1f;
     memset(tb.inquiry->Reserved, 0, 3);
     tb.inquiry->Versions = 4; /* SPC-2 */
-    tb.inquiry->Format   = 2; /* SPC-2/3 inquiry format */
+    tb.inquiry->Format = 2; /* SPC-2/3 inquiry format */
 
 #ifdef TOSHIBA_GIGABEAT_S
     tb.inquiry->DeviceTypeModifier = 0;