summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-03-21 00:04:17 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-03-21 00:04:17 +0000
commitbb026334c020bb04839186e7a45bac1dc7cb1724 (patch)
tree82bb9cb7f38b843ad35f34bfd64359d7cd2ee946 /firmware
parentea5903dbf10ea7657e09831598d0c1bfbdcaf39f (diff)
downloadrockbox-bb026334c020bb04839186e7a45bac1dc7cb1724.tar.gz
rockbox-bb026334c020bb04839186e7a45bac1dc7cb1724.zip
Mostly revert r16723, since it causes problems on ipod (i.e. it doesn't seem to detect a connection anymore)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16727 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/target/arm/usb-fw-pp502x.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index d881488094..008d42d991 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -119,12 +119,7 @@ static bool usb_pin_detect(void)
119int usb_detect(void) 119int usb_detect(void)
120{ 120{
121 if(usb_pin_detect()) { 121 if(usb_pin_detect()) {
122 if(usb_drv_connected()) { 122 return USB_INSERTED;
123 return USB_INSERTED;
124 }
125 else {
126 return USB_POWERED;
127 }
128 } 123 }
129 else { 124 else {
130 return USB_EXTRACTED; 125 return USB_EXTRACTED;