diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-01-18 14:10:06 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-01-18 14:10:06 +0000 |
commit | 453550a6877afcda342ac2477cf05028fff053f9 (patch) | |
tree | 0c1da0af945d93a6c4af2da5eb359f737e6a7f53 /firmware/target | |
parent | 980225c3e20b3102382c910da6e1406cc8c7f1b5 (diff) | |
download | rockbox-453550a6877afcda342ac2477cf05028fff053f9.tar.gz rockbox-453550a6877afcda342ac2477cf05028fff053f9.zip |
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
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/as3525/sd-as3525.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sd-as3525v2.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/ata-sd-pp.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/sd-tcc780x.c | 4 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 3 |
5 files changed, 0 insertions, 17 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) | |||
516 | usb_wait_for_disconnect(&sd_queue); | 516 | usb_wait_for_disconnect(&sd_queue); |
517 | 517 | ||
518 | break; | 518 | break; |
519 | case SYS_USB_DISCONNECTED: | ||
520 | usb_acknowledge(SYS_USB_DISCONNECTED_ACK); | ||
521 | break; | ||
522 | } | 519 | } |
523 | } | 520 | } |
524 | } | 521 | } |
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) | |||
700 | usb_wait_for_disconnect(&sd_queue); | 700 | usb_wait_for_disconnect(&sd_queue); |
701 | 701 | ||
702 | break; | 702 | break; |
703 | case SYS_USB_DISCONNECTED: | ||
704 | usb_acknowledge(SYS_USB_DISCONNECTED_ACK); | ||
705 | break; | ||
706 | } | 703 | } |
707 | } | 704 | } |
708 | } | 705 | } |
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) | |||
1175 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 1175 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
1176 | /* Wait until the USB cable is extracted again */ | 1176 | /* Wait until the USB cable is extracted again */ |
1177 | usb_wait_for_disconnect(&sd_queue); | 1177 | usb_wait_for_disconnect(&sd_queue); |
1178 | |||
1179 | break; | ||
1180 | case SYS_USB_DISCONNECTED: | ||
1181 | usb_acknowledge(SYS_USB_DISCONNECTED_ACK); | ||
1182 | break; | 1178 | break; |
1183 | 1179 | ||
1184 | #ifdef SD_DRIVER_CLOSE | 1180 | #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) | |||
709 | /* Wait until the USB cable is extracted again */ | 709 | /* Wait until the USB cable is extracted again */ |
710 | usb_wait_for_disconnect(&sd_queue); | 710 | usb_wait_for_disconnect(&sd_queue); |
711 | break; | 711 | break; |
712 | |||
713 | case SYS_USB_DISCONNECTED: | ||
714 | usb_acknowledge(SYS_USB_DISCONNECTED_ACK); | ||
715 | break; | ||
716 | } | 712 | } |
717 | } | 713 | } |
718 | } | 714 | } |
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c index 023835303b..efca66445a 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | |||
@@ -1512,9 +1512,6 @@ static void sd_thread(void) | |||
1512 | /* Wait until the USB cable is extracted again */ | 1512 | /* Wait until the USB cable is extracted again */ |
1513 | usb_wait_for_disconnect(&sd_queue); | 1513 | usb_wait_for_disconnect(&sd_queue); |
1514 | break; | 1514 | break; |
1515 | case SYS_USB_DISCONNECTED: | ||
1516 | usb_acknowledge(SYS_USB_DISCONNECTED_ACK); | ||
1517 | break; | ||
1518 | } | 1515 | } |
1519 | } | 1516 | } |
1520 | } | 1517 | } |