diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-07-31 16:22:45 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-07-31 16:26:38 +0200 |
| commit | 6445a4cdb0b6a6d701d631d81791c72df1771bd6 (patch) | |
| tree | 7b302cbdee0f35741bd6b702331c870570ad9bf1 | |
| parent | 5d5479fd3a0d0d4c1890f606ea4fcec899099eb6 (diff) | |
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)
| -rw-r--r-- | at91lib/usb/device/ccid/cciddriver.c | 4 | ||||
| -rw-r--r-- | at91lib/usb/device/dfu/dfu.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/at91lib/usb/device/ccid/cciddriver.c b/at91lib/usb/device/ccid/cciddriver.c index 495a897..989345e 100644 --- a/at91lib/usb/device/ccid/cciddriver.c +++ b/at91lib/usb/device/ccid/cciddriver.c @@ -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;
//------------------------------------------------------------------------------
diff --git a/at91lib/usb/device/dfu/dfu.h b/at91lib/usb/device/dfu/dfu.h index f1323c1..3b7a41a 100644 --- a/at91lib/usb/device/dfu/dfu.h +++ b/at91lib/usb/device/dfu/dfu.h @@ -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 |