diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config-fmrecorder.h | 4 | ||||
-rw-r--r-- | firmware/export/config-gigabeat.h | 4 | ||||
-rw-r--r-- | firmware/export/config-gmini120.h | 4 | ||||
-rw-r--r-- | firmware/export/config-gminisp.h | 4 | ||||
-rw-r--r-- | firmware/export/config-h100.h | 8 | ||||
-rw-r--r-- | firmware/export/config-h120.h | 8 | ||||
-rw-r--r-- | firmware/export/config-h300.h | 10 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ifp7xx.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ipod3g.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ipod4g.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ipodcolor.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ipodmini.h | 4 | ||||
-rwxr-xr-x | firmware/export/config-ipodmini2g.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ipodnano.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ipodvideo.h | 6 | ||||
-rw-r--r-- | firmware/export/config-player.h | 4 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 7 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 4 | ||||
-rw-r--r-- | firmware/export/config.h | 5 | ||||
-rw-r--r-- | firmware/export/power.h | 6 | ||||
-rw-r--r-- | firmware/export/powermgmt.h | 22 |
22 files changed, 58 insertions, 70 deletions
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index 8711640e93..7a78d48822 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -90,8 +90,8 @@ | |||
90 | /* How to detect USB */ | 90 | /* How to detect USB */ |
91 | #define USB_FMRECORDERSTYLE 1 | 91 | #define USB_FMRECORDERSTYLE 1 |
92 | 92 | ||
93 | /* Define this if the platform can charge batteries */ | 93 | /* Hardware controlled charging with monitoring */ |
94 | #define HAVE_CHARGING 1 | 94 | #define CONFIG_CHARGING CHARGING_MONITOR |
95 | 95 | ||
96 | /* The start address index for ROM builds */ | 96 | /* The start address index for ROM builds */ |
97 | /* #define ROM_START 0x14010 for behind original Archos */ | 97 | /* #define ROM_START 0x14010 for behind original Archos */ |
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h index 83a92ce140..1ebbdbf908 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h | |||
@@ -61,8 +61,8 @@ | |||
61 | 61 | ||
62 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ | 62 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ |
63 | 63 | ||
64 | /* Define this if the platform can charge batteries */ | 64 | /* Hardware controlled charging? FIXME */ |
65 | #define HAVE_CHARGING 1 | 65 | #define CONFIG_CHARGING CHARGING_SIMPLE |
66 | 66 | ||
67 | /* define this if the hardware can be powered off while charging */ | 67 | /* define this if the hardware can be powered off while charging */ |
68 | #define HAVE_POWEROFF_WHILE_CHARGING | 68 | #define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h index 42424bb7b1..66ba7af09e 100644 --- a/firmware/export/config-gmini120.h +++ b/firmware/export/config-gmini120.h | |||
@@ -54,8 +54,8 @@ | |||
54 | #define BATTERY_SCALE_FACTOR 6465 | 54 | #define BATTERY_SCALE_FACTOR 6465 |
55 | /* chosen values at random -- jyp */ | 55 | /* chosen values at random -- jyp */ |
56 | 56 | ||
57 | /* Define this if the platform can charge batteries */ | 57 | /* Hardware controlled charging? FIXME */ |
58 | #define HAVE_CHARGING 1 | 58 | #define CONFIG_CHARGING CHARGING_SIMPLE |
59 | 59 | ||
60 | #define CPU_FREQ 30000000 | 60 | #define CPU_FREQ 30000000 |
61 | /* approximate value (and false in general since freq is variable) */ | 61 | /* approximate value (and false in general since freq is variable) */ |
diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h index e066661061..8df7b0f5a1 100644 --- a/firmware/export/config-gminisp.h +++ b/firmware/export/config-gminisp.h | |||
@@ -45,8 +45,8 @@ | |||
45 | #define BATTERY_SCALE_FACTOR 6465 | 45 | #define BATTERY_SCALE_FACTOR 6465 |
46 | /* chosen values at random -- jyp */ | 46 | /* chosen values at random -- jyp */ |
47 | 47 | ||
48 | /* Define this if the platform can charge batteries */ | 48 | /* Hardware controlled charging? FIXME */ |
49 | #define HAVE_CHARGING 1 | 49 | #define CONFIG_CHARGING CHARGING_SIMPLE |
50 | 50 | ||
51 | #define CPU_FREQ 30000000 | 51 | #define CPU_FREQ 30000000 |
52 | /* approximate value (and false in general since freq is variable) */ | 52 | /* approximate value (and false in general since freq is variable) */ |
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index d53adcec14..4461cc2d44 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -89,11 +89,9 @@ | |||
89 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 89 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
90 | #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ | 90 | #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ |
91 | 91 | ||
92 | /* Define this if the platform can charge batteries */ | 92 | /* Hardware controlled charging */ |
93 | #define HAVE_CHARGING 1 | 93 | //#define CONFIG_CHARGING CHARGING_SIMPLE |
94 | 94 | #define CONFIG_CHARGING CHARGING_MONITOR /* FIXME: remove that once monitoring is fixed properly */ | |
95 | /* For units with a hardware charger that reports charge state */ | ||
96 | #define HAVE_CHARGE_STATE 1 | ||
97 | 95 | ||
98 | /* define this if the hardware can be powered off while charging */ | 96 | /* define this if the hardware can be powered off while charging */ |
99 | #define HAVE_POWEROFF_WHILE_CHARGING | 97 | #define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 34f5059b69..f2cd8c2665 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h | |||
@@ -84,11 +84,9 @@ | |||
84 | /* Define if we have a hardware defect that causes ticking on the audio line */ | 84 | /* Define if we have a hardware defect that causes ticking on the audio line */ |
85 | #define HAVE_REMOTE_LCD_TICKING | 85 | #define HAVE_REMOTE_LCD_TICKING |
86 | 86 | ||
87 | /* Define this if the platform can charge batteries */ | 87 | /* Hardware controlled charging */ |
88 | #define HAVE_CHARGING 1 | 88 | //#define CONFIG_CHARGING CHARGING_SIMPLE |
89 | 89 | #define CONFIG_CHARGING CHARGING_MONITOR /* FIXME: remove that once monitoring is fixed properly */ | |
90 | /* For units with a hardware charger that reports charge state */ | ||
91 | #define HAVE_CHARGE_STATE 1 | ||
92 | 90 | ||
93 | /* define this if the hardware can be powered off while charging */ | 91 | /* define this if the hardware can be powered off while charging */ |
94 | #define HAVE_POWEROFF_WHILE_CHARGING | 92 | #define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index ae1940c987..7ed54958ca 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h | |||
@@ -85,14 +85,8 @@ | |||
85 | /* Define if we have a hardware defect that causes ticking on the audio line */ | 85 | /* Define if we have a hardware defect that causes ticking on the audio line */ |
86 | #define HAVE_REMOTE_LCD_TICKING | 86 | #define HAVE_REMOTE_LCD_TICKING |
87 | 87 | ||
88 | /* Define this if the platform can charge batteries */ | 88 | /* Hardware controlled charging with monitoring */ |
89 | #define HAVE_CHARGING 1 | 89 | #define CONFIG_CHARGING CHARGING_MONITOR |
90 | |||
91 | /* For units with a hardware charger that reports charge state */ | ||
92 | #define HAVE_CHARGE_STATE 1 | ||
93 | |||
94 | /* define this if the hardware can be powered off while charging */ | ||
95 | #define HAVE_POWEROFF_WHILE_CHARGING | ||
96 | 90 | ||
97 | /* The size of the flash ROM */ | 91 | /* The size of the flash ROM */ |
98 | #define FLASH_SIZE 0x400000 | 92 | #define FLASH_SIZE 0x400000 |
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index 4690feb8fe..b16a142a28 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -65,8 +65,8 @@ | |||
65 | 65 | ||
66 | #define HAVE_TLV320 | 66 | #define HAVE_TLV320 |
67 | 67 | ||
68 | /* Define this if the platform can charge batteries */ | 68 | /* Hardware controlled charging? FIXME */ |
69 | #define HAVE_CHARGING 1 | 69 | #define CONFIG_CHARGING CHARGING_SIMPLE |
70 | 70 | ||
71 | /* define this if the hardware can be powered off while charging */ | 71 | /* define this if the hardware can be powered off while charging */ |
72 | #define HAVE_POWEROFF_WHILE_CHARGING | 72 | #define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config-ifp7xx.h index 9e5a432260..6247625618 100644 --- a/firmware/export/config-ifp7xx.h +++ b/firmware/export/config-ifp7xx.h | |||
@@ -56,8 +56,8 @@ | |||
56 | 56 | ||
57 | #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ | 57 | #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ |
58 | 58 | ||
59 | /* Define this if the platform can charge batteries */ | 59 | /* Hardware controlled charging? FIXME */ |
60 | //#define HAVE_CHARGING 1 | 60 | //#define CONFIG_CHARGING CHARGING_SIMPLE |
61 | 61 | ||
62 | /* define this if the hardware can be powered off while charging */ | 62 | /* define this if the hardware can be powered off while charging */ |
63 | //#define HAVE_POWEROFF_WHILE_CHARGING | 63 | //#define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index a611dfdcaa..b3b5d14e85 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h | |||
@@ -68,8 +68,8 @@ | |||
68 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 68 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
69 | #define BATTERY_SCALE_FACTOR 5865 | 69 | #define BATTERY_SCALE_FACTOR 5865 |
70 | 70 | ||
71 | /* Define this if the platform can charge batteries */ | 71 | /* Hardware controlled charging? FIXME */ |
72 | //#define HAVE_CHARGING 1 | 72 | //#define CONFIG_CHARGING CHARGING_SIMPLE |
73 | 73 | ||
74 | /* define this if the hardware can be powered off while charging */ | 74 | /* define this if the hardware can be powered off while charging */ |
75 | //#define HAVE_POWEROFF_WHILE_CHARGING | 75 | //#define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index fa664acdb6..46abbdf72b 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h | |||
@@ -70,8 +70,8 @@ | |||
70 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 70 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
71 | #define BATTERY_SCALE_FACTOR 5865 | 71 | #define BATTERY_SCALE_FACTOR 5865 |
72 | 72 | ||
73 | /* Define this if the platform can charge batteries */ | 73 | /* Hardware controlled charging? FIXME */ |
74 | //#define HAVE_CHARGING 1 | 74 | //#define CONFIG_CHARGING CHARGING_SIMPLE |
75 | 75 | ||
76 | /* define this if the hardware can be powered off while charging */ | 76 | /* define this if the hardware can be powered off while charging */ |
77 | //#define HAVE_POWEROFF_WHILE_CHARGING | 77 | //#define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index b8f3d89346..e063e93737 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h | |||
@@ -69,8 +69,8 @@ | |||
69 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 69 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
70 | #define BATTERY_SCALE_FACTOR 5865 | 70 | #define BATTERY_SCALE_FACTOR 5865 |
71 | 71 | ||
72 | /* Define this if the platform can charge batteries */ | 72 | /* Hardware controlled charging? FIXME */ |
73 | //#define HAVE_CHARGING 1 | 73 | //#define CONFIG_CHARGING CHARGING_SIMPLE |
74 | 74 | ||
75 | /* define this if the hardware can be powered off while charging */ | 75 | /* define this if the hardware can be powered off while charging */ |
76 | //#define HAVE_POWEROFF_WHILE_CHARGING | 76 | //#define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 64be801577..4871ea0acc 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h | |||
@@ -70,8 +70,8 @@ | |||
70 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 70 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
71 | #define BATTERY_SCALE_FACTOR 5865 | 71 | #define BATTERY_SCALE_FACTOR 5865 |
72 | 72 | ||
73 | /* Define this if the platform can charge batteries */ | 73 | /* Hardware controlled charging? FIXME */ |
74 | //#define HAVE_CHARGING 1 | 74 | //#define CONFIG_CHARGING CHARGING_SIMPLE |
75 | 75 | ||
76 | /* define this if the hardware can be powered off while charging */ | 76 | /* define this if the hardware can be powered off while charging */ |
77 | //#define HAVE_POWEROFF_WHILE_CHARGING | 77 | //#define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 454309a786..adbb0973ac 100755 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h | |||
@@ -73,8 +73,8 @@ | |||
73 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 73 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
74 | #define BATTERY_SCALE_FACTOR 5865 | 74 | #define BATTERY_SCALE_FACTOR 5865 |
75 | 75 | ||
76 | /* Define this if the platform can charge batteries */ | 76 | /* Hardware controlled charging? FIXME */ |
77 | //#define HAVE_CHARGING 1 | 77 | //#define CONFIG_CHARGING CHARGING_SIMPLE |
78 | 78 | ||
79 | /* define this if the hardware can be powered off while charging */ | 79 | /* define this if the hardware can be powered off while charging */ |
80 | //#define HAVE_POWEROFF_WHILE_CHARGING | 80 | //#define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index b7116bf249..3d4deb3abd 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h | |||
@@ -74,8 +74,8 @@ | |||
74 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 74 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
75 | #define BATTERY_SCALE_FACTOR 5865 | 75 | #define BATTERY_SCALE_FACTOR 5865 |
76 | 76 | ||
77 | /* Define this if the platform can charge batteries */ | 77 | /* Hardware controlled charging? FIXME */ |
78 | //#define HAVE_CHARGING 1 | 78 | //#define CONFIG_CHARGING CHARGING_SIMPLE |
79 | 79 | ||
80 | /* define this if the hardware can be powered off while charging */ | 80 | /* define this if the hardware can be powered off while charging */ |
81 | //#define HAVE_POWEROFF_WHILE_CHARGING | 81 | //#define HAVE_POWEROFF_WHILE_CHARGING |
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index 1bbcfec157..79ef1a85ac 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h | |||
@@ -74,14 +74,12 @@ | |||
74 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 74 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
75 | #define BATTERY_SCALE_FACTOR 5865 | 75 | #define BATTERY_SCALE_FACTOR 5865 |
76 | 76 | ||
77 | /* Define this if the platform can charge batteries */ | 77 | /* Hardware controlled charging with monitoring */ |
78 | #define HAVE_CHARGING 1 | 78 | #define CONFIG_CHARGING CHARGING_MONITOR |
79 | 79 | ||
80 | /* define this if the hardware can be powered off while charging */ | 80 | /* define this if the hardware can be powered off while charging */ |
81 | //#define HAVE_POWEROFF_WHILE_CHARGING | 81 | //#define HAVE_POWEROFF_WHILE_CHARGING |
82 | 82 | ||
83 | #define HAVE_CHARGE_STATE 1 | ||
84 | |||
85 | /* The start address index for ROM builds */ | 83 | /* The start address index for ROM builds */ |
86 | #define ROM_START 0x00000000 | 84 | #define ROM_START 0x00000000 |
87 | 85 | ||
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 324a0a2300..3dfdb0e727 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h | |||
@@ -67,8 +67,8 @@ | |||
67 | /* How to detect USB */ | 67 | /* How to detect USB */ |
68 | #define USB_PLAYERSTYLE 1 | 68 | #define USB_PLAYERSTYLE 1 |
69 | 69 | ||
70 | /* Define this if the platform can charge batteries */ | 70 | /* Hardware controlled charging */ |
71 | #define HAVE_CHARGING 1 | 71 | #define CONFIG_CHARGING CHARGING_SIMPLE |
72 | 72 | ||
73 | /* The start address index for ROM builds */ | 73 | /* The start address index for ROM builds */ |
74 | /* #define ROM_START 0xD010 for behind original Archos */ | 74 | /* #define ROM_START 0xD010 for behind original Archos */ |
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 92dd07695d..854b1c1ade 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -45,9 +45,6 @@ | |||
45 | /* Define this if you have a SH7034 */ | 45 | /* Define this if you have a SH7034 */ |
46 | #define CONFIG_CPU SH7034 | 46 | #define CONFIG_CPU SH7034 |
47 | 47 | ||
48 | /* Define this if you have charging control */ | ||
49 | #define HAVE_CHARGE_CTRL | ||
50 | |||
51 | /* Define this if you have ATA power-off control */ | 48 | /* Define this if you have ATA power-off control */ |
52 | #define HAVE_ATA_POWER_OFF | 49 | #define HAVE_ATA_POWER_OFF |
53 | 50 | ||
@@ -80,8 +77,8 @@ | |||
80 | /* How to detect USB */ | 77 | /* How to detect USB */ |
81 | #define USB_RECORDERSTYLE 1 | 78 | #define USB_RECORDERSTYLE 1 |
82 | 79 | ||
83 | /* Define this if the platform can charge batteries */ | 80 | /* Software controlled charging */ |
84 | #define HAVE_CHARGING 1 | 81 | #define CONFIG_CHARGING CHARGING_CONTROL |
85 | 82 | ||
86 | /* The start address index for ROM builds */ | 83 | /* The start address index for ROM builds */ |
87 | /* #define ROM_START 0x11010 for behind original Archos */ | 84 | /* #define ROM_START 0x11010 for behind original Archos */ |
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index b508836080..09823cffb2 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -90,8 +90,8 @@ | |||
90 | /* How to detect USB */ | 90 | /* How to detect USB */ |
91 | #define USB_FMRECORDERSTYLE 1 | 91 | #define USB_FMRECORDERSTYLE 1 |
92 | 92 | ||
93 | /* Define this if the platform can charge batteries */ | 93 | /* Hardware controlled charging with monitoring */ |
94 | #define HAVE_CHARGING 1 | 94 | #define CONFIG_CHARGING CHARGING_MONITOR |
95 | 95 | ||
96 | /* The start address index for ROM builds */ | 96 | /* The start address index for ROM builds */ |
97 | /* #define ROM_START 0x12010 for behind original Archos */ | 97 | /* #define ROM_START 0x12010 for behind original Archos */ |
diff --git a/firmware/export/config.h b/firmware/export/config.h index d919b8b4f6..910aeca4eb 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -68,6 +68,11 @@ | |||
68 | #define BATT_3AAA 1000 /* Ondio */ | 68 | #define BATT_3AAA 1000 /* Ondio */ |
69 | #define BATT_LIPOL1300 1300 /* the type used in iRiver h1x0 models */ | 69 | #define BATT_LIPOL1300 1300 /* the type used in iRiver h1x0 models */ |
70 | 70 | ||
71 | /* CONFIG_CHARGING */ | ||
72 | #define CHARGING_SIMPLE 1 /* Simple, hardware controlled charging */ | ||
73 | #define CHARGING_MONITOR 2 /* Hardware controlled charging with monitoring */ | ||
74 | #define CHARGING_CONTROL 3 /* Software controlled charging */ | ||
75 | |||
71 | /* CONFIG_LCD */ | 76 | /* CONFIG_LCD */ |
72 | #define LCD_GMINI100 0 | 77 | #define LCD_GMINI100 0 |
73 | #define LCD_SSD1815 1 /* as used by Archos Recorders and Ondios */ | 78 | #define LCD_SSD1815 1 /* as used by Archos Recorders and Ondios */ |
diff --git a/firmware/export/power.h b/firmware/export/power.h index be8ebda5b0..dc6c09d9f9 100644 --- a/firmware/export/power.h +++ b/firmware/export/power.h | |||
@@ -19,12 +19,12 @@ | |||
19 | #ifndef _POWER_H_ | 19 | #ifndef _POWER_H_ |
20 | #define _POWER_H_ | 20 | #define _POWER_H_ |
21 | 21 | ||
22 | #ifdef HAVE_CHARGE_CTRL | 22 | #if CONFIG_CHARGING == CHARGING_CONTROL |
23 | extern bool charger_enabled; | 23 | extern bool charger_enabled; |
24 | void charger_enable(bool on); | 24 | void charger_enable(bool on); |
25 | #endif | 25 | #endif |
26 | 26 | ||
27 | #ifdef HAVE_CHARGING | 27 | #ifdef CONFIG_CHARGING |
28 | bool charger_inserted(void); | 28 | bool charger_inserted(void); |
29 | #endif | 29 | #endif |
30 | 30 | ||
@@ -35,7 +35,7 @@ void ide_power_enable(bool on); | |||
35 | 35 | ||
36 | void power_init(void); | 36 | void power_init(void); |
37 | 37 | ||
38 | # ifdef HAVE_CHARGE_STATE | 38 | # if CONFIG_CHARGING == CHARGING_MONITOR |
39 | bool charging_state(void); | 39 | bool charging_state(void); |
40 | # endif | 40 | # endif |
41 | 41 | ||
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index 6c31aeec52..30fe60c293 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #ifndef SIMULATOR | 29 | #ifndef SIMULATOR |
30 | 30 | ||
31 | #ifdef HAVE_CHARGE_CTRL | 31 | #if CONFIG_CHARGING == CHARGING_CONTROL |
32 | #define START_TOPOFF_CHG 85 /* Battery % to start at top-off */ | 32 | #define START_TOPOFF_CHG 85 /* Battery % to start at top-off */ |
33 | #define START_TRICKLE_CHG 95 /* Battery % to start at trickle */ | 33 | #define START_TRICKLE_CHG 95 /* Battery % to start at trickle */ |
34 | 34 | ||
@@ -59,23 +59,21 @@ extern int pid_p; /* PID proportional term */ | |||
59 | extern int pid_i; /* PID integral term */ | 59 | extern int pid_i; /* PID integral term */ |
60 | extern int trickle_sec; /* trickle charge: How many seconds per minute are we charging actually? */ | 60 | extern int trickle_sec; /* trickle charge: How many seconds per minute are we charging actually? */ |
61 | 61 | ||
62 | #endif /* HAVE_CHARGE_CTRL */ | 62 | #endif /* CONFIG_CHARGING == CHARGING_CONTROL */ |
63 | 63 | ||
64 | #if defined(HAVE_CHARGE_CTRL) || \ | 64 | #if CONFIG_CHARGING >= CHARGING_MONITOR |
65 | (CONFIG_BATTERY == BATT_LIION2200) || \ | 65 | typedef enum { /* sorted by increasing charging current */ |
66 | defined(HAVE_CHARGE_STATE) | 66 | DISCHARGING = 0, |
67 | typedef enum { | 67 | TRICKLE, /* Can occur for CONFIG_CHARGING >= CHARGING_MONITOR */ |
68 | DISCHARGING, | 68 | TOPOFF, /* Can occur for CONFIG_CHARGING == CHARGING_CONTROL */ |
69 | CHARGING, | 69 | CHARGING /* Can occur for all CONFIG_CHARGING options */ |
70 | TOPOFF, | ||
71 | TRICKLE | ||
72 | } charge_state_type; | 70 | } charge_state_type; |
73 | 71 | ||
74 | /* tells what the charger is doing */ | 72 | /* tells what the charger is doing */ |
75 | extern charge_state_type charge_state; | 73 | extern charge_state_type charge_state; |
76 | #endif /* defined(HAVE_CHARGE_CTRL) || (CONFIG_BATTERY == BATT_LIION2200) */ | 74 | #endif /* CONFIG_CHARGING >= CHARGING_MONITOR */ |
77 | 75 | ||
78 | #ifdef HAVE_CHARGING | 76 | #ifdef CONFIG_CHARGING |
79 | /* | 77 | /* |
80 | * Flag that the charger has been plugged in/removed: this is set for exactly | 78 | * Flag that the charger has been plugged in/removed: this is set for exactly |
81 | * one time through the power loop when the charger has been plugged in. | 79 | * one time through the power loop when the charger has been plugged in. |