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.

1 files changed, 8 insertions, 5 deletions

diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
index 2765064f7..bb1b4da2d 100644
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
@@ -89,7 +89,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);

@@ -98,7 +98,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 and stops the USB management and CDC management tasks.

  */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {	

 	/* Reset Tx and Rx buffers, device disconnected */

 	Buffer_Initialize(&Rx_Buffer);

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

  *  of the USB device after enumeration - the device endpoints are configured and the CDC management task started.

  */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	/* Indicate USB connected and ready */

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

@@ -137,13 +137,16 @@ void EVENT_USB_ConfigurationChanged(void)
 	{

 		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	}

+

+	/* Reset line encoding baud rate so that the host knows to send new values */

+	LineEncoding.BaudRateBPS = 0;

 }

 

-/** 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 CDC control 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)

 {

 	/* Process CDC specific control requests */

 	switch (USB_ControlRequest.bRequest)