From c61a75173b2e81ea3ae3aa1d3cdf84d15e4304c3 Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Sat, 23 May 2009 14:30:20 +0000
Subject: 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
---
 firmware/usbstack/usb_core.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'firmware/usbstack/usb_core.c')

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,
-- 
cgit v1.1