From cb335df0c6df2a1bc752320d8e64084ba8800fcd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Fri, 12 Oct 2012 14:58:49 +0200 Subject: [PATCH] Update rx51_battery.patch - Added max value to table rx51_temp_table2, removed unneeded code --- .../debian/patches/rx51_battery.patch | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/kernel-power-2.6.28/debian/patches/rx51_battery.patch b/kernel-power-2.6.28/debian/patches/rx51_battery.patch index 0576129..dd80bc2 100644 --- a/kernel-power-2.6.28/debian/patches/rx51_battery.patch +++ b/kernel-power-2.6.28/debian/patches/rx51_battery.patch @@ -1,6 +1,6 @@ --- /dev/null +++ kernel-power/drivers/power/rx51_battery.c -@@ -0,0 +1,263 @@ +@@ -0,0 +1,257 @@ +/* + rx51_battery.c - Nokia RX-51 battery driver + Copyright (C) 2012 Pali Rohár @@ -88,7 +88,7 @@ + TEMP is between 53 C and -32 C + RAW is between 25 and 993 + */ -+static u8 rx51_temp_table2_first = 53; ++#define rx51_temp_table2_first 53 +static u16 rx51_temp_table2[] = { + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 39, + 40, 41, 43, 44, 46, 48, 49, 51, 53, 55, 57, 59, 61, 64, @@ -96,7 +96,7 @@ + 115, 119, 125, 130, 136, 141, 148, 154, 161, 168, 176, 184, 202, 211, + 221, 231, 242, 254, 266, 279, 293, 308, 323, 340, 357, 375, 395, 415, + 437, 460, 485, 511, 539, 568, 600, 633, 669, 706, 747, 790, 836, 885, -+ 937, 993 ++ 937, 993, 1024 +}; + +/* @@ -119,13 +119,7 @@ + + /* First check for temperature in first direct table */ + if (raw < ARRAY_SIZE(rx51_temp_table1)) -+ return rx51_temp_table1[raw]; -+ -+ /* Possible correct values which are not in tables */ -+ if (raw < rx51_temp_table2[min]) -+ return rx51_temp_table2_first-min; -+ if (raw > rx51_temp_table2[max]) -+ return rx51_temp_table2_first-max; ++ return rx51_temp_table1[raw] * 100; + + /* Binary search RAW value in second inverse table */ + while (max-min > 1) { -- 1.7.9.5