renamed Leonardo USB_ class to USBDevice_ to be unambiguous. renamed "USB" object to "USBDevice" to prevent conflict with USB Host library (thanks Massimo)

zeveland · zeveland · commit 9520a531de0b · 2012-05-01T11:18:15.000-04:00
diff --git a/hardware/arduino/cores/arduino/USBAPI.h b/hardware/arduino/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/hardware/arduino/cores/arduino/USBCore.cpp b/hardware/arduino/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/hardware/arduino/cores/arduino/main.cpp b/hardware/arduino/cores/arduino/main.cpp
@@ -5,7 +5,7 @@ int main(void)
 	init();
 
 #if defined(USBCON)
-	USB.attach();
+	USBDevice.attach();
 #endif
 	
 	setup();

Original file line number	Diff line number	Diff line change
`@@ -627,13 +627,13 @@ u8 USBConnected()`
`627`	`627`	`//=======================================================================`
`628`	`628`	`//=======================================================================`
`629`	`629`
`630`		`-USB_ USB;`
	`630`	`+USBDevice_ USBDevice;`
`631`	`631`
`632`		`-USB_::USB_()`
	`632`	`+USBDevice_::USBDevice_()`
`633`	`633`	`{`
`634`	`634`	`}`
`635`	`635`
`636`		`-void USB_::attach()`
	`636`	`+void USBDevice_::attach()`
`637`	`637`	`{`
`638`	`638`	`_usbConfiguration = 0;`
`639`	`639`	`UHWCON = 0x01; // power internal reg`
`@@ -654,18 +654,18 @@ void USB_::attach()`
`654`	`654`	`TX_RX_LED_INIT;`
`655`	`655`	`}`
`656`	`656`
`657`		`-void USB_::detach()`
	`657`	`+void USBDevice_::detach()`
`658`	`658`	`{`
`659`	`659`	`}`
`660`	`660`
`661`	`661`	`// Check for interrupts`
`662`	`662`	`// TODO: VBUS detection`
`663`		`-bool USB_::configured()`
	`663`	`+bool USBDevice_::configured()`
`664`	`664`	`{`
`665`	`665`	`return _usbConfiguration;`
`666`	`666`	`}`
`667`	`667`
`668`		`-void USB_::poll()`
	`668`	`+void USBDevice_::poll()`
`669`	`669`	`{`
`670`	`670`	`}`
`671`	`671`