laforge
/
at91work
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

DFU: remove need for "#ifdef BOARD_USB_DFU" in drivers 

We define a DFU_IF_DESCRIPTORS_STRUCT macro that adds the respective
structure members to the 'struct CCIDDriverConfigurationDescriptors'
(or similar in other drivers)
This commit is contained in:
Harald Welte 2011-07-31 16:22:45 +02:00
parent 5d5479fd3a
commit 6445a4cdb0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
at91lib/usb/device/ccid/cciddriver.c
View File

@ -90,9 +90,7 @@ typedef struct {
USBEndpointDescriptor bulkIn;
/// Interrupt OUT endpoint descriptor
USBEndpointDescriptor interruptIn;
#ifdef BOARD_USB_DFU
USBInterfaceDescriptor dfu_interface[DFU_NUM_IF];
#endif
DFU_IF_DESCRIPTORS_STRUCT
} __attribute__ ((packed)) CCIDDriverConfigurationDescriptors;
//------------------------------------------------------------------------------

5
at91lib/usb/device/dfu/dfu.h
View File

@ -15,6 +15,10 @@ struct USBStringDescriptor {
#ifdef BOARD_USB_DFU
#define DFU_NUM_IF 3
#define DFU_IF_DESCRIPTORS_STRUCT \
USBInterfaceDescriptor dfu_interface[DFU_NUM_IF];
#define DFU_IF_DESCRIPTORS { \
{ \
.bLength = sizeof(USBInterfaceDescriptor), \
@ -65,6 +69,7 @@ extern const struct USBStringDescriptor USBDFU_string3;
/* no DFU bootloader is being used */
#define DFU_NUM_IF 0
#define DFU_IF_DESCRIPTORS_STRUCT
#define DFU_IF_DESCRIPTORS
#define DFU_NUM_STRINGS 0