devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5242 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2004-10-10 01:25:32 +00:00
parent f5bdf6952c
commit ccfa4cd97a
9 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/main.c
View file

@ -151,7 +151,7 @@ void init(void)
powermgmt_init(); powermgmt_init();
#ifdef HAVE_BATTERIES #ifdef HAVE_CHARGING
if (coldstart && charger_inserted() && !global_settings.car_adapter_mode) if (coldstart && charger_inserted() && !global_settings.car_adapter_mode)
{ {
rc = charging_screen(); /* display a "charging" screen */ rc = charging_screen(); /* display a "charging" screen */

4
apps/screens.c
View file

@ -231,7 +231,7 @@ void charging_display_info(bool animate)
} }
#endif #endif
#ifdef HAVE_BATTERIES #ifdef HAVE_CHARGING
/* blocks while charging, returns on event: /* blocks while charging, returns on event:
1 if charger cable was removed 1 if charger cable was removed
2 if Off/Stop key was pressed 2 if Off/Stop key was pressed
@ -283,7 +283,7 @@ int charging_screen(void)
return rc; return rc;
} }
#endif /* HAVE_BATTERIES */ #endif /* HAVE_CHARGING */
#if CONFIG_KEYPAD == RECORDER_PAD #if CONFIG_KEYPAD == RECORDER_PAD

4
apps/settings.c
View file

@ -224,7 +224,9 @@ static const struct bit_entry rtc_bits[] =
#elif CONFIG_BATTERY == BATT_3AAA_ALKALINE #elif CONFIG_BATTERY == BATT_3AAA_ALKALINE
{12, S_O(battery_capacity), 1000, "battery capacity", NULL }, {12, S_O(battery_capacity), 1000, "battery capacity", NULL },
#endif #endif
#ifdef HAVE_CHARGING
{1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, {1, S_O(car_adapter_mode), false, "car adapter mode", off_on },
#endif
/* new stuff to be added here */ /* new stuff to be added here */
/* If values are just added to the end, no need to bump the version. */ /* 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 }, {1, S_O(browse_current), false, "follow playlist", off_on },
/* playlist */ /* playlist */
{1, S_O(playlist_viewer_icons), true, "playlist viewer icons", off_on }, {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 }, "playlist viewer indices", off_on },
{1, S_O(playlist_viewer_track_display), 0, {1, S_O(playlist_viewer_track_display), 0,
"playlist viewer track display", "track name,full path" }, "playlist viewer track display", "track name,full path" },

4
apps/settings_menu.c
View file

@ -58,6 +58,7 @@ void dac_line_in(bool enable);
/* This flag is set by dirbrowse() if a new language is loaded */ /* This flag is set by dirbrowse() if a new language is loaded */
bool language_changed; bool language_changed;
#ifdef HAVE_CHARGING
static bool car_adapter_mode(void) static bool car_adapter_mode(void)
{ {
return set_bool_options( str(LANG_CAR_ADAPTER_MODE), return set_bool_options( str(LANG_CAR_ADAPTER_MODE),
@ -66,6 +67,7 @@ static bool car_adapter_mode(void)
STR(LANG_SET_BOOL_NO), STR(LANG_SET_BOOL_NO),
set_car_adapter_mode); set_car_adapter_mode);
} }
#endif
static bool contrast(void) static bool contrast(void)
{ {
@ -1351,7 +1353,9 @@ static bool system_settings_menu(void)
#if CONFIG_HWCODEC == MAS3507D #if CONFIG_HWCODEC == MAS3507D
{ ID2P(LANG_LINE_IN), line_in }, { ID2P(LANG_LINE_IN), line_in },
#endif #endif
#ifdef HAVE_CHARGING
{ ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode }, { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode },
#endif
{ ID2P(LANG_MANAGE_MENU), manage_settings_menu }, { ID2P(LANG_MANAGE_MENU), manage_settings_menu },
}; };

2
firmware/export/config-fmrecorder.h
View file

@ -62,7 +62,7 @@
#define USB_FMRECORDERSTYLE 1 #define USB_FMRECORDERSTYLE 1
/* Define this if the platform can charge batteries */ /* Define this if the platform can charge batteries */
#define HAVE_BATTERIES 1 #define HAVE_CHARGING 1
/* The start address index for ROM builds */ /* The start address index for ROM builds */
#define ROM_START 0x14010 #define ROM_START 0x14010

2
firmware/export/config-h100.h
View file

@ -20,7 +20,7 @@
#define CONFIG_BATTERY BATT_LIION2200 #define CONFIG_BATTERY BATT_LIION2200
/* Define this if the platform can charge batteries */ /* Define this if the platform can charge batteries */
#define HAVE_BATTERIES 1 #define HAVE_CHARGING 1
/* The start address index for ROM builds */ /* The start address index for ROM builds */
#define ROM_START 0x11010 #define ROM_START 0x11010

2
firmware/export/config-player.h
View file

@ -48,7 +48,7 @@
#define USB_PLAYERSTYLE 1 #define USB_PLAYERSTYLE 1
/* Define this if the platform can charge batteries */ /* Define this if the platform can charge batteries */
#define HAVE_BATTERIES 1 #define HAVE_CHARGING 1
/* Define this for programmable LED available */ /* Define this for programmable LED available */
#define HAVE_LED #define HAVE_LED

2
firmware/export/config-recorder.h
View file

@ -56,7 +56,7 @@
#define USB_RECORDERSTYLE 1 #define USB_RECORDERSTYLE 1
/* Define this if the platform can charge batteries */ /* Define this if the platform can charge batteries */
#define HAVE_BATTERIES 1 #define HAVE_CHARGING 1
/* The start address index for ROM builds */ /* The start address index for ROM builds */
#define ROM_START 0x11010 #define ROM_START 0x11010

2
firmware/export/config-recorderv2.h
View file

@ -62,7 +62,7 @@
#define USB_FMRECORDERSTYLE 1 #define USB_FMRECORDERSTYLE 1
/* Define this if the platform can charge batteries */ /* Define this if the platform can charge batteries */
#define HAVE_BATTERIES 1 #define HAVE_CHARGING 1
/* The start address index for ROM builds */ /* The start address index for ROM builds */
#define ROM_START 0x12010 #define ROM_START 0x12010