diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-02-04 05:46:55 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-02-04 05:46:55 +0000 |
commit | a2e4a518256dda97ad502f7dee2c9009758bf4aa (patch) | |
tree | 10afda5e713e81fac54414e2f92f33c75dc6904b /firmware | |
parent | d3934185ac467710f52bb5d65b86b85b6fc1d5f8 (diff) | |
download | rockbox-a2e4a518256dda97ad502f7dee2c9009758bf4aa.tar.gz rockbox-a2e4a518256dda97ad502f7dee2c9009758bf4aa.zip |
AMSv2 USB: Remove usb_enable call that occurs after core is already initialized and the usb_disable call while in ISR. Also, no point in panicing over a disconnect.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29205 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525v2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c index 61fff0550e..78dc2a603f 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525v2.c +++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c | |||
@@ -96,7 +96,7 @@ static enum ep0state ep0_state; | |||
96 | void usb_attach(void) | 96 | void usb_attach(void) |
97 | { | 97 | { |
98 | logf("usb-drv: attach"); | 98 | logf("usb-drv: attach"); |
99 | usb_enable(true); | 99 | /* Nothing to do */ |
100 | } | 100 | } |
101 | 101 | ||
102 | static inline void usb_delay(void) | 102 | static inline void usb_delay(void) |
@@ -654,9 +654,7 @@ void INT_USB(void) | |||
654 | 654 | ||
655 | if(sts & GINTMSK_disconnect) | 655 | if(sts & GINTMSK_disconnect) |
656 | { | 656 | { |
657 | panicf("usb-drv: disconnect"); | ||
658 | cancel_all_transfers(true); | 657 | cancel_all_transfers(true); |
659 | usb_enable(false); | ||
660 | } | 658 | } |
661 | 659 | ||
662 | GINTSTS = sts; | 660 | GINTSTS = sts; |