diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2007-11-23 00:02:52 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2007-11-23 00:02:52 +0000 |
| commit | 68b440346eca147fd2bc78b97f4158eaebc61296 (patch) | |
| tree | 68edb6345a2c49814d2d8105382cf488fc640864 | |
| parent | 1c38c75a22e71c50c35f324ec7a1eeddcafe2cc4 (diff) | |
| download | rockbox-68b440346eca147fd2bc78b97f4158eaebc61296.zip rockbox-68b440346eca147fd2bc78b97f4158eaebc61296.tar.gz rockbox-68b440346eca147fd2bc78b97f4158eaebc61296.tar.bz2 rockbox-68b440346eca147fd2bc78b97f4158eaebc61296.tar.xz | |
Quick fix for ipod usb detect. (Charger detection coming later.)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15764 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/usb-fw-pp502x.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c index 2d9a52e..07cf8c6 100644 --- a/firmware/target/arm/usb-fw-pp502x.c +++ b/firmware/target/arm/usb-fw-pp502x.c @@ -30,6 +30,7 @@ #ifdef HAVE_USBSTACK #include "usb_core.h" #endif +#include "usb_drv.h" void usb_init_device(void) { @@ -103,9 +104,7 @@ int usb_detect(void) /* GPIO C bit 1 is firewire detect */ if (!(GPIOC_INPUT_VAL & 0x02)) return USB_INSERTED; -#endif - -#if defined(SANSA_C200) +#elif defined(SANSA_C200) /* GPIO H bit 1 is usb detect */ if (GPIOH_INPUT_VAL & 0x02) return USB_INSERTED; @@ -119,5 +118,8 @@ int usb_detect(void) return USB_INSERTED; #endif + if (usb_drv_powered()) + return USB_INSERTED; + return USB_EXTRACTED; } |