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/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
index 6cfe669f6..60eb98a04 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -79,7 +79,7 @@ void SetupHardware(void)
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and

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

  */

-void EVENT_USB_DeviceAttached(void)

+void EVENT_USB_Host_DeviceAttached(void)

 {

 	puts_P(PSTR(ESC_FG_GREEN "Device Attached.\r\n" ESC_FG_WHITE));

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

@@ -88,7 +88,7 @@ void EVENT_USB_DeviceAttached(void)
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and

  *  stops the library USB task management process.

  */

-void EVENT_USB_DeviceUnattached(void)

+void EVENT_USB_Host_DeviceUnattached(void)

 {

 	puts_P(PSTR(ESC_FG_GREEN "\r\nDevice Unattached.\r\n" ESC_FG_WHITE));

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

@@ -97,7 +97,7 @@ void EVENT_USB_DeviceUnattached(void)
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully

  *  enumerated by the host and is now ready to be used by the application.

  */

-void EVENT_USB_DeviceEnumerationComplete(void)

+void EVENT_USB_Host_DeviceEnumerationComplete(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 }

@@ -117,7 +117,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while

  *  enumerating an attached USB device.

  */

-void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

+void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

 	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

 	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);

diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h
index 1307a1af2..c07109919 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h
@@ -76,11 +76,11 @@
 		void MassStorage_Task(void);

 		void SetupHardware(void);

 	

-		void EVENT_USB_HostError(const uint8_t ErrorCode);

-		void EVENT_USB_DeviceAttached(void);

-		void EVENT_USB_DeviceUnattached(void);

-		void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);

-		void EVENT_USB_DeviceEnumerationComplete(void);

+		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);

+		void EVENT_USB_Host_DeviceAttached(void);

+		void EVENT_USB_Host_DeviceUnattached(void);

+		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);

+		void EVENT_USB_Host_DeviceEnumerationComplete(void);

 

 		void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode);