From 68b440346eca147fd2bc78b97f4158eaebc61296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= Date: Fri, 23 Nov 2007 00:02:52 +0000 Subject: [PATCH] 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 --- firmware/target/arm/usb-fw-pp502x.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c index 2d9a52ead8..07cf8c657a 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; }