From 6445a4cdb0b6a6d701d631d81791c72df1771bd6 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 31 Jul 2011 16:22:45 +0200
Subject: 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)
---
at91lib/usb/device/ccid/cciddriver.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'at91lib/usb/device/ccid')
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;
//------------------------------------------------------------------------------
--
cgit v1.2.3