diff options
-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 95423a20fa..23807e2adc 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); | |||
173 | #if BATTERY_TYPES_COUNT > 1 | 173 | #if BATTERY_TYPES_COUNT > 1 |
174 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); | 174 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); |
175 | #endif | 175 | #endif |
176 | #ifdef HAVE_USB_CHARGING_ENABLE | 176 | #if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE) |
177 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) | 177 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) |
178 | { | 178 | { |
179 | (void)this_item; | 179 | (void)this_item; |
@@ -194,7 +194,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, | |||
194 | #if BATTERY_TYPES_COUNT > 1 | 194 | #if BATTERY_TYPES_COUNT > 1 |
195 | &battery_type, | 195 | &battery_type, |
196 | #endif | 196 | #endif |
197 | #ifdef HAVE_USB_CHARGING_ENABLE | 197 | #if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE) |
198 | &usb_charging, | 198 | &usb_charging, |
199 | #endif | 199 | #endif |
200 | ); | 200 | ); |
diff --git a/apps/settings.c b/apps/settings.c index e2a6efa3d8..a0f219efec 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -1020,7 +1020,7 @@ void settings_apply(bool read_disk) | |||
1020 | touchpad_set_sensitivity(global_settings.touchpad_sensitivity); | 1020 | touchpad_set_sensitivity(global_settings.touchpad_sensitivity); |
1021 | #endif | 1021 | #endif |
1022 | 1022 | ||
1023 | #ifdef HAVE_USB_CHARGING_ENABLE | 1023 | #if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE) |
1024 | usb_charging_enable(global_settings.usb_charging); | 1024 | usb_charging_enable(global_settings.usb_charging); |
1025 | #endif | 1025 | #endif |
1026 | 1026 | ||
diff --git a/apps/settings.h b/apps/settings.h index 2af29ce423..94967c3c4c 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -619,7 +619,7 @@ struct user_settings | |||
619 | #ifdef HAVE_SPDIF_POWER | 619 | #ifdef HAVE_SPDIF_POWER |
620 | bool spdif_enable; /* S/PDIF power on/off */ | 620 | bool spdif_enable; /* S/PDIF power on/off */ |
621 | #endif | 621 | #endif |
622 | #ifdef HAVE_USB_CHARGING_ENABLE | 622 | #if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE) |
623 | int usb_charging; | 623 | int usb_charging; |
624 | #endif | 624 | #endif |
625 | 625 | ||
diff --git a/apps/settings_list.c b/apps/settings_list.c index f27c13c4f1..9b1fea4b04 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1690,7 +1690,7 @@ const struct settings_list settings[] = { | |||
1690 | #ifdef HAVE_LCD_BITMAP | 1690 | #ifdef HAVE_LCD_BITMAP |
1691 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), | 1691 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), |
1692 | #endif | 1692 | #endif |
1693 | #ifdef HAVE_USB_CHARGING_ENABLE | 1693 | #if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE) |
1694 | CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 1, "usb charging", | 1694 | CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 1, "usb charging", |
1695 | "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), | 1695 | "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), |
1696 | ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)), | 1696 | ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)), |