diff options
Diffstat (limited to 'cores/arduino')
| -rw-r--r-- | cores/arduino/USBAPI.h | 6 | ||||
| -rw-r--r-- | cores/arduino/USBCore.cpp | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | cores/arduino/main.cpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h index f66cb16..1c21845 100644 --- a/cores/arduino/USBAPI.h +++ b/cores/arduino/USBAPI.h @@ -9,17 +9,17 @@ //================================================================================ // USB -class USB_ +class USBDevice_ { public: - USB_(); + USBDevice_(); bool configured(); void attach(); void detach(); // Serial port goes down too... void poll(); }; -extern USB_ USB; +extern USBDevice_ USBDevice; //================================================================================ //================================================================================ diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp index 9e89fd6..6766be6 100644 --- a/cores/arduino/USBCore.cpp +++ b/cores/arduino/USBCore.cpp @@ -627,13 +627,13 @@ u8 USBConnected() //======================================================================= //======================================================================= -USB_ USB; +USBDevice_ USBDevice; -USB_::USB_() +USBDevice_::USBDevice_() { } -void USB_::attach() +void USBDevice_::attach() { _usbConfiguration = 0; UHWCON = 0x01; // power internal reg @@ -654,18 +654,18 @@ void USB_::attach() TX_RX_LED_INIT; } -void USB_::detach() +void USBDevice_::detach() { } // Check for interrupts // TODO: VBUS detection -bool USB_::configured() +bool USBDevice_::configured() { return _usbConfiguration; } -void USB_::poll() +void USBDevice_::poll() { } diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp index 34450f4..3d4e079 100755..100644 --- a/cores/arduino/main.cpp +++ b/cores/arduino/main.cpp @@ -5,7 +5,7 @@ int main(void) init(); #if defined(USBCON) - USB.attach(); + USBDevice.attach(); #endif setup(); |