summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/target/arm/usb-fw-pp502x.c8
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;
}