diff options
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c | 10 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/usb-target.h | 2 |
2 files changed, 3 insertions, 9 deletions
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 19c3b3173f..9ee1a47fd6 100644 --- a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c | |||
@@ -54,15 +54,11 @@ static void enable_transceiver(bool enable) | |||
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
57 | /* Read the immediate state of the cable from the PMIC */ | ||
58 | bool usb_plugged(void) | ||
59 | { | ||
60 | return mc13783_read(MC13783_INTERRUPT_SENSE0) & MC13783_USB4V4S; | ||
61 | } | ||
62 | |||
63 | void usb_connect_event(void) | 57 | void usb_connect_event(void) |
64 | { | 58 | { |
65 | int status = usb_plugged() ? USB_INSERTED : USB_EXTRACTED; | 59 | /* Read the immediate state of the cable from the PMIC */ |
60 | int status = (mc13783_read(MC13783_INTERRUPT_SENSE0) & MC13783_USB4V4S) | ||
61 | ? USB_INSERTED : USB_EXTRACTED; | ||
66 | usb_status = status; | 62 | usb_status = status; |
67 | /* Notify power that USB charging is potentially available */ | 63 | /* Notify power that USB charging is potentially available */ |
68 | charger_usb_detect_event(status); | 64 | charger_usb_detect_event(status); |
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-target.h b/firmware/target/arm/imx31/gigabeat-s/usb-target.h index 961b947e14..60a9abd04c 100644 --- a/firmware/target/arm/imx31/gigabeat-s/usb-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/usb-target.h | |||
@@ -26,8 +26,6 @@ | |||
26 | #endif | 26 | #endif |
27 | 27 | ||
28 | void usb_connect_event(void); | 28 | void usb_connect_event(void); |
29 | /* Read the immediate state of the cable from the PMIC */ | ||
30 | bool usb_plugged(void); | ||
31 | 29 | ||
32 | /** Sector read/write filters **/ | 30 | /** Sector read/write filters **/ |
33 | 31 | ||