summaryrefslogtreecommitdiff
path: root/firmware/usbstack/usb_core.c
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2009-05-23 14:30:20 +0000
committerFrank Gevaerts <frank@gevaerts.be>2009-05-23 14:30:20 +0000
commitc61a75173b2e81ea3ae3aa1d3cdf84d15e4304c3 (patch)
treef9056ad1a886d1741b009a6d026b689e18040a17 /firmware/usbstack/usb_core.c
parentbca3d3dca44bbe111d8e8595932d2a9491679dab (diff)
downloadrockbox-c61a75173b2e81ea3ae3aa1d3cdf84d15e4304c3.zip
rockbox-c61a75173b2e81ea3ae3aa1d3cdf84d15e4304c3.tar.gz
rockbox-c61a75173b2e81ea3ae3aa1d3cdf84d15e4304c3.tar.bz2
rockbox-c61a75173b2e81ea3ae3aa1d3cdf84d15e4304c3.tar.xz
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 'firmware/usbstack/usb_core.c')
-rw-r--r--firmware/usbstack/usb_core.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index 81333fe..c4450af 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -31,19 +31,19 @@
#include "usb_core.h"
#include "usb_class_driver.h"
-#if defined(USB_STORAGE)
+#if defined(USB_ENABLE_STORAGE)
#include "usb_storage.h"
#endif
-#if defined(USB_SERIAL)
+#if defined(USB_ENABLE_SERIAL)
#include "usb_serial.h"
#endif
-#if defined(USB_CHARGING_ONLY)
+#if defined(USB_ENABLE_CHARGING_ONLY)
#include "usb_charging_only.h"
#endif
-#if defined(USB_HID)
+#if defined(USB_ENABLE_HID)
#include "usb_hid.h"
#endif
@@ -182,7 +182,7 @@ static struct
static struct usb_class_driver drivers[USB_NUM_DRIVERS] =
{
-#ifdef USB_STORAGE
+#ifdef USB_ENABLE_STORAGE
[USB_DRIVER_MASS_STORAGE] = {
.enabled = false,
.needs_exclusive_storage = true,
@@ -201,7 +201,7 @@ static struct usb_class_driver drivers[USB_NUM_DRIVERS] =
#endif
},
#endif
-#ifdef USB_SERIAL
+#ifdef USB_ENABLE_SERIAL
[USB_DRIVER_SERIAL] = {
.enabled = false,
.needs_exclusive_storage = false,
@@ -220,7 +220,7 @@ static struct usb_class_driver drivers[USB_NUM_DRIVERS] =
#endif
},
#endif
-#ifdef USB_CHARGING_ONLY
+#ifdef USB_ENABLE_CHARGING_ONLY
[USB_DRIVER_CHARGING_ONLY] = {
.enabled = false,
.needs_exclusive_storage = false,
@@ -239,7 +239,7 @@ static struct usb_class_driver drivers[USB_NUM_DRIVERS] =
#endif
},
#endif
-#ifdef USB_HID
+#ifdef USB_ENABLE_HID
[USB_DRIVER_HID] = {
.enabled = false,
.needs_exclusive_storage = false,