From 5d976f8b1d1b5dbf8b0dbe4ec292ffa28409fcf2 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Thu, 27 Oct 2011 10:48:26 -0400
Subject: removed conditional compilation checks for CDC_ENABLED

bootloader must always have CDC enabled
---
 bootloaders/diskloader/src/USBCore.cpp | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'bootloaders/diskloader/src/USBCore.cpp')

diff --git a/bootloaders/diskloader/src/USBCore.cpp b/bootloaders/diskloader/src/USBCore.cpp
index 4771181..6518ae9 100644
--- 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;
 }
 
-- 
cgit v1.2.3-18-g5258