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.

2 files changed, 11 insertions, 11 deletions

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