From 14cfc65414387c96025f2dbbda332dcf1c404fcb Mon Sep 17 00:00:00 2001 From: Hristo Kovachev Date: Tue, 7 Feb 2006 14:46:03 +0000 Subject: 1. Updated battery_bench plugin: 1.1 Don't use the plugin_get_buffer() so the playlist viewer should work with this plugin running; 1.2 Added new columns for charger inserted, charging, usb powered; 1.3 Some other small improvements 2. charger_inserted() again returns only the AC/DC charger state on H3x0, doesn't include the usb state; 3. Some ifdefs corrected in power.c and power.h; git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8607 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/power.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'firmware/drivers') diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index 5feece67f0..d7750a33b2 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c @@ -105,13 +105,12 @@ void power_init(void) #endif } + #ifdef HAVE_CHARGING bool charger_inserted(void) { -#if defined(IRIVER_H100_SERIES) +#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) return (GPIO1_READ & 0x00400000)?true:false; -#elif defined(IRIVER_H300_SERIES) - return (GPIO1_READ & 0x00400000) || usb_powered(); #elif defined(GMINI_ARCH) return (P7 & 0x80) == 0; #elif defined(IAUDIO_X5) -- cgit v1.2.3