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

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.c b/Demos/Device/LowLevel/Keyboard/Keyboard.c
index e27b22827..f8310abb4 100644
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.c
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.c
@@ -96,7 +96,7 @@ void SetupHardware(void)
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and

  *  starts the library USB task to begin the enumeration and USB management process.

  */

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	/* Indicate USB enumerating */

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

@@ -108,7 +108,7 @@ void EVENT_USB_Connect(void)
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via

  *  the status LEDs.

  */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	/* Indicate USB not ready */

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

@@ -117,7 +117,7 @@ void EVENT_USB_Disconnect(void)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration

  *  of the USB device after enumeration, and configures the keyboard device endpoints.

  */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {	

 	/* Indicate USB connected and ready */

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

@@ -139,11 +139,11 @@ void EVENT_USB_ConfigurationChanged(void)
 	}

 }

 

-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific

+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific

  *  control requests that are not handled internally by the USB library (including the HID commands, which are

  *  all issued via the control endpoint), so that they can be handled appropriately for the application.

  */

-void EVENT_USB_UnhandledControlPacket(void)

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

 	/* Handle HID Class specific requests */

 	switch (USB_ControlRequest.bRequest)

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.h b/Demos/Device/LowLevel/Keyboard/Keyboard.h
index 2a2ebdc49..bc478f317 100644
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.h
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.h
@@ -101,10 +101,10 @@
 		void SetupHardware(void);

 		void HID_Task(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 CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData);

 		void ProcessLEDReport(uint8_t LEDReport);