diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/power.c | 5 | ||||
-rw-r--r-- | firmware/export/power.h | 19 |
2 files changed, 17 insertions, 7 deletions
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index 5feece67f0..d7750a33b2 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c | |||
@@ -105,13 +105,12 @@ void power_init(void) | |||
105 | #endif | 105 | #endif |
106 | } | 106 | } |
107 | 107 | ||
108 | |||
108 | #ifdef HAVE_CHARGING | 109 | #ifdef HAVE_CHARGING |
109 | bool charger_inserted(void) | 110 | bool charger_inserted(void) |
110 | { | 111 | { |
111 | #if defined(IRIVER_H100_SERIES) | 112 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) |
112 | return (GPIO1_READ & 0x00400000)?true:false; | 113 | return (GPIO1_READ & 0x00400000)?true:false; |
113 | #elif defined(IRIVER_H300_SERIES) | ||
114 | return (GPIO1_READ & 0x00400000) || usb_powered(); | ||
115 | #elif defined(GMINI_ARCH) | 114 | #elif defined(GMINI_ARCH) |
116 | return (P7 & 0x80) == 0; | 115 | return (P7 & 0x80) == 0; |
117 | #elif defined(IAUDIO_X5) | 116 | #elif defined(IAUDIO_X5) |
diff --git a/firmware/export/power.h b/firmware/export/power.h index 9f91e25f15..be8ebda5b0 100644 --- a/firmware/export/power.h +++ b/firmware/export/power.h | |||
@@ -21,15 +21,26 @@ | |||
21 | 21 | ||
22 | #ifdef HAVE_CHARGE_CTRL | 22 | #ifdef HAVE_CHARGE_CTRL |
23 | extern bool charger_enabled; | 23 | extern bool charger_enabled; |
24 | void charger_enable(bool on); | ||
24 | #endif | 25 | #endif |
25 | 26 | ||
26 | void power_init(void); | 27 | #ifdef HAVE_CHARGING |
27 | bool charger_inserted(void); | 28 | bool charger_inserted(void); |
28 | bool charging_state(void); | 29 | #endif |
29 | void charger_enable(bool on); | 30 | |
31 | void power_off(void); | ||
30 | void ide_power_enable(bool on); | 32 | void ide_power_enable(bool on); |
33 | |||
34 | #ifndef SIMULATOR | ||
35 | |||
36 | void power_init(void); | ||
37 | |||
38 | # ifdef HAVE_CHARGE_STATE | ||
39 | bool charging_state(void); | ||
40 | # endif | ||
41 | |||
31 | bool ide_powered(void); | 42 | bool ide_powered(void); |
32 | void power_off(void); | 43 | #endif |
33 | 44 | ||
34 | #ifdef HAVE_SPDIF_POWER | 45 | #ifdef HAVE_SPDIF_POWER |
35 | void spdif_power_enable(bool on); | 46 | void spdif_power_enable(bool on); |