diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-08-17 06:45:18 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-08-17 06:45:18 +0000 |
commit | 0fac492c3da8b46ad1cf5a668e5d851c63443a94 (patch) | |
tree | 95fb6637601a4b3c730f4aec1d2e7e7ab78e208b /bootloader | |
parent | 12706e4b1d4ce65df441dcf6e2b160657ea3fa38 (diff) | |
download | rockbox-0fac492c3da8b46ad1cf5a668e5d851c63443a94.tar.gz rockbox-0fac492c3da8b46ad1cf5a668e5d851c63443a94.zip |
First step of powermanagement rework: * Move target specific stuff into target tree, starting with battery voltage tables and voltage reading. (This revealed some incorrect percent_to_voltage_charging mappings). * Voltage reading on 1st gen ipods is now correct. * Clean up obsolete config #defines.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14375 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/iaudio_x5.c | 10 | ||||
-rw-r--r-- | bootloader/iriver_h300.c | 10 | ||||
-rw-r--r-- | bootloader/main.c | 10 |
3 files changed, 12 insertions, 18 deletions
diff --git a/bootloader/iaudio_x5.c b/bootloader/iaudio_x5.c index a484bfa125..11c552866b 100644 --- a/bootloader/iaudio_x5.c +++ b/bootloader/iaudio_x5.c | |||
@@ -104,13 +104,11 @@ void shutdown(void) | |||
104 | /* Print the battery voltage (and a warning message). */ | 104 | /* Print the battery voltage (and a warning message). */ |
105 | void check_battery(void) | 105 | void check_battery(void) |
106 | { | 106 | { |
107 | int adc_battery, battery_voltage, batt_int, batt_frac; | 107 | int battery_voltage, batt_int, batt_frac; |
108 | 108 | ||
109 | adc_battery = adc_read(ADC_BATTERY); | 109 | battery_voltage = battery_adc_voltage(); |
110 | 110 | batt_int = battery_voltage / 1000; | |
111 | battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000; | 111 | batt_frac = (battery_voltage % 1000) / 10; |
112 | batt_int = battery_voltage / 100; | ||
113 | batt_frac = battery_voltage % 100; | ||
114 | 112 | ||
115 | printf("Batt: %d.%02dV", batt_int, batt_frac); | 113 | printf("Batt: %d.%02dV", batt_int, batt_frac); |
116 | 114 | ||
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c index 32950a58dc..dab3693050 100644 --- a/bootloader/iriver_h300.c +++ b/bootloader/iriver_h300.c | |||
@@ -109,13 +109,11 @@ void shutdown(void) | |||
109 | /* Print the battery voltage (and a warning message). */ | 109 | /* Print the battery voltage (and a warning message). */ |
110 | void check_battery(void) | 110 | void check_battery(void) |
111 | { | 111 | { |
112 | int adc_battery, battery_voltage, batt_int, batt_frac; | 112 | int battery_voltage, batt_int, batt_frac; |
113 | 113 | ||
114 | adc_battery = adc_read(ADC_BATTERY); | 114 | battery_voltage = battery_adc_voltage(); |
115 | 115 | batt_int = battery_voltage / 1000; | |
116 | battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000; | 116 | batt_frac = (battery_voltage % 1000) / 10; |
117 | batt_int = battery_voltage / 100; | ||
118 | batt_frac = battery_voltage % 100; | ||
119 | 117 | ||
120 | printf("Batt: %d.%02dV", batt_int, batt_frac); | 118 | printf("Batt: %d.%02dV", batt_int, batt_frac); |
121 | 119 | ||
diff --git a/bootloader/main.c b/bootloader/main.c index d78b4adc69..afaef69f45 100644 --- a/bootloader/main.c +++ b/bootloader/main.c | |||
@@ -167,13 +167,11 @@ void shutdown(void) | |||
167 | /* Print the battery voltage (and a warning message). */ | 167 | /* Print the battery voltage (and a warning message). */ |
168 | void check_battery(void) | 168 | void check_battery(void) |
169 | { | 169 | { |
170 | int adc_battery, battery_voltage, batt_int, batt_frac; | 170 | int battery_voltage, batt_int, batt_frac; |
171 | 171 | ||
172 | adc_battery = adc_read(ADC_BATTERY); | 172 | battery_voltage = battery_adc_voltage(); |
173 | 173 | batt_int = battery_voltage / 1000; | |
174 | battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000; | 174 | batt_frac = (battery_voltage % 1000) / 10; |
175 | batt_int = battery_voltage / 100; | ||
176 | batt_frac = battery_voltage % 100; | ||
177 | 175 | ||
178 | printf("Batt: %d.%02dV", batt_int, batt_frac); | 176 | printf("Batt: %d.%02dV", batt_int, batt_frac); |
179 | 177 | ||