Removed car adapter mode for Ondio, and changed the misleading config option HAVE_BATTERIES to the more appropriate HAVE_CHARGING

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5242 a1c6a512-1295-4272-9138-f99709370657

9 files changed, 15 insertions, 9 deletions

diff --git a/apps/main.c b/apps/main.c
index 01202a9184..536a181845 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -151,7 +151,7 @@ void init(void)
 
     powermgmt_init();
 
-#ifdef HAVE_BATTERIES
+#ifdef HAVE_CHARGING
     if (coldstart && charger_inserted() && !global_settings.car_adapter_mode)
     {
         rc = charging_screen(); /* display a "charging" screen */
diff --git a/apps/screens.c b/apps/screens.c
index 64382cc0ed..b31067ad27 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -231,7 +231,7 @@ void charging_display_info(bool animate)
 }
 #endif
 
-#ifdef HAVE_BATTERIES
+#ifdef HAVE_CHARGING
 /* blocks while charging, returns on event:
    1 if charger cable was removed
    2 if Off/Stop key was pressed
@@ -283,7 +283,7 @@ int charging_screen(void)
 
     return rc;
 }
-#endif /* HAVE_BATTERIES */
+#endif /* HAVE_CHARGING */
 
 
 #if CONFIG_KEYPAD == RECORDER_PAD
diff --git a/apps/settings.c b/apps/settings.c
index 3b6a048def..2765ae8e52 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -224,7 +224,9 @@ static const struct bit_entry rtc_bits[] =
 #elif CONFIG_BATTERY == BATT_3AAA_ALKALINE
     {12, S_O(battery_capacity), 1000, "battery capacity", NULL },
 #endif
+#ifdef HAVE_CHARGING
     {1, S_O(car_adapter_mode), false, "car adapter mode", off_on },
+#endif
 
     /* new stuff to be added here */
     /* If values are just added to the end, no need to bump the version. */
@@ -281,7 +283,7 @@ static const struct bit_entry hd_bits[] =
     {1, S_O(browse_current), false, "follow playlist", off_on },
     /* playlist */
     {1, S_O(playlist_viewer_icons), true, "playlist viewer icons", off_on },
-    {1, S_O(playlist_viewer_indices), true, 
+    {1, S_O(playlist_viewer_indices), true,
         "playlist viewer indices", off_on },
     {1, S_O(playlist_viewer_track_display), 0, 
         "playlist viewer track display", "track name,full path" },
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 61d2519662..2579d7b4dc 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -58,6 +58,7 @@ void dac_line_in(bool enable);
 /* This flag is set by dirbrowse() if a new language is loaded */
 bool language_changed;
 
+#ifdef HAVE_CHARGING
 static bool car_adapter_mode(void)
 {
     return set_bool_options( str(LANG_CAR_ADAPTER_MODE),
@@ -66,6 +67,7 @@ static bool car_adapter_mode(void)
                              STR(LANG_SET_BOOL_NO),
                              set_car_adapter_mode);
 }
+#endif
 
 static bool contrast(void)
 {
@@ -1351,7 +1353,9 @@ static bool system_settings_menu(void)
 #if CONFIG_HWCODEC == MAS3507D
         { ID2P(LANG_LINE_IN),          line_in                },
 #endif
+#ifdef HAVE_CHARGING
         { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode       },
+#endif
         { ID2P(LANG_MANAGE_MENU),      manage_settings_menu   },
     };
 
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 8d3f1a1051..aec31c2b84 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -62,7 +62,7 @@
 #define USB_FMRECORDERSTYLE 1
 
 /* Define this if the platform can charge batteries */
-#define HAVE_BATTERIES 1
+#define HAVE_CHARGING 1
 
 /* The start address index for ROM builds */
 #define ROM_START 0x14010
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index a3e982a062..d7931b20df 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -20,7 +20,7 @@
 #define CONFIG_BATTERY BATT_LIION2200
 
 /* Define this if the platform can charge batteries */
-#define HAVE_BATTERIES 1
+#define HAVE_CHARGING 1
 
 /* The start address index for ROM builds */
 #define ROM_START 0x11010
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index d457ef40fd..d935a58edc 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -48,7 +48,7 @@
 #define USB_PLAYERSTYLE 1
 
 /* Define this if the platform can charge batteries */
-#define HAVE_BATTERIES 1
+#define HAVE_CHARGING 1
 
 /* Define this for programmable LED available */
 #define HAVE_LED
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index 1e90a05248..9aacb490dd 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -56,7 +56,7 @@
 #define USB_RECORDERSTYLE 1
 
 /* Define this if the platform can charge batteries */
-#define HAVE_BATTERIES 1
+#define HAVE_CHARGING 1
 
 /* The start address index for ROM builds */
 #define ROM_START 0x11010
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index b676a180ed..8addf78858 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -62,7 +62,7 @@
 #define USB_FMRECORDERSTYLE 1
 
 /* Define this if the platform can charge batteries */
-#define HAVE_BATTERIES 1
+#define HAVE_CHARGING 1
 
 /* The start address index for ROM builds */
 #define ROM_START 0x12010