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, 10 insertions, 10 deletions

diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c
index 26c566496..d7e0413a6 100644
--- a/Projects/Benito/Benito.c
+++ b/Projects/Benito/Benito.c
@@ -155,21 +155,21 @@ void SetupHardware(void)
 }

 

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

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	PingPongMSRemaining = PING_PONG_LED_PULSE_MS;

 	LEDs_SetAllLEDs(LEDMASK_TX);

 }

 

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

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	PingPongMSRemaining = 0;

 	LEDs_TurnOffLEDs(LEDMASK_BUSY);

 }

 

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

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	PingPongMSRemaining = 0;

 	LEDs_TurnOffLEDs(LEDMASK_BUSY);

@@ -178,10 +178,10 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_TurnOnLEDs(LEDMASK_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);

 }

 

 /** Event handler for the CDC Class driver Line Encoding Changed event.

diff --git a/Projects/Benito/Benito.h b/Projects/Benito/Benito.h
index 740319f64..3b0dfcd2c 100644
--- a/Projects/Benito/Benito.h
+++ b/Projects/Benito/Benito.h
@@ -64,10 +64,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);

 		void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);