devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

HDD6330: Simplify strange OF voltage calculation, it's linear anyway.

Browse source 
Change-Id: I33ecad4a265a4c7e8883da7b6d28fb061a4c8e68
This commit is contained in:
Szymon Dziok 2012-02-26 23:08:15 +01:00
parent e5b5041583
commit 740722f913
1 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
firmware/target/arm/philips/hdd6330/powermgmt-hdd6330.c
View file

@ -24,11 +24,6 @@
#include "adc.h" #include "adc.h"
#include "powermgmt.h" #include "powermgmt.h"
#define SMLAL(lo, hi, x, y) \
asm volatile ("smlal %0, %1, %2, %3" \
: "+r" (lo), "+r" (hi) \
: "%r" (x), "r" (y))
const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
{ {
3550 3550
@ -53,20 +48,11 @@ const unsigned short percent_to_volt_charge[11] =
}; };
#endif /* CONFIG_CHARGING */ #endif /* CONFIG_CHARGING */
#define BATTERY_SCALE_FACTOR 4200 #define BATTERY_SCALE_FACTOR 4536
/* full-scale ADC readout (2^10) in millivolt */ /* full-scale ADC readout (2^10) in millivolt */
/* Returns battery voltage from ADC [millivolts] */ /* Returns battery voltage from ADC [millivolts] */
int _battery_voltage(void) int _battery_voltage(void)
{ {
/* return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; */ return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10;
/* This may be overly complicated (pulled from the OF) */
int lo = 0;
int val = adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR;
SMLAL(lo, val, 0x8a42f871, val);
val>>= 9;
val -= (val >> 31);
return val;
} }