diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-31 18:43:59 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-31 18:43:59 +0000 |
| commit | 2115eac7bb599ccc321f43c3bfa1a11672fd4b3a (patch) | |
| tree | 1cd19570528528898483ccb2e62044f17693872a /firmware/target/arm/imx31 | |
| parent | df09274768f020fe403cbe9475f5ba192247826d (diff) | |
| download | rockbox-2115eac7bb599ccc321f43c3bfa1a11672fd4b3a.tar.gz rockbox-2115eac7bb599ccc321f43c3bfa1a11672fd4b3a.zip | |
usb_plugged() is PP only
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31489 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/imx31')
| -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) } } -/* 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) { - int status = usb_plugged() ? USB_INSERTED : USB_EXTRACTED; + /* Read the immediate state of the cable from the PMIC */ + int status = (mc13783_read(MC13783_INTERRUPT_SENSE0) & MC13783_USB4V4S) + ? USB_INSERTED : USB_EXTRACTED; usb_status = status; /* Notify power that USB charging is potentially available */ 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 @@ #endif void usb_connect_event(void); -/* Read the immediate state of the cable from the PMIC */ -bool usb_plugged(void); /** Sector read/write filters **/ |