diff options
-rw-r--r-- | apps/debug_menu.c | 4 | ||||
-rw-r--r-- | firmware/usbstack/usb_core.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 3788631c81..f93755a293 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -2367,7 +2367,7 @@ static bool dbg_scrollwheel(void) | |||
2367 | } | 2367 | } |
2368 | #endif | 2368 | #endif |
2369 | 2369 | ||
2370 | #if defined(HAVE_USBSTACK) && defined(ROCKBOX_HAS_LOGF) | 2370 | #if defined(HAVE_USBSTACK) && defined(ROCKBOX_HAS_LOGF) && defined(USB_SERIAL) |
2371 | static bool logf_usb_serial(void) | 2371 | static bool logf_usb_serial(void) |
2372 | { | 2372 | { |
2373 | bool serial_enabled = !usb_core_driver_enabled(USB_DRIVER_SERIAL); | 2373 | bool serial_enabled = !usb_core_driver_enabled(USB_DRIVER_SERIAL); |
@@ -2457,7 +2457,7 @@ static const struct the_menu_item menuitems[] = { | |||
2457 | {"logf", logfdisplay }, | 2457 | {"logf", logfdisplay }, |
2458 | {"logfdump", logfdump }, | 2458 | {"logfdump", logfdump }, |
2459 | #endif | 2459 | #endif |
2460 | #if defined(HAVE_USBSTACK) && defined(ROCKBOX_HAS_LOGF) | 2460 | #if defined(HAVE_USBSTACK) && defined(ROCKBOX_HAS_LOGF) && defined(USB_SERIAL) |
2461 | {"logf over usb",logf_usb_serial }, | 2461 | {"logf over usb",logf_usb_serial }, |
2462 | #endif | 2462 | #endif |
2463 | #ifdef CPU_BOOST_LOGGING | 2463 | #ifdef CPU_BOOST_LOGGING |
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index ff54e4269f..e0aaa9b2f4 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c | |||
@@ -183,10 +183,10 @@ static enum { DEFAULT, ADDRESS, CONFIGURED } usb_state; | |||
183 | 183 | ||
184 | static int usb_core_num_interfaces; | 184 | static int usb_core_num_interfaces; |
185 | 185 | ||
186 | int usb_charging_get_config_descriptor(unsigned char *dest,int max_packet_size, | 186 | static int usb_charging_get_config_descriptor(unsigned char *dest,int max_packet_size, |
187 | int interface_number,int endpoint); | 187 | int interface_number,int endpoint); |
188 | 188 | ||
189 | struct usb_class_driver drivers[] = | 189 | static struct usb_class_driver drivers[USB_NUM_DRIVERS] = |
190 | { | 190 | { |
191 | #ifdef USB_STORAGE | 191 | #ifdef USB_STORAGE |
192 | [USB_DRIVER_MASS_STORAGE] = { | 192 | [USB_DRIVER_MASS_STORAGE] = { |
@@ -325,7 +325,7 @@ void usb_core_init(void) | |||
325 | logf("usb_core_init() finished"); | 325 | logf("usb_core_init() finished"); |
326 | } | 326 | } |
327 | 327 | ||
328 | int usb_charging_get_config_descriptor(unsigned char *dest,int max_packet_size, | 328 | static int usb_charging_get_config_descriptor(unsigned char *dest,int max_packet_size, |
329 | int interface_number,int endpoint) | 329 | int interface_number,int endpoint) |
330 | { | 330 | { |
331 | (void) max_packet_size; | 331 | (void) max_packet_size; |