diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2009-03-24 21:59:44 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2009-03-24 21:59:44 +0000 |
commit | 52d298044f087ba726d2717bafb215fad362e347 (patch) | |
tree | 25a0e49cf8405786ffecab8236410e6749322db4 | |
parent | ed1a3355deac93683a25296e573d65729bb3f2e7 (diff) | |
download | rockbox-52d298044f087ba726d2717bafb215fad362e347.tar.gz rockbox-52d298044f087ba726d2717bafb215fad362e347.zip |
Enable the charging_status function also for targets with target-specific battery charging.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20521 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 6 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index ae32aca2c5..c0cdbd8c27 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -519,7 +519,7 @@ static const struct plugin_api rockbox_api = { | |||
519 | #endif | 519 | #endif |
520 | #if CONFIG_CHARGING | 520 | #if CONFIG_CHARGING |
521 | charger_inserted, | 521 | charger_inserted, |
522 | # if CONFIG_CHARGING == CHARGING_MONITOR | 522 | # if CONFIG_CHARGING >= CHARGING_MONITOR |
523 | charging_state, | 523 | charging_state, |
524 | # endif | 524 | # endif |
525 | #endif | 525 | #endif |
diff --git a/apps/plugin.h b/apps/plugin.h index 286e6bccfe..d261ea5542 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -128,12 +128,12 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
128 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ | 128 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ |
129 | 129 | ||
130 | /* increase this every time the api struct changes */ | 130 | /* increase this every time the api struct changes */ |
131 | #define PLUGIN_API_VERSION 144 | 131 | #define PLUGIN_API_VERSION 145 |
132 | 132 | ||
133 | /* update this to latest version if a change to the api struct breaks | 133 | /* update this to latest version if a change to the api struct breaks |
134 | backwards compatibility (and please take the opportunity to sort in any | 134 | backwards compatibility (and please take the opportunity to sort in any |
135 | new function which are "waiting" at the end of the function table) */ | 135 | new function which are "waiting" at the end of the function table) */ |
136 | #define PLUGIN_MIN_API_VERSION 144 | 136 | #define PLUGIN_MIN_API_VERSION 145 |
137 | 137 | ||
138 | /* plugin return codes */ | 138 | /* plugin return codes */ |
139 | enum plugin_status { | 139 | enum plugin_status { |
@@ -658,7 +658,7 @@ struct plugin_api { | |||
658 | #endif | 658 | #endif |
659 | #if CONFIG_CHARGING | 659 | #if CONFIG_CHARGING |
660 | bool (*charger_inserted)(void); | 660 | bool (*charger_inserted)(void); |
661 | # if CONFIG_CHARGING == CHARGING_MONITOR | 661 | # if CONFIG_CHARGING >= CHARGING_MONITOR |
662 | bool (*charging_state)(void); | 662 | bool (*charging_state)(void); |
663 | # endif | 663 | # endif |
664 | #endif | 664 | #endif |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 40b9998dcb..e515ac72de 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -271,7 +271,7 @@ static unsigned int charge_state(void) | |||
271 | #if CONFIG_CHARGING | 271 | #if CONFIG_CHARGING |
272 | if (rb->charger_inserted()) | 272 | if (rb->charger_inserted()) |
273 | ret = BIT_CHARGER; | 273 | ret = BIT_CHARGER; |
274 | #if CONFIG_CHARGING == CHARGING_MONITOR | 274 | #if CONFIG_CHARGING >= CHARGING_MONITOR |
275 | if (rb->charging_state()) | 275 | if (rb->charging_state()) |
276 | ret |= BIT_CHARGING; | 276 | ret |= BIT_CHARGING; |
277 | #endif | 277 | #endif |
@@ -310,7 +310,7 @@ static bool flush_buffer(void) | |||
310 | "%02d:%02d, %04d, " | 310 | "%02d:%02d, %04d, " |
311 | #if CONFIG_CHARGING | 311 | #if CONFIG_CHARGING |
312 | " %c" | 312 | " %c" |
313 | #if CONFIG_CHARGING == CHARGING_MONITOR | 313 | #if CONFIG_CHARGING >= CHARGING_MONITOR |
314 | ", %c" | 314 | ", %c" |
315 | #endif | 315 | #endif |
316 | #endif | 316 | #endif |
@@ -324,7 +324,7 @@ static bool flush_buffer(void) | |||
324 | bat[i].voltage | 324 | bat[i].voltage |
325 | #if CONFIG_CHARGING | 325 | #if CONFIG_CHARGING |
326 | , (bat[i].flags & BIT_CHARGER) ? 'A' : '-' | 326 | , (bat[i].flags & BIT_CHARGER) ? 'A' : '-' |
327 | #if CONFIG_CHARGING == CHARGING_MONITOR | 327 | #if CONFIG_CHARGING >= CHARGING_MONITOR |
328 | , (bat[i].flags & BIT_CHARGING) ? 'C' : '-' | 328 | , (bat[i].flags & BIT_CHARGING) ? 'C' : '-' |
329 | #endif | 329 | #endif |
330 | #endif | 330 | #endif |
@@ -517,7 +517,7 @@ int main(void) | |||
517 | #if CONFIG_CHARGING | 517 | #if CONFIG_CHARGING |
518 | ", C:" | 518 | ", C:" |
519 | #endif | 519 | #endif |
520 | #if CONFIG_CHARGING == CHARGING_MONITOR | 520 | #if CONFIG_CHARGING >= CHARGING_MONITOR |
521 | ", S:" | 521 | ", S:" |
522 | #endif | 522 | #endif |
523 | #ifdef HAVE_USB_POWER | 523 | #ifdef HAVE_USB_POWER |