diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 4 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 4 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/x5/power-x5.c | 28 |
3 files changed, 18 insertions, 18 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 5d59a6bd1e..7d93edaca1 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -210,10 +210,10 @@ drivers/isp1362.c | |||
210 | drivers/m5636.c | 210 | drivers/m5636.c |
211 | #endif | 211 | #endif |
212 | 212 | ||
213 | #ifndef SIMULATOR | ||
214 | #ifdef IAUDIO_X5 | 213 | #ifdef IAUDIO_X5 |
215 | drivers/generic_i2c.c | ||
216 | target/coldfire/iaudio/x5/power-x5.c | 214 | target/coldfire/iaudio/x5/power-x5.c |
215 | #ifndef SIMULATOR | ||
216 | drivers/generic_i2c.c | ||
217 | target/coldfire/iaudio/x5/lcd-x5.c | 217 | target/coldfire/iaudio/x5/lcd-x5.c |
218 | target/coldfire/iaudio/x5/pcf50606-x5.c | 218 | target/coldfire/iaudio/x5/pcf50606-x5.c |
219 | target/coldfire/iaudio/x5/adc-x5.c | 219 | target/coldfire/iaudio/x5/adc-x5.c |
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index cd77dc3c48..a04967c455 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -60,6 +60,8 @@ | |||
60 | 60 | ||
61 | #define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */ | 61 | #define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */ |
62 | 62 | ||
63 | #define HAVE_TLV320 | ||
64 | |||
63 | #ifndef SIMULATOR | 65 | #ifndef SIMULATOR |
64 | 66 | ||
65 | /* Define this if you have a Motorola SCF5250 */ | 67 | /* Define this if you have a Motorola SCF5250 */ |
@@ -68,8 +70,6 @@ | |||
68 | /* Define this if you want to use coldfire's i2c interface */ | 70 | /* Define this if you want to use coldfire's i2c interface */ |
69 | #define CONFIG_I2C I2C_COLDFIRE | 71 | #define CONFIG_I2C I2C_COLDFIRE |
70 | 72 | ||
71 | #define HAVE_TLV320 | ||
72 | |||
73 | /* Hardware controlled charging? FIXME */ | 73 | /* Hardware controlled charging? FIXME */ |
74 | #define CONFIG_CHARGING CHARGING_SIMPLE | 74 | #define CONFIG_CHARGING CHARGING_SIMPLE |
75 | 75 | ||
diff --git a/firmware/target/coldfire/iaudio/x5/power-x5.c b/firmware/target/coldfire/iaudio/x5/power-x5.c index 4199993637..253c904588 100644 --- a/firmware/target/coldfire/iaudio/x5/power-x5.c +++ b/firmware/target/coldfire/iaudio/x5/power-x5.c | |||
@@ -64,20 +64,6 @@ void power_off(void) | |||
64 | yield(); | 64 | yield(); |
65 | } | 65 | } |
66 | 66 | ||
67 | static bool powered = false; | ||
68 | |||
69 | bool radio_powered() | ||
70 | { | ||
71 | return powered; | ||
72 | } | ||
73 | |||
74 | bool radio_power(bool status) | ||
75 | { | ||
76 | bool old_status = powered; | ||
77 | powered = status; | ||
78 | return old_status; | ||
79 | } | ||
80 | |||
81 | #else | 67 | #else |
82 | 68 | ||
83 | bool charger_inserted(void) | 69 | bool charger_inserted(void) |
@@ -100,3 +86,17 @@ void ide_power_enable(bool on) | |||
100 | } | 86 | } |
101 | 87 | ||
102 | #endif /* SIMULATOR */ | 88 | #endif /* SIMULATOR */ |
89 | |||
90 | static bool powered = false; | ||
91 | |||
92 | bool radio_powered() | ||
93 | { | ||
94 | return powered; | ||
95 | } | ||
96 | |||
97 | bool radio_power(bool status) | ||
98 | { | ||
99 | bool old_status = powered; | ||
100 | powered = status; | ||
101 | return old_status; | ||
102 | } | ||