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) | |
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 @@ #ifdef HAVE_USBSTACK #include "usb_core.h" -#ifdef USB_HID +#ifdef USB_ENABLE_HID #include "usbstack/usb_hid.h" #endif #endif @@ -2588,7 +2588,7 @@ static bool dbg_scrollwheel(void) #if defined (HAVE_USBSTACK) -#if defined(ROCKBOX_HAS_LOGF) && defined(USB_SERIAL) +#if defined(ROCKBOX_HAS_LOGF) && defined(USB_ENABLE_SERIAL) static bool toggle_usb_core_driver(int driver, char *msg) { bool enabled = !usb_core_driver_enabled(driver); @@ -2605,7 +2605,7 @@ static bool toggle_usb_serial(void) } #endif -#ifdef USB_HID +#ifdef USB_ENABLE_HID static bool hid_send_cmd(consumer_usage_page_t cmd, char *msg) { (void)msg; @@ -2786,10 +2786,10 @@ static const struct the_menu_item menuitems[] = { {"logfdump", logfdump }, #endif #if defined(HAVE_USBSTACK) -#if defined(ROCKBOX_HAS_LOGF) && defined(USB_SERIAL) +#if defined(ROCKBOX_HAS_LOGF) && defined(USB_ENABLE_SERIAL) {"USB Serial driver (logf)", toggle_usb_serial }, #endif -#if defined(USB_HID) +#if defined(USB_ENABLE_HID) {"USB HID play/pause", usb_hid_send_play_pause }, {"USB HID stop", usb_hid_send_stop }, {"USB HID prev track", usb_hid_send_scan_previous_track }, |