diff options
| author | Dave Chapman <dave@dchapman.com> | 2007-09-04 08:03:07 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2007-09-04 08:03:07 +0000 |
| commit | 1672350378c1eb218db319e35e7bf8fa457b1142 (patch) | |
| tree | ccffc78a046ce73aa8f49784d5b2a2d26a2bc4d6 /firmware/target/sh/archos/player/usb-player.c | |
| parent | 946a815cd4166f8761fac0c9cba0092b871cf900 (diff) | |
| download | rockbox-1672350378c1eb218db319e35e7bf8fa457b1142.tar.gz rockbox-1672350378c1eb218db319e35e7bf8fa457b1142.zip | |
FS #7691 - improved USB detection on PP devices. This patch modifies the target-tree function usb_detect() on all targets from bool to int, returning USB_INSERTED or USB_EXTRACTED instead of true or false. This was done to enable the PP usb_detect() to check for USB_POWER (either a connection to a USB wall charger, or the user holding "charge mode" button) and return that as a third value.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14600 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/sh/archos/player/usb-player.c')
| -rw-r--r-- | firmware/target/sh/archos/player/usb-player.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/target/sh/archos/player/usb-player.c b/firmware/target/sh/archos/player/usb-player.c index c10e222f0a..e86003f2c2 100644 --- a/firmware/target/sh/archos/player/usb-player.c +++ b/firmware/target/sh/archos/player/usb-player.c @@ -20,10 +20,11 @@ #include <stdbool.h> #include "cpu.h" #include "system.h" +#include "usb.h" -bool usb_detect(void) +int usb_detect(void) { - return (PADR & 0x8000) ? false : true; + return (PADR & 0x8000) ? USB_INSERTED : USB_EXTRACTED; } void usb_enable(bool on) |