From 377b42b63bf49e72f49969ad96eeeef8cc3c4ce2 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 24 Dec 2008 19:36:37 +0000 Subject: H10 can distinguish USB and MAIN charger input so return proper flags. H100s were misconfigured and should use CHARGING_SIMPLE. Comment more on what charging types mean in config.h. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19582 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-h100.h | 3 +-- firmware/export/config-h120.h | 2 +- firmware/export/config.h | 14 ++++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index 7f91e35fbf..be718259f8 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -110,8 +110,7 @@ #define BATTERY_TYPES_COUNT 1 /* only one type */ /* Hardware controlled charging */ - -#define CONFIG_CHARGING CHARGING_MONITOR /* FIXME: remove that once monitoring is fixed properly */ +#define CONFIG_CHARGING CHARGING_SIMPLE /* define current usage levels */ #define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index b4a687b6d7..4757d7708c 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -110,7 +110,7 @@ #define BATTERY_TYPES_COUNT 1 /* only one type */ /* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_MONITOR /* FIXME: remove that once monitoring is fixed properly */ +#define CONFIG_CHARGING CHARGING_SIMPLE /* define current usage levels */ #define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ diff --git a/firmware/export/config.h b/firmware/export/config.h index 1854f59d13..9bc6c7c775 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -116,12 +116,18 @@ /* CONFIG_CHARGING */ /* Generic types */ -#define CHARGING_SIMPLE 1 /* Simple, hardware controlled charging */ -#define CHARGING_MONITOR 2 /* Hardware controlled charging with monitoring */ +#define CHARGING_SIMPLE 1 /* Simple, hardware controlled charging + * (CPU cannot read charger state but may read + * when power is plugged-in). */ +#define CHARGING_MONITOR 2 /* Hardware controlled charging with monitoring + * (CPU is able to read HW charging state and + * when power is plugged-in). */ /* Mostly target-specific code in the /target tree */ -#define CHARGING_TARGET 3 - +#define CHARGING_TARGET 3 /* Any algorithm - usually software controlled + * charging or specific programming is required to + * use the charging hardware. */ + /* CONFIG_LCD */ #define LCD_SSD1815 1 /* as used by Archos Recorders and Ondios */ #define LCD_SSD1801 2 /* as used by Archos Player/Studio */ -- cgit v1.2.3