aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartino Facchin <m.facchin@arduino.cc>2015-06-05 17:34:56 +0200
committerCristian Maglie <c.maglie@arduino.cc>2015-07-16 13:12:13 +0200
commitf1973e73cb345276c6ad77e18b6c78d8797b48e7 (patch)
tree3c59c6825e95c0143815add349a77ebf7641987d
parentea2a4215707ae69c71c1990d5b0f72ff077e3c46 (diff)
Move EP defines to header
-rw-r--r--cores/arduino/USBAPI.h8
-rw-r--r--cores/arduino/USBCore.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h
index 6f6d1cb..d8ad98d 100644
--- a/cores/arduino/USBAPI.h
+++ b/cores/arduino/USBAPI.h
@@ -41,6 +41,14 @@ typedef unsigned long u32;
//================================================================================
// USB
+#define EP_TYPE_CONTROL 0x00
+#define EP_TYPE_BULK_IN 0x81
+#define EP_TYPE_BULK_OUT 0x80
+#define EP_TYPE_INTERRUPT_IN 0xC1
+#define EP_TYPE_INTERRUPT_OUT 0xC0
+#define EP_TYPE_ISOCHRONOUS_IN 0x41
+#define EP_TYPE_ISOCHRONOUS_OUT 0x40
+
class USBDevice_
{
public:
diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp
index b4f7bed..54cd2b4 100644
--- a/cores/arduino/USBCore.cpp
+++ b/cores/arduino/USBCore.cpp
@@ -20,14 +20,6 @@
#if defined(USBCON)
-#define EP_TYPE_CONTROL 0x00
-#define EP_TYPE_BULK_IN 0x81
-#define EP_TYPE_BULK_OUT 0x80
-#define EP_TYPE_INTERRUPT_IN 0xC1
-#define EP_TYPE_INTERRUPT_OUT 0xC0
-#define EP_TYPE_ISOCHRONOUS_IN 0x41
-#define EP_TYPE_ISOCHRONOUS_OUT 0x40
-
/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
#define TX_RX_LED_PULSE_MS 100
volatile u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */