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/Demos/Host/LowLevel/PrinterHost/PrinterHost.c b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
index bbda0c24b..bd84f19eb 100644
--- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
@@ -73,7 +73,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);

@@ -82,7 +82,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);

@@ -91,13 +91,13 @@ 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);

 }

 

 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */

-void EVENT_USB_HostError(uint8_t ErrorCode)

+void EVENT_USB_Host_HostError(uint8_t ErrorCode)

 {

 	USB_ShutDown();

 

@@ -111,7 +111,7 @@ void EVENT_USB_HostError(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(uint8_t ErrorCode, uint8_t SubErrorCode)

+void EVENT_USB_Host_DeviceEnumerationFailed(uint8_t ErrorCode, 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/PrinterHost/PrinterHost.h b/Demos/Host/LowLevel/PrinterHost/PrinterHost.h
index f6afcc796..db7a9fe7e 100644
--- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.h
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.h
@@ -70,11 +70,11 @@
 		#define LEDMASK_USB_BUSY         (LEDS_LED2)

 	

 	/* Function Prototypes: */

-		void EVENT_USB_DeviceAttached(void);

-		void EVENT_USB_DeviceUnattached(void);

-		void EVENT_USB_DeviceEnumerationComplete(void);

-		void EVENT_USB_HostError(uint8_t ErrorCode);

-		void EVENT_USB_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode);

+		void EVENT_USB_Host_DeviceAttached(void);

+		void EVENT_USB_Host_DeviceUnattached(void);

+		void EVENT_USB_Host_DeviceEnumerationComplete(void);

+		void EVENT_USB_Host_HostError(uint8_t ErrorCode);

+		void EVENT_USB_Host_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode);

 

 		void SetupHardware(void);