freemyipod r960 - Code Review

Repository:	freemyipod
Revision:	< r959‎ \| r960 \| r961 >
Date:	21:09, 19 July 2014
Author:	theseven
Status:	new
Tags:
Comment:	emCORE: iPod Classic: Properly detect external power and charging state
Modified paths:	/emcore/trunk/target/ipodnano3g/power.c (modified) (history)

Diff [purge]

Index: emcore/trunk/target/ipodnano3g/power.c
—	—	@@ -45,17 +45,17 @@
46	46
47	47	bool charging_state(void)
48	48	{
49		~~- return false;~~
	49	+ return (PDAT(11) & 0x10) ? false : true;
50	50	}
51	51
52		~~-bool external_power_state(void)~~
	52	+bool vbus_state(void)
53	53	{
54		~~- return (PDAT(12) & 8) ? false : true;~~
	54	+ return (PDAT(11) & 0x20) ? false : true;
55	55	}
56	56
57		~~-bool vbus_state(void)~~
	57	+bool external_power_state(void)
58	58	{
59		~~- return (PDAT(12) & 8) ? false : true;~~
	59	+ return vbus_state();
60	60	}
61	61
62	62	int read_battery_voltage(int battery)
—	—	@@ -85,7 +85,7 @@
86	86	int read_battery_mwh_current(int battery)
87	87	{
88	88	// TODO: Approximate that better
89		~~- if (battery == 0) return (read_battery_voltage(0) - 3600) * 3;~~
	89	+ if (battery == 0) return MAX(0, (read_battery_voltage(0) - 3600) * 3);
90	90	return -1;
91	91	}
92	92
—	—	@@ -97,6 +97,7 @@
98	98	enum battery_state read_battery_state(int battery)
99	99	{
100	100	if (battery != 0) return BATTERY_STATE_INVALID;
	101	+ if (read_battery_voltage(0) < 100) return BATTERY_STATE_NONPRESENT;
101	102	if (charging_state()) return BATTERY_STATE_CHARGING;
102	103	if (external_power_state()) return BATTERY_STATE_IDLE;
103	104	return BATTERY_STATE_DISCHARGING;
—	—	@@ -123,3 +124,4 @@
124	125	if (external_power_state()) return INPUT_STATE_ACTIVE;
125	126	return INPUT_STATE_NONPRESENT;
126	127	}
	128	+