[gnoduino: 93/237] support for non-Leonardo boards is back!

[Lucian Langa <lucilanga src gnome org>]

commit 6e7bc5c6e1a88d85432a561a1ce70cfc563f3419
Author: Zach Eveland <zeveland blacklabel-development com>
Date:   Tue Aug 30 11:50:08 2011 -0400

    support for non-Leonardo boards is back!

 arduino/cores/arduino/CDC.cpp     |    2 ++
 arduino/cores/arduino/HID.cpp     |    5 ++++-
 arduino/cores/arduino/Platform.h  |    8 +++++---
 arduino/cores/arduino/USBAPI.h    |    6 +++++-
 arduino/cores/arduino/USBCore.cpp |    6 +++++-
 5 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/arduino/cores/arduino/CDC.cpp b/arduino/cores/arduino/CDC.cpp
index 1f1fcb5..b229cb5 100644
--- a/arduino/cores/arduino/CDC.cpp
+++ b/arduino/cores/arduino/CDC.cpp
@@ -20,6 +20,7 @@
 #include "USBAPI.h"
 #include <avr/wdt.h>
 
+#if defined(USBCON)
 #ifdef CDC_ENABLED
 
 //	TODO: Should really use the wdt here
@@ -174,3 +175,4 @@ size_t Serial_::write(uint8_t c)
 Serial_ Serial;
 
 #endif
+#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/arduino/cores/arduino/HID.cpp b/arduino/cores/arduino/HID.cpp
index 36e9b67..cea90fc 100644
--- a/arduino/cores/arduino/HID.cpp
+++ b/arduino/cores/arduino/HID.cpp
@@ -20,6 +20,7 @@
 #include "USBAPI.h"
 #include "USBDesc.h"
 
+#if defined(USBCON)
 #ifdef HID_ENABLED
 
 //#define RAWHID_ENABLED
@@ -419,4 +420,6 @@ size_t Keyboard_::write(uint8_t c)
 	return 1;
 }
 
-#endif
\ No newline at end of file
+#endif
+
+#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/arduino/cores/arduino/Platform.h b/arduino/cores/arduino/Platform.h
index 6a1f340..8b8f742 100644
--- a/arduino/cores/arduino/Platform.h
+++ b/arduino/cores/arduino/Platform.h
@@ -14,8 +14,10 @@ typedef unsigned long u32;
 
 #include "Arduino.h"
 
-#include "USBDesc.h"
-#include "USBCore.h"
-#include "USBAPI.h"
+#if defined(USBCON)
+	#include "USBDesc.h"
+	#include "USBCore.h"
+	#include "USBAPI.h"
+#endif /* if defined(USBCON) */
 
 #endif
diff --git a/arduino/cores/arduino/USBAPI.h b/arduino/cores/arduino/USBAPI.h
index b833009..0dad176 100644
--- a/arduino/cores/arduino/USBAPI.h
+++ b/arduino/cores/arduino/USBAPI.h
@@ -3,6 +3,8 @@
 #ifndef __USBAPI__
 #define __USBAPI__
 
+#if defined(USBCON)
+
 //================================================================================
 //================================================================================
 //	USB
@@ -153,4 +155,6 @@ int USB_Recv(uint8_t ep, void* data, int len);		// non-blocking
 int USB_Recv(uint8_t ep);							// non-blocking
 void USB_Flush(uint8_t ep);
 
-#endif
\ No newline at end of file
+#endif
+
+#endif /* if defined(USBCON) */
\ No newline at end of file
diff --git a/arduino/cores/arduino/USBCore.cpp b/arduino/cores/arduino/USBCore.cpp
index 49fda35..9ce2e00 100644
--- a/arduino/cores/arduino/USBCore.cpp
+++ b/arduino/cores/arduino/USBCore.cpp
@@ -20,6 +20,8 @@
 #include "USBAPI.h"
 #include "USBDesc.h"
 
+#if defined(USBCON)
+
 #define EP_TYPE_CONTROL				0x00
 #define EP_TYPE_BULK_IN				0x81
 #define EP_TYPE_BULK_OUT			0x80
@@ -648,4 +650,6 @@ void USB_::poll()
 	if (USB_Available(MSC_RX))
 		MSC_Data(MSC_RX,MSC_TX);
 #endif
-}
\ No newline at end of file
+}
+
+#endif /* if defined(USBCON) */
\ No newline at end of file