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/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
index 59d2129f4..3aa26ae85 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c
@@ -112,7 +112,7 @@ void ProcessNextSample(void)
 }

 

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

-void EVENT_USB_Connect(void)

+void EVENT_USB_Device_Connect(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 

@@ -123,7 +123,7 @@ void EVENT_USB_Connect(void)
 }

 

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

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	/* Stop the sample reload timer */

 	TCCR0B = 0;

@@ -132,7 +132,7 @@ void EVENT_USB_Disconnect(void)
 }

 

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

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 	

@@ -140,8 +140,8 @@ void EVENT_USB_ConfigurationChanged(void)
 	  LEDs_SetAllLEDs(LEDMASK_USB_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)

 {

-	Audio_Device_ProcessControlPacket(&Microphone_Audio_Interface);

+	Audio_Device_ProcessControlRequest(&Microphone_Audio_Interface);

 }

diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.h b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
index f26267339..03e2a6da3 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.h
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
@@ -76,9 +76,9 @@
 		void SetupHardware(void);

 		void ProcessNextSample(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);

 

 #endif