summaryrefslogtreecommitdiffstats
path: root/firmware/target/coldfire/iriver/h300/usb-h300.c
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2007-09-04 08:03:07 +0000
committerDave Chapman <dave@dchapman.com>2007-09-04 08:03:07 +0000
commit1672350378c1eb218db319e35e7bf8fa457b1142 (patch)
treeccffc78a046ce73aa8f49784d5b2a2d26a2bc4d6 /firmware/target/coldfire/iriver/h300/usb-h300.c
parent946a815cd4166f8761fac0c9cba0092b871cf900 (diff)
downloadrockbox-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/coldfire/iriver/h300/usb-h300.c')
-rw-r--r--firmware/target/coldfire/iriver/h300/usb-h300.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/target/coldfire/iriver/h300/usb-h300.c b/firmware/target/coldfire/iriver/h300/usb-h300.c
index d08cc24dba..d50b7bc808 100644
--- a/firmware/target/coldfire/iriver/h300/usb-h300.c
+++ b/firmware/target/coldfire/iriver/h300/usb-h300.c
@@ -21,6 +21,7 @@
#include "cpu.h"
#include "system.h"
#include "kernel.h"
+#include "usb.h"
void usb_init_device(void)
{
@@ -35,9 +36,9 @@ void usb_init_device(void)
or_l(0x03000000, &GPIO_FUNCTION);
}
-bool usb_detect(void)
+int usb_detect(void)
{
- return (GPIO1_READ & 0x80)?true:false;
+ return (GPIO1_READ & 0x80) ? USB_INSERTED : USB_EXTRACTED;
}
void usb_enable(bool on)