diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2009-05-23 14:30:20 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2009-05-23 14:30:20 +0000 |
commit | c61a75173b2e81ea3ae3aa1d3cdf84d15e4304c3 (patch) | |
tree | f9056ad1a886d1741b009a6d026b689e18040a17 /apps/debug_menu.c | |
parent | bca3d3dca44bbe111d8e8595932d2a9491679dab (diff) | |
download | rockbox-c61a75173b2e81ea3ae3aa1d3cdf84d15e4304c3.tar.gz rockbox-c61a75173b2e81ea3ae3aa1d3cdf84d15e4304c3.zip |
Reorganise USB stack defines. Now config.h decides which class drivers get enabled instead of usb_core.h
Also enable HID, and use that as the dummy class instead of charging-only for controllers that have working interrupt transfers.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21053 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/debug_menu.c')
-rw-r--r-- | apps/debug_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index f1a4c4d998..8a2b945fe1 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -114,7 +114,7 @@ | |||
114 | 114 | ||
115 | #ifdef HAVE_USBSTACK | 115 | #ifdef HAVE_USBSTACK |
116 | #include "usb_core.h" | 116 | #include "usb_core.h" |
117 | #ifdef USB_HID | 117 | #ifdef USB_ENABLE_HID |
118 | #include "usbstack/usb_hid.h" | 118 | #include "usbstack/usb_hid.h" |
119 | #endif | 119 | #endif |
120 | #endif | 120 | #endif |
@@ -2588,7 +2588,7 @@ static bool dbg_scrollwheel(void) | |||
2588 | 2588 | ||
2589 | #if defined (HAVE_USBSTACK) | 2589 | #if defined (HAVE_USBSTACK) |
2590 | 2590 | ||
2591 | #if defined(ROCKBOX_HAS_LOGF) && defined(USB_SERIAL) | 2591 | #if defined(ROCKBOX_HAS_LOGF) && defined(USB_ENABLE_SERIAL) |
2592 | static bool toggle_usb_core_driver(int driver, char *msg) | 2592 | static bool toggle_usb_core_driver(int driver, char *msg) |
2593 | { | 2593 | { |
2594 | bool enabled = !usb_core_driver_enabled(driver); | 2594 | bool enabled = !usb_core_driver_enabled(driver); |
@@ -2605,7 +2605,7 @@ static bool toggle_usb_serial(void) | |||
2605 | } | 2605 | } |
2606 | #endif | 2606 | #endif |
2607 | 2607 | ||
2608 | #ifdef USB_HID | 2608 | #ifdef USB_ENABLE_HID |
2609 | static bool hid_send_cmd(consumer_usage_page_t cmd, char *msg) | 2609 | static bool hid_send_cmd(consumer_usage_page_t cmd, char *msg) |
2610 | { | 2610 | { |
2611 | (void)msg; | 2611 | (void)msg; |
@@ -2786,10 +2786,10 @@ static const struct the_menu_item menuitems[] = { | |||
2786 | {"logfdump", logfdump }, | 2786 | {"logfdump", logfdump }, |
2787 | #endif | 2787 | #endif |
2788 | #if defined(HAVE_USBSTACK) | 2788 | #if defined(HAVE_USBSTACK) |
2789 | #if defined(ROCKBOX_HAS_LOGF) && defined(USB_SERIAL) | 2789 | #if defined(ROCKBOX_HAS_LOGF) && defined(USB_ENABLE_SERIAL) |
2790 | {"USB Serial driver (logf)", toggle_usb_serial }, | 2790 | {"USB Serial driver (logf)", toggle_usb_serial }, |
2791 | #endif | 2791 | #endif |
2792 | #if defined(USB_HID) | 2792 | #if defined(USB_ENABLE_HID) |
2793 | {"USB HID play/pause", usb_hid_send_play_pause }, | 2793 | {"USB HID play/pause", usb_hid_send_play_pause }, |
2794 | {"USB HID stop", usb_hid_send_stop }, | 2794 | {"USB HID stop", usb_hid_send_stop }, |
2795 | {"USB HID prev track", usb_hid_send_scan_previous_track }, | 2795 | {"USB HID prev track", usb_hid_send_scan_previous_track }, |