Try to get some control over #ifdef hell in usb.c by refactoring and inline function use. SYS_USB_DISCONNECTED_ACK hasn't been doing anything useful for the USB thread; remove it. USB thread simply ignores that value. Observe only valid usb_state transitions.

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

4 files changed, 0 insertions, 14 deletions

diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index 0dc29c8aa5..5a6e0df39a 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -516,9 +516,6 @@ static void sd_thread(void)
             usb_wait_for_disconnect(&sd_queue);
 
             break;
-        case SYS_USB_DISCONNECTED:
-            usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
-            break;
         }
     }
 }
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index 45525610b3..929a036935 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -700,9 +700,6 @@ static void sd_thread(void)
             usb_wait_for_disconnect(&sd_queue);
 
             break;
-        case SYS_USB_DISCONNECTED:
-            usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
-            break;
         }
     }
 }
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/ata-sd-pp.c
index 00437ea7a7..b200dc4c22 100644
--- a/firmware/target/arm/ata-sd-pp.c
+++ b/firmware/target/arm/ata-sd-pp.c
@@ -1175,10 +1175,6 @@ static void sd_thread(void)
             usb_acknowledge(SYS_USB_CONNECTED_ACK);
             /* Wait until the USB cable is extracted again */
             usb_wait_for_disconnect(&sd_queue);
-
-            break;
-        case SYS_USB_DISCONNECTED:
-            usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
             break;
 
 #ifdef SD_DRIVER_CLOSE
diff --git a/firmware/target/arm/tcc780x/sd-tcc780x.c b/firmware/target/arm/tcc780x/sd-tcc780x.c
index 7f17e457c9..3b67d21958 100644
--- a/firmware/target/arm/tcc780x/sd-tcc780x.c
+++ b/firmware/target/arm/tcc780x/sd-tcc780x.c
@@ -709,10 +709,6 @@ static void sd_thread(void)
             /* Wait until the USB cable is extracted again */
             usb_wait_for_disconnect(&sd_queue);
             break;
-
-        case SYS_USB_DISCONNECTED:
-            usb_acknowledge(SYS_USB_DISCONNECTED_ACK);
-            break;
         }
     }
 }