3 files changed, 10 insertions, 4 deletions

diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 5b5361530b..909194e1b2 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -109,7 +109,7 @@ static void handle_usb(int connect_timeout)
             break;
         }
 
-        if (usb_detect() == USB_EXTRACTED)
+        if (usb_plugged() == USB_EXTRACTED)
             break; /* Cable pulled */
     }
 
@@ -376,7 +376,7 @@ void main(void)
 
     /* Do USB first since a tar or binary could be added to the MTP directory
      * at the time and we can untar or move after unplugging. */
-    if (usb_detect() == USB_INSERTED)
+    if (usb_plugged() == USB_INSERTED)
         handle_usb(HZ*2);
 
     handle_untar();
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-target.h b/firmware/target/arm/imx31/gigabeat-s/system-target.h
index 533b2a1bd3..44a97c7ca9 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/system-target.h
@@ -85,6 +85,7 @@ struct ARM_REGS {
 
 void dumpregs(void);
 
+bool usb_plugged(void);
 void usb_connect_event(void);
 
 /** Sector read/write filters **/
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
index d967cd67f6..b157544016 100644
--- a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
@@ -53,11 +53,16 @@ static void enable_transceiver(bool enable)
     }
 }
 
+/* Read the immediate state of the cable from the PMIC */
+bool usb_plugged(void)
+{
+    return mc13783_read(MC13783_INTERRUPT_SENSE0) & MC13783_USB4V4S;
+}
+
 void usb_connect_event(void)
 {
     /* Read the immediate state of the cable from the PMIC */
-    int status = (mc13783_read(MC13783_INTERRUPT_SENSE0) & MC13783_USB4V4S)
-        ? USB_INSERTED : USB_EXTRACTED;
+    int status = usb_plugged() ? USB_INSERTED : USB_EXTRACTED;
     usb_status = status;
     /* Notify power that USB charging is potentially available */
     charger_usb_detect_event(status);