devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Reorganise USB stack defines. Now config.h decides which class drivers get enabled instead of usb_core.h

Browse source 
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
This commit is contained in:
Frank Gevaerts 2009-05-23 14:30:20 +00:00
parent bca3d3dca4
commit c61a75173b
13 changed files with 79 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/usbstack/usb_charging_only.c
View file

@ -29,8 +29,6 @@
//#define LOGF_ENABLE
#include "logf.h"
#ifdef USB_CHARGING_ONLY
/* charging_only interface */
static struct usb_interface_descriptor __attribute__((aligned(2)))
interface_descriptor =
@ -70,5 +68,3 @@ int usb_charging_only_get_config_descriptor(unsigned char *dest,int max_packet_s
return (dest-orig_dest);
}
#endif /*USB_CHARGING_ONLY*/

16
firmware/usbstack/usb_core.c
View file

@ -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,

4
firmware/usbstack/usb_hid.c
View file

@ -28,8 +28,6 @@
//#define LOGF_ENABLE
#include "logf.h"
#ifdef USB_HID
#define CONCAT(low, high) ((high << 8) | low)
#define PACK_VAL1(dest, val) *(dest)++ = (val) & 0xff
#define PACK_VAL2(dest, val) PACK_VAL1((dest), (val)); \
@ -392,5 +390,3 @@ void usb_hid_send_consumer_usage(consumer_usage_page_t id)
usb_hid_try_send_drv();
}
#endif /*USB_HID*/

4
firmware/usbstack/usb_serial.c
View file

@ -28,8 +28,6 @@
//#define LOGF_ENABLE
#include "logf.h"
#ifdef USB_SERIAL
/* serial interface */
static struct usb_interface_descriptor __attribute__((aligned(2)))
interface_descriptor =
@ -240,5 +238,3 @@ void usb_serial_transfer_complete(int ep,int dir, int status, int length)
break;
}
}
#endif /*USB_SERIAL*/

4
firmware/usbstack/usb_storage.c
View file

@ -33,8 +33,6 @@
#include "usb_storage.h"
#ifdef USB_STORAGE
/* Enable the following define to export only the SD card slot. This
* is useful for USBCV MSC tests, as those are destructive.
* This won't work right if the device doesn't have a card slot.
@ -1158,5 +1156,3 @@ static void fill_inquiry(IF_MV_NONVOID(int lun))
tb.inquiry->DeviceTypeModifier = DEVICE_REMOVABLE;
#endif
}
#endif /* USB_STORAGE */