diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2012-12-26 18:01:19 +0100 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2012-12-26 18:01:19 +0100 |
| commit | 18f0ba003c0f71c086eb83f8c2bb3f67dba881be (patch) | |
| tree | af9abef8b7ed24d264f2c44907b2b12adb7d029c | |
| parent | 64d048be2bf6c3977a29bd03a47b19c2c5cf58cd (diff) | |
| download | rockbox-18f0ba003c0f71c086eb83f8c2bb3f67dba881be.zip rockbox-18f0ba003c0f71c086eb83f8c2bb3f67dba881be.tar.gz rockbox-18f0ba003c0f71c086eb83f8c2bb3f67dba881be.tar.bz2 rockbox-18f0ba003c0f71c086eb83f8c2bb3f67dba881be.tar.xz | |
Revert 64d048be. It breaks h300.
HAVE_USB_CHARGING_ENABLE is not only used for software usb, so checking
for HAVE_USBSTACK is wrong.
Change-Id: I422796b517c262f33f35623e992434219e288424
| -rw-r--r-- | apps/menus/settings_menu.c | 4 | ||||
| -rw-r--r-- | apps/settings.c | 2 | ||||
| -rw-r--r-- | apps/settings.h | 2 | ||||
| -rw-r--r-- | apps/settings_list.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 23807e2..95423a2 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -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 ); diff --git a/apps/settings.c b/apps/settings.c index a0f219e..e2a6efa 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -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 diff --git a/apps/settings.h b/apps/settings.h index 94967c3..2af29ce 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -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 diff --git a/apps/settings_list.c b/apps/settings_list.c index 9b1fea4..f27c13c 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -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)), |