Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert 64d048be. It breaks h300.

Browse source 
HAVE_USB_CHARGING_ENABLE is not only used for software usb, so checking
for HAVE_USBSTACK is wrong.

Change-Id: I422796b517c262f33f35623e992434219e288424
This commit is contained in:
Frank Gevaerts 2012-12-26 18:01:19 +01:00
parent 64d048be2b
commit 18f0ba003c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/menus/settings_menu.c
View file

@ -173,7 +173,7 @@ MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL);
#if BATTERY_TYPES_COUNT > 1
MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL);
#endif
#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
#ifdef HAVE_USB_CHARGING_ENABLE
static int usbcharging_callback(int action,const struct menu_item_ex *this_item)
{
(void)this_item;
@ -194,7 +194,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
#if BATTERY_TYPES_COUNT > 1
&battery_type,
#endif
#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
#ifdef HAVE_USB_CHARGING_ENABLE
&usb_charging,
#endif
);

2
apps/settings.c
View file

@ -1020,7 +1020,7 @@ void settings_apply(bool read_disk)
touchpad_set_sensitivity(global_settings.touchpad_sensitivity);
#endif
#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
#ifdef HAVE_USB_CHARGING_ENABLE
usb_charging_enable(global_settings.usb_charging);
#endif

2
apps/settings.h
View file

@ -619,7 +619,7 @@ struct user_settings
#ifdef HAVE_SPDIF_POWER
bool spdif_enable; /* S/PDIF power on/off */
#endif
#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
#ifdef HAVE_USB_CHARGING_ENABLE
int usb_charging;
#endif

2
apps/settings_list.c
View file

@ -1690,7 +1690,7 @@ const struct settings_list settings[] = {
#ifdef HAVE_LCD_BITMAP
TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"),
#endif
#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
#ifdef HAVE_USB_CHARGING_ENABLE
CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 1, "usb charging",
"off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO),
ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)),