Renamed all library events to properly seperate out Device and Host mode events. Changed the firing conditions for some events to ensure that events are fired by their own USB mode only.

Remove VBUS events - not needed as the library takes care of VBUS detection and feedback on supported AVRs via the USB_Device_Connected and USB_Device_Disconnected events.

Fixed incorrect Host state assignment in the incomplete BluetoothHost demo.

26 files changed, 134 insertions, 134 deletions

diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
index 59d2129f4..3aa26ae85 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
@@ -112,7 +112,7 @@ void ProcessNextSample(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 

@@ -123,7 +123,7 @@ void EVENT_USB_Connect(void)
 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	/* Stop the sample reload timer */

 	TCCR0B = 0;

@@ -132,7 +132,7 @@ void EVENT_USB_Disconnect(void)
 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 	

@@ -140,8 +140,8 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	Audio_Device_ProcessControlPacket(&Microphone_Audio_Interface);

+	Audio_Device_ProcessControlRequest(&Microphone_Audio_Interface);

 }

diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.h b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
index f26267339..03e2a6da3 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.h
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
@@ -76,9 +76,9 @@
 		void SetupHardware(void);

 		void ProcessNextSample(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 #endif

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index 9a8804a45..d7de7d5b0 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
@@ -140,7 +140,7 @@ void ProcessNextSample(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 	

@@ -169,7 +169,7 @@ void EVENT_USB_Connect(void)
 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -194,7 +194,7 @@ void EVENT_USB_Disconnect(void)
 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 	

@@ -202,8 +202,8 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	Audio_Device_ProcessControlPacket(&Speaker_Audio_Interface);

+	Audio_Device_ProcessControlRequest(&Speaker_Audio_Interface);

 }

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
index 9846a7634..d31a8e6b6 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
@@ -68,9 +68,9 @@
 		void SetupHardware(void);

 		void ProcessNextSample(void);

 		

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 #endif

diff --git a/Demos/Device/ClassDriver/CDC/CDC.c b/Demos/Device/ClassDriver/CDC/CDC.c
index 8e3530ca2..4f64646ea 100644
--- a/Demos/Device/ClassDriver/CDC/CDC.c
+++ b/Demos/Device/ClassDriver/CDC/CDC.c
@@ -155,19 +155,19 @@ void CheckJoystickMovement(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -175,8 +175,8 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	CDC_Device_ProcessControlPacket(&VirtualSerial_CDC_Interface);

+	CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);

 }

diff --git a/Demos/Device/ClassDriver/CDC/CDC.h b/Demos/Device/ClassDriver/CDC/CDC.h
index 255cd8611..ee375a466 100644
--- a/Demos/Device/ClassDriver/CDC/CDC.h
+++ b/Demos/Device/ClassDriver/CDC/CDC.h
@@ -67,9 +67,9 @@
 		void SetupHardware(void);

 		void CheckJoystickMovement(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 #endif

diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.c b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
index 82ed59d51..e5406a4ba 100644
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.c
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
@@ -163,19 +163,19 @@ void CheckJoystickMovement(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -186,9 +186,9 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	CDC_Device_ProcessControlPacket(&VirtualSerial1_CDC_Interface);

-	CDC_Device_ProcessControlPacket(&VirtualSerial2_CDC_Interface);

+	CDC_Device_ProcessControlRequest(&VirtualSerial1_CDC_Interface);

+	CDC_Device_ProcessControlRequest(&VirtualSerial2_CDC_Interface);

 }

diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.h b/Demos/Device/ClassDriver/DualCDC/DualCDC.h
index 0f1a76498..2f12aca88 100644
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.h
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.h
@@ -67,9 +67,9 @@
 		void SetupHardware(void);

 		void CheckJoystickMovement(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 #endif

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
index 323d69336..13db6bf74 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@ -103,19 +103,19 @@ void SetupHardware(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -123,10 +123,10 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	HID_Device_ProcessControlPacket(&Generic_HID_Interface);

+	HID_Device_ProcessControlRequest(&Generic_HID_Interface);

 }

 

 /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.h b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
index 50a92ec1e..8cf0afc5d 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.h
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
@@ -67,10 +67,10 @@
 	/* Function Prototypes: */

 		void SetupHardware(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,

                                                  void* ReportData, uint16_t* ReportSize);

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.c b/Demos/Device/ClassDriver/Joystick/Joystick.c
index f4dc32d9b..ea85aadde 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.c
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.c
@@ -97,19 +97,19 @@ void SetupHardware(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -117,10 +117,10 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	HID_Device_ProcessControlPacket(&Joystick_HID_Interface);

+	HID_Device_ProcessControlRequest(&Joystick_HID_Interface);

 }

 

 /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.h b/Demos/Device/ClassDriver/Joystick/Joystick.h
index 764de1723..493dfa072 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.h
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.h
@@ -78,10 +78,10 @@
 	/* Function Prototypes: */

 		void SetupHardware(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,

                                                  void* ReportData, uint16_t* ReportSize);

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
index 040aec453..6f0bd1d1a 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
@@ -98,19 +98,19 @@ void SetupHardware()
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -118,10 +118,10 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	HID_Device_ProcessControlPacket(&Keyboard_HID_Interface);

+	HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);

 }

 

 /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.h b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
index 4a28d20ff..0f7176ce0 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.h
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
@@ -81,10 +81,10 @@
 	/* Function Prototypes: */

 		void SetupHardware(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,

                                                  void* ReportData, uint16_t* ReportSize);

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
index abaf3808b..e21999049 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -121,19 +121,19 @@ void SetupHardware()
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

     LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

     LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -144,11 +144,11 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	HID_Device_ProcessControlPacket(&Keyboard_HID_Interface);

-	HID_Device_ProcessControlPacket(&Mouse_HID_Interface);

+	HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);

+	HID_Device_ProcessControlRequest(&Mouse_HID_Interface);

 }

 

 /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
index 15532c816..297564157 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
@@ -85,10 +85,10 @@
 	/* Function Prototypes: */

 		void SetupHardware(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,

                                                  void* ReportData, uint16_t* ReportSize);

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index fcb86d661..f1a0d9afc 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -157,19 +157,19 @@ void CheckJoystickMovement(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 	

@@ -177,8 +177,8 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	MIDI_Device_ProcessControlPacket(&Keyboard_MIDI_Interface);

+	MIDI_Device_ProcessControlRequest(&Keyboard_MIDI_Interface);

 }

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.h b/Demos/Device/ClassDriver/MIDI/MIDI.h
index bc9038207..7c1484d4b 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.h
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.h
@@ -69,9 +69,9 @@
 		void SetupHardware(void);

 		void CheckJoystickMovement(void);

 		

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 		

 #endif

diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.c b/Demos/Device/ClassDriver/MassStorage/MassStorage.c
index 6a4612e4c..52ed2d938 100644
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.c
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.c
@@ -92,19 +92,19 @@ void SetupHardware(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -112,10 +112,10 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	MS_Device_ProcessControlPacket(&Disk_MS_Interface);

+	MS_Device_ProcessControlRequest(&Disk_MS_Interface);

 }

 

 /** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed.

diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.h b/Demos/Device/ClassDriver/MassStorage/MassStorage.h
index 71497780e..e6b2bf99f 100644
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.h
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.h
@@ -78,10 +78,10 @@
 	/* Function Prototypes: */

 		void SetupHardware(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 		bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);

 

diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.c b/Demos/Device/ClassDriver/Mouse/Mouse.c
index 08e87e672..d26101381 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.c
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.c
@@ -96,20 +96,20 @@ void SetupHardware(void)
 	TIMSK0 = (1 << OCIE0A);

 }

 

-/** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+/** Event handler for the library USB WakeUp event. */

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

-/** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+/** Event handler for the library USB Suspend event. */

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -117,10 +117,10 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_Device_UnhandledControlRequest(void)

 {

-	HID_Device_ProcessControlPacket(&Mouse_HID_Interface);

+	HID_Device_ProcessControlRequest(&Mouse_HID_Interface);

 }

 

 /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.h b/Demos/Device/ClassDriver/Mouse/Mouse.h
index 57e4a693d..709077fab 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.h
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.h
@@ -80,10 +80,10 @@
 	/* Function Prototypes: */

 		void SetupHardware(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Device_Connect(void);

+		void EVENT_USB_Device_Device_Disconnect(void);

+		void EVENT_USB_Device_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_Device_UnhandledControlRequest(void);

 

 		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,

                                                  void* ReportData, uint16_t* ReportSize);

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c
index 81d31c9cd..905f4efd0 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c
@@ -107,19 +107,19 @@ void SetupHardware(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -127,8 +127,8 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

-	RNDIS_Device_ProcessControlPacket(&Ethernet_RNDIS_Interface);

+	RNDIS_Device_ProcessControlRequest(&Ethernet_RNDIS_Interface);

 }

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h
index c5503e286..b91a54d21 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h
@@ -76,9 +76,9 @@
 	/* Function Prototypes: */

 		void SetupHardware(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 	

 #endif

diff --git a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.c b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.c
index e51963c7a..b78a6d331 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.c
@@ -116,19 +116,19 @@ void SetupHardware(void)
 }

 

 /** Event handler for the library USB Connection event. */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 

@@ -136,10 +136,10 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

 

-/** Event handler for the library USB Unhandled Control Packet event. */

-void EVENT_USB_UnhandledControlPacket(void)

+/** Event handler for the library USB Unhandled Control Request event. */

+void EVENT_USB_Device_UnhandledControlPacket(void)

 {

-	CDC_Device_ProcessControlPacket(&VirtualSerial_CDC_Interface);

+	CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);

 }

 

 /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer

diff --git a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.h b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.h
index 3ee7e89ed..4ceb931a3 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.h
@@ -69,10 +69,10 @@
 	/* Function Prototypes: */

 		void SetupHardware(void);

 

-		void EVENT_USB_Connect(void);

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Connect(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 		

 		void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);