diff options
Diffstat (limited to 'firmware/target/coldfire')
-rw-r--r-- | firmware/target/coldfire/iaudio/usb-iaudio.c | 5 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h100/usb-h100.c | 5 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/usb-h300.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/firmware/target/coldfire/iaudio/usb-iaudio.c b/firmware/target/coldfire/iaudio/usb-iaudio.c index 3bd1a7a458..21d69611b7 100644 --- a/firmware/target/coldfire/iaudio/usb-iaudio.c +++ b/firmware/target/coldfire/iaudio/usb-iaudio.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <stdbool.h> | 20 | #include <stdbool.h> |
21 | #include "cpu.h" | 21 | #include "cpu.h" |
22 | #include "system.h" | 22 | #include "system.h" |
23 | #include "usb.h" | ||
23 | 24 | ||
24 | void usb_init_device(void) | 25 | void usb_init_device(void) |
25 | { | 26 | { |
@@ -30,9 +31,9 @@ void usb_init_device(void) | |||
30 | or_l(0x00800000, &GPIO1_FUNCTION); /* USB detect */ | 31 | or_l(0x00800000, &GPIO1_FUNCTION); /* USB detect */ |
31 | } | 32 | } |
32 | 33 | ||
33 | bool usb_detect(void) | 34 | int usb_detect(void) |
34 | { | 35 | { |
35 | return (GPIO1_READ & 0x00800000)?true:false; | 36 | return (GPIO1_READ & 0x00800000) ? USB_INSERTED : USB_EXTRACTED; |
36 | } | 37 | } |
37 | 38 | ||
38 | void usb_enable(bool on) | 39 | void usb_enable(bool on) |
diff --git a/firmware/target/coldfire/iriver/h100/usb-h100.c b/firmware/target/coldfire/iriver/h100/usb-h100.c index 3b00e967da..5a2f7f500b 100644 --- a/firmware/target/coldfire/iriver/h100/usb-h100.c +++ b/firmware/target/coldfire/iriver/h100/usb-h100.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "cpu.h" | 21 | #include "cpu.h" |
22 | #include "system.h" | 22 | #include "system.h" |
23 | #include "kernel.h" | 23 | #include "kernel.h" |
24 | #include "usb.h" | ||
24 | 25 | ||
25 | void usb_init_device(void) | 26 | void usb_init_device(void) |
26 | { | 27 | { |
@@ -30,9 +31,9 @@ void usb_init_device(void) | |||
30 | or_l(0x01000040, &GPIO_FUNCTION); | 31 | or_l(0x01000040, &GPIO_FUNCTION); |
31 | } | 32 | } |
32 | 33 | ||
33 | bool usb_detect(void) | 34 | int usb_detect(void) |
34 | { | 35 | { |
35 | return (GPIO1_READ & 0x80)?true:false; | 36 | return (GPIO1_READ & 0x80) ? USB_INSERTED : USB_EXTRACTED; |
36 | } | 37 | } |
37 | 38 | ||
38 | void usb_enable(bool on) | 39 | void usb_enable(bool on) |
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 @@ | |||
21 | #include "cpu.h" | 21 | #include "cpu.h" |
22 | #include "system.h" | 22 | #include "system.h" |
23 | #include "kernel.h" | 23 | #include "kernel.h" |
24 | #include "usb.h" | ||
24 | 25 | ||
25 | void usb_init_device(void) | 26 | void usb_init_device(void) |
26 | { | 27 | { |
@@ -35,9 +36,9 @@ void usb_init_device(void) | |||
35 | or_l(0x03000000, &GPIO_FUNCTION); | 36 | or_l(0x03000000, &GPIO_FUNCTION); |
36 | } | 37 | } |
37 | 38 | ||
38 | bool usb_detect(void) | 39 | int usb_detect(void) |
39 | { | 40 | { |
40 | return (GPIO1_READ & 0x80)?true:false; | 41 | return (GPIO1_READ & 0x80) ? USB_INSERTED : USB_EXTRACTED; |
41 | } | 42 | } |
42 | 43 | ||
43 | void usb_enable(bool on) | 44 | void usb_enable(bool on) |