remember to test a bit more when doing larger changes...

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

2 files changed, 8 insertions, 4 deletions

diff --git a/firmware/usb.c b/firmware/usb.c
index 7c43a8ba90..3cd93d8be5 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -303,16 +303,20 @@ static void usb_thread(void)
 #endif
 
                 usb_state = USB_EXTRACTED;
+#ifdef HAVE_USBSTACK
                 if(exclusive_ata_access)
                 {
                     exclusive_ata_access = false;
+#endif
                     /* Tell all threads that we are back in business */
                     num_acks_to_expect =
                         queue_broadcast(SYS_USB_DISCONNECTED, 0) - 1;
                     waiting_for_ack = true;
                     DEBUGF("USB extracted. Waiting for ack from %d threads...\n",
                            num_acks_to_expect);
+#ifdef HAVE_USBSTACK
                 }
+#endif
                 break;
 
             case SYS_USB_DISCONNECTED_ACK:
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 06d999d6de..6427bd8656 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -262,7 +262,7 @@ static enum {
     SENDING_CSW
 } state = WAITING_FOR_COMMAND;
 
-static bool check_disk_present(int volume)
+static bool check_disk_present(IF_MV(int volume))
 {
     unsigned char sector[512];
     return ata_read_sectors(IF_MV2(volume,)0,1,sector) == 0;
@@ -290,7 +290,7 @@ static void try_release_ata(void)
 void usb_storage_notify_hotswap(int volume,bool inserted)
 {
     logf("notify %d",inserted);
-    if(inserted  && check_disk_present(volume)) {
+    if(inserted  && check_disk_present(IF_MV(volume))) {
         ejected[volume] = false;
     }
     else {
@@ -305,7 +305,7 @@ void usb_storage_reconnect(void)
 {
     int i;
     for(i=0;i<NUM_VOLUMES;i++)
-        ejected[i] = !check_disk_present(i);
+        ejected[i] = !check_disk_present(IF_MV(i));
 
     usb_request_exclusive_ata();
 }
@@ -315,7 +315,7 @@ void usb_storage_init(void)
 {
     int i;
     for(i=0;i<NUM_VOLUMES;i++) {
-        ejected[i] = !check_disk_present(i);
+        ejected[i] = !check_disk_present(IF_MV(i));
     }
     logf("usb_storage_init done");
 }