diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-19 22:12:42 +0000 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-19 22:12:42 +0000 |
commit | da7be39614edcc955e1381e6b9ebe402b2c3d9c8 (patch) | |
tree | 7e9f74803b2a2ed20558f0c3fe7732af13c99ca2 | |
parent | 0cb76defd3c311e9dd4c16257c16a2d7daada87a (diff) | |
download | rockbox-da7be39614edcc955e1381e6b9ebe402b2c3d9c8.tar.gz rockbox-da7be39614edcc955e1381e6b9ebe402b2c3d9c8.zip |
Fix sim red
Change-Id: Icbdf47c5c508516892b1ce75558b878dc512e780
-rw-r--r-- | bootloader/imx233.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx233/adc-imx233.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/imx233/adc-target.h | 3 | ||||
-rw-r--r-- | firmware/target/arm/imx233/powermgmt-imx233.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx233/powermgmt-imx233.h | 3 | ||||
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/imx233/system-imx233.c | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/bootloader/imx233.c b/bootloader/imx233.c index 6c68ab04f7..d115389985 100644 --- a/bootloader/imx233.c +++ b/bootloader/imx233.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #include "system-target.h" | 41 | #include "system-target.h" |
42 | #include "fmradio_i2c.h" | 42 | #include "fmradio_i2c.h" |
43 | #include "version.h" | 43 | #include "version.h" |
44 | #include "powermgmt.h" | 44 | #include "powermgmt-imx233.h" |
45 | #include "partitions-imx233.h" | 45 | #include "partitions-imx233.h" |
46 | #include "adc.h" | 46 | #include "adc.h" |
47 | 47 | ||
diff --git a/firmware/target/arm/imx233/adc-imx233.c b/firmware/target/arm/imx233/adc-imx233.c index a0bda9ab02..36ac0f4eae 100644 --- a/firmware/target/arm/imx233/adc-imx233.c +++ b/firmware/target/arm/imx233/adc-imx233.c | |||
@@ -20,6 +20,9 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include "adc-target.h" | 22 | #include "adc-target.h" |
23 | #include "system.h" | ||
24 | #include "powermgmt-target.h" | ||
25 | #include "lradc-imx233.h" | ||
23 | #include "power-imx233.h" | 26 | #include "power-imx233.h" |
24 | 27 | ||
25 | /* Virtual channels */ | 28 | /* Virtual channels */ |
diff --git a/firmware/target/arm/imx233/adc-target.h b/firmware/target/arm/imx233/adc-target.h index ed6e3eca77..1694b4c5f6 100644 --- a/firmware/target/arm/imx233/adc-target.h +++ b/firmware/target/arm/imx233/adc-target.h | |||
@@ -21,11 +21,8 @@ | |||
21 | #ifndef _ADC_IMX233_H_ | 21 | #ifndef _ADC_IMX233_H_ |
22 | #define _ADC_IMX233_H_ | 22 | #define _ADC_IMX233_H_ |
23 | 23 | ||
24 | #include "system.h" | ||
25 | #include "adc.h" | 24 | #include "adc.h" |
26 | #include "adc-target.h" | ||
27 | #include "powermgmt-target.h" | 25 | #include "powermgmt-target.h" |
28 | #include "lradc-imx233.h" | ||
29 | 26 | ||
30 | enum imx233_adc_channel_t | 27 | enum imx233_adc_channel_t |
31 | { | 28 | { |
diff --git a/firmware/target/arm/imx233/powermgmt-imx233.c b/firmware/target/arm/imx233/powermgmt-imx233.c index 895c91dda2..f2d1981f24 100644 --- a/firmware/target/arm/imx233/powermgmt-imx233.c +++ b/firmware/target/arm/imx233/powermgmt-imx233.c | |||
@@ -19,12 +19,14 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include "system.h" | ||
22 | #include "powermgmt.h" | 23 | #include "powermgmt.h" |
23 | #include "power-imx233.h" | 24 | #include "power-imx233.h" |
24 | #include "usb.h" | 25 | #include "usb.h" |
25 | #include "string.h" | 26 | #include "string.h" |
26 | //#define LOGF_ENABLE | 27 | //#define LOGF_ENABLE |
27 | #include "logf.h" | 28 | #include "logf.h" |
29 | #include "powermgmt-imx233.h" | ||
28 | 30 | ||
29 | #if !defined(IMX233_CHARGE_CURRENT) || !defined(IMX233_STOP_CURRENT) \ | 31 | #if !defined(IMX233_CHARGE_CURRENT) || !defined(IMX233_STOP_CURRENT) \ |
30 | || !defined(IMX233_CHARGING_TIMEOUT) || !defined(IMX233_TOPOFF_TIMEOUT) | 32 | || !defined(IMX233_CHARGING_TIMEOUT) || !defined(IMX233_TOPOFF_TIMEOUT) |
diff --git a/firmware/target/arm/imx233/powermgmt-imx233.h b/firmware/target/arm/imx233/powermgmt-imx233.h index 07634ec12e..4cbe0072e7 100644 --- a/firmware/target/arm/imx233/powermgmt-imx233.h +++ b/firmware/target/arm/imx233/powermgmt-imx233.h | |||
@@ -25,9 +25,6 @@ | |||
25 | #include "powermgmt.h" | 25 | #include "powermgmt.h" |
26 | 26 | ||
27 | void imx233_powermgmt_init(void); | 27 | void imx233_powermgmt_init(void); |
28 | void powermgmt_init_target(void); | ||
29 | void charging_algorithm_step(void); | ||
30 | void charging_algorithm_close(void); | ||
31 | 28 | ||
32 | struct imx233_powermgmt_info_t | 29 | struct imx233_powermgmt_info_t |
33 | { | 30 | { |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h index 2fd5559baf..4a11afc379 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h +++ b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h | |||
@@ -22,7 +22,6 @@ | |||
22 | #define POWERMGMT_TARGET_H | 22 | #define POWERMGMT_TARGET_H |
23 | 23 | ||
24 | #include "config.h" | 24 | #include "config.h" |
25 | #include "powermgmt-imx233.h" | ||
26 | 25 | ||
27 | /* Fuze+ OF settings: | 26 | /* Fuze+ OF settings: |
28 | * - current ramp slope: 50 mA/s | 27 | * - current ramp slope: 50 mA/s |
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c index 3293bd71d1..4223af26c4 100644 --- a/firmware/target/arm/imx233/system-imx233.c +++ b/firmware/target/arm/imx233/system-imx233.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "backlight-target.h" | 43 | #include "backlight-target.h" |
44 | #include "button.h" | 44 | #include "button.h" |
45 | #include "fmradio_i2c.h" | 45 | #include "fmradio_i2c.h" |
46 | #include "powermgmt.h" | 46 | #include "powermgmt-imx233.h" |
47 | 47 | ||
48 | void imx233_chip_reset(void) | 48 | void imx233_chip_reset(void) |
49 | { | 49 | { |