removed conditional compilation checks for CDC_ENABLED

zeveland · zeveland · commit 0617fabcfc1a · 2011-10-27T10:48:26.000-04:00
bootloader must always have CDC enabled
diff --git a/bootloaders/diskloader/src/CDC.cpp b/bootloaders/diskloader/src/CDC.cpp
@@ -21,7 +21,6 @@
 #include <avr/wdt.h>
 
 #if defined(USBCON)
-#ifdef CDC_ENABLED
 
 typedef struct
 {
@@ -91,6 +90,4 @@ bool WEAK CDC_Setup(Setup& setup)
 	}
 	return false;
 }
-
-#endif
-#endif /* if defined(USBCON) */
+#endif /* if defined(USBCON) */
diff --git a/bootloaders/diskloader/src/Platform.h b/bootloaders/diskloader/src/Platform.h
@@ -25,8 +25,6 @@ typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned long u32;
 
-#define CDC_ENABLED
-
 #define USB_PID_LEONARDO 0x0034
 #define USB_PID_MICRO 0x0035
 #define USB_VID 0x2341	// arduino LLC vid
diff --git a/bootloaders/diskloader/src/USBCore.cpp b/bootloaders/diskloader/src/USBCore.cpp
@@ -62,11 +62,7 @@ const u16 STRING_IMANUFACTURER[12] = {
 	'A','r','d','u','i','n','o',' ','L','L','C'
 };
 
-#ifdef CDC_ENABLED
 #define DEVICE_CLASS 0x02
-#else
-#define DEVICE_CLASS 0x00
-#endif
 
 //	DEVICE DESCRIPTOR
 const DeviceDescriptor USB_DeviceDescriptor =
@@ -320,12 +316,9 @@ extern const u8 _initEndpoints[] PROGMEM;
 const u8 _initEndpoints[] = 
 {
 	0,
-	
-#ifdef CDC_ENABLED
 	EP_TYPE_INTERRUPT_IN,		// CDC_ENDPOINT_ACM
 	EP_TYPE_BULK_OUT,			// CDC_ENDPOINT_OUT
 	EP_TYPE_BULK_IN,			// CDC_ENDPOINT_IN
-#endif
 };
 
 #define EP_SINGLE_64 0x32	// EP0
@@ -360,10 +353,8 @@ bool ClassInterfaceRequest(Setup& setup)
 {
 	u8 i = setup.wIndex;
 
-#ifdef CDC_ENABLED
 	if (CDC_ACM_INTERFACE == i)
 		return CDC_Setup(setup);
-#endif
 
 	return false;
 }
@@ -422,11 +413,7 @@ int SendInterfaces()
 {
 	int total = 0;
 	u8 interfaces = 0;
-
-#ifdef CDC_ENABLED
 	total = CDC_GetInterface(&interfaces);
-#endif
-
 	return interfaces;
 }
 
diff --git a/bootloaders/diskloader/src/USBDesc.h b/bootloaders/diskloader/src/USBDesc.h
@@ -16,15 +16,8 @@
 ** SOFTWARE.  
 */
 
-#define CDC_ENABLED
-
-#ifdef CDC_ENABLED
 #define CDC_INTERFACE_COUNT	2
 #define CDC_ENPOINT_COUNT	3
-#else
-#define CDC_INTERFACE_COUNT	0
-#define CDC_ENPOINT_COUNT	0
-#endif
 
 #define CDC_ACM_INTERFACE	0	// CDC ACM
 #define CDC_DATA_INTERFACE	1	// CDC Data
@@ -33,10 +26,8 @@
 #define CDC_ENDPOINT_OUT	(CDC_FIRST_ENDPOINT+1)
 #define CDC_ENDPOINT_IN		(CDC_FIRST_ENDPOINT+2)
 
-#ifdef CDC_ENABLED
 #define CDC_RX CDC_ENDPOINT_OUT
 #define CDC_TX CDC_ENDPOINT_IN
-#endif
 
 #define IMANUFACTURER	1
 #define IPRODUCT		2

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`#include <avr/wdt.h>`
`22`	`22`
`23`	`23`	`#if defined(USBCON)`
`24`		`-#ifdef CDC_ENABLED`
`25`	`24`
`26`	`25`	`typedef struct`
`27`	`26`	`{`
`@@ -91,6 +90,4 @@ bool WEAK CDC_Setup(Setup& setup)`
`91`	`90`	`}`
`92`	`91`	`return false;`
`93`	`92`	`}`
`94`		`-`
`95`		`-#endif`
`96`		`-#endif /* if defined(USBCON) */`
	`93`	`+#endif /* if defined(USBCON) */`