summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-05-16 06:21:11 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-05-16 06:21:11 +0000
commitcda664b701dcd97c3a05ff1a5fdcfb88f9524761 (patch)
tree05ffd1c395d145365fd73064d2cb25d9e3c836ad /firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
parent16c8f060e6ec444f9af2d41f73543f2e92a016ca (diff)
downloadrockbox-cda664b701dcd97c3a05ff1a5fdcfb88f9524761.tar.gz
rockbox-cda664b701dcd97c3a05ff1a5fdcfb88f9524761.tar.bz2
rockbox-cda664b701dcd97c3a05ff1a5fdcfb88f9524761.zip
MC13783 (Gigabeat S PMIC): Complete the header file. Distinguish status, sense and mask bit defines to avoid conflicts within the definitions. Much care taken but give a double check before making new use of anything.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17534 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s/usb-imx31.c')
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/usb-imx31.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
index a90384d35e..f12fd8f0b1 100644
--- a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
@@ -61,7 +61,7 @@ int usb_detect(void)
/* Read the immediate state of the cable from the PMIC */
bool usb_plugged(void)
{
- return mc13783_read(MC13783_INTERRUPT_SENSE0) & MC13783_USB4V4;
+ return mc13783_read(MC13783_INTERRUPT_SENSE0) & MC13783_USB4V4S;
}
void usb_init_device(void)
@@ -73,7 +73,7 @@ void usb_init_device(void)
/* Module will be turned off later after firmware init */
usb_drv_startup();
- mc13783_clear(MC13783_INTERRUPT_MASK0, MC13783_USB4V4);
+ mc13783_clear(MC13783_INTERRUPT_MASK0, MC13783_USB4V4M);
}
void usb_enable(bool on)