From 19fba5fb30efaed540478457fb52c0200a748e59 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sat, 7 Jan 2012 22:32:52 +0000 Subject: powermgmt-target.h: move prototypes to powermgmt.h Implement empty stubs if needed instead of empty static inline git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31617 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/powermgmt.h | 2 ++ firmware/target/arm/as3525/powermgmt-target.h | 4 ---- firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h | 4 ---- firmware/target/arm/philips/sa9200/powermgmt-target.h | 4 ---- firmware/target/arm/sandisk/powermgmt-target.h | 4 ---- firmware/target/sh/archos/recorder/powermgmt-recorder.c | 8 ++++++-- firmware/target/sh/archos/recorder/powermgmt-target.h | 14 -------------- 7 files changed, 8 insertions(+), 32 deletions(-) diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index 9e9d3d0fd8..14d0078c31 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h @@ -139,6 +139,8 @@ int _battery_time(void); /* minutes */ int _battery_voltage(void); /* voltage in millivolts */ #if CONFIG_CHARGING >= CHARGING_TARGET void powermgmt_init_target(void); +void charging_algorithm_close(void); +void charging_algorithm_step(void); #endif #ifdef HAVE_BATTERY_SWITCH diff --git a/firmware/target/arm/as3525/powermgmt-target.h b/firmware/target/arm/as3525/powermgmt-target.h index f2762f3e47..3b459fa695 100644 --- a/firmware/target/arm/as3525/powermgmt-target.h +++ b/firmware/target/arm/as3525/powermgmt-target.h @@ -100,10 +100,6 @@ #error "Charger settings not defined!" #endif -void powermgmt_init_target(void); -void charging_algorithm_step(void); -void charging_algorithm_close(void); - /* We want to be able to reset the averaging filter */ #define HAVE_RESET_BATTERY_FILTER diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h b/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h index c881bed68c..a45d1b712f 100644 --- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h @@ -107,10 +107,6 @@ #define BATT_AVE_SAMPLES 128 #define ICHARGER_AVE_SAMPLES 32 -void powermgmt_init_target(void); -void charging_algorithm_step(void); -void charging_algorithm_close(void); - /* Provide filtered charge current */ int battery_charge_current(void); diff --git a/firmware/target/arm/philips/sa9200/powermgmt-target.h b/firmware/target/arm/philips/sa9200/powermgmt-target.h index 4400cda5d1..37ea310efe 100644 --- a/firmware/target/arm/philips/sa9200/powermgmt-target.h +++ b/firmware/target/arm/philips/sa9200/powermgmt-target.h @@ -36,10 +36,6 @@ */ #define ADC_BATTERY ADC_RTCSUP -void powermgmt_init_target(void); -void charging_algorithm_step(void); -void charging_algorithm_close(void); - /* We want to be able to reset the averaging filter */ #define HAVE_RESET_BATTERY_FILTER diff --git a/firmware/target/arm/sandisk/powermgmt-target.h b/firmware/target/arm/sandisk/powermgmt-target.h index aa6a0e0e3d..cb1ccf55c4 100644 --- a/firmware/target/arm/sandisk/powermgmt-target.h +++ b/firmware/target/arm/sandisk/powermgmt-target.h @@ -47,10 +47,6 @@ #define ADC_BATTERY ADC_RTCSUP #endif -void powermgmt_init_target(void); -void charging_algorithm_step(void); -void charging_algorithm_close(void); - /* We want to be able to reset the averaging filter */ #define HAVE_RESET_BATTERY_FILTER diff --git a/firmware/target/sh/archos/recorder/powermgmt-recorder.c b/firmware/target/sh/archos/recorder/powermgmt-recorder.c index 0bce1585cd..1e78b8d155 100644 --- a/firmware/target/sh/archos/recorder/powermgmt-recorder.c +++ b/firmware/target/sh/archos/recorder/powermgmt-recorder.c @@ -65,6 +65,10 @@ int _battery_voltage(void) return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; } +void powermgmt_init_target(void) +{ +} + /** Charger control **/ #ifdef CHARGING_DEBUG_FILE #include "file.h" @@ -483,12 +487,12 @@ void charging_algorithm_step(void) charger_enable(trickle_sec > 0); } -#ifdef CHARGING_DEBUG_FILE void charging_algorithm_close(void) { +#ifdef CHARGING_DEBUG_FILE debug_file_close(); -} #endif /* CHARGING_DEBUG_FILE */ +} /* Returns true if the unit is charging the batteries. */ bool charging_state(void) diff --git a/firmware/target/sh/archos/recorder/powermgmt-target.h b/firmware/target/sh/archos/recorder/powermgmt-target.h index 7792c05185..6b68d05bd4 100644 --- a/firmware/target/sh/archos/recorder/powermgmt-target.h +++ b/firmware/target/sh/archos/recorder/powermgmt-target.h @@ -86,18 +86,4 @@ bool charger_enabled(void); /* Battery filter lengths in samples */ #define BATT_AVE_SAMPLES 32 -/* No init to do */ -#if !(CONFIG_PLATFORM & PLATFORM_HOSTED) -static inline void powermgmt_init_target(void) {} -#endif -void charging_algorithm_step(void); - -#ifdef CHARGING_DEBUG_FILE -/* Need to flush and close debug file */ -void charging_algorithm_close(void); -#else -/* No poweroff operation to do */ -static inline void charging_algorithm_close(void) {} -#endif - #endif /* POWERMGMT_TARGET_H */ -- cgit v1.2.3