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.

5 files changed, 97 insertions, 164 deletions

diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h
index 4042d4670..1e638314c 100644
--- a/LUFA/Drivers/USB/HighLevel/Events.h
+++ b/LUFA/Drivers/USB/HighLevel/Events.h
@@ -62,67 +62,7 @@
 	/* Public Interface - May be used in end-application: */			

 		/* Pseudo-Functions for Doxygen: */

 		#if !defined(INCLUDE_FROM_EVENTS_C) || defined(__DOXYGEN__)

-			/** Event for VBUS level change. This event fires when the VBUS line of the USB AVR changes from

-			 *  high to low or vice-versa, before the new VBUS level is sampled and the appropriate action

-			 *  taken.

-			 *

-			 *  \note This event is only available on USB AVR models which support VBUS notification interrupts.

-			 */

-			void EVENT_USB_VBUSChange(void);

-

-			/** Event for VBUS attachment. On the AVR models with a dedicated VBUS pin, this event fires when

-			 *  the VBUS line of the USB AVR changes from low to high (after the VBUS events have been handled),

-			 *  signalling the attachment of the USB device to a host, before the enumeration process has begun.

-			 *

-			 *  \note This event is only available on USB AVR models which support VBUS notification interrupts.

-			 */

-			void EVENT_USB_VBUSConnect(void);

-

-			/** Event for VBUS attachment. On the AVR models with a dedicated VBUS pin, this event fires when

-			 *  the VBUS line of the USB AVR changes from high to low (after the VBUS events have been handled),

-			 *  signalling the detatchment of the USB device from a host, regardless of its enumeration state.

-			 *

-			 *  \note This event is only available on USB AVR models which support VBUS notification interrupts.

-			 */

-			void EVENT_USB_VBUSDisconnect(void);

-

-			/** Event for USB device connection. This event fires when the AVR is in USB host mode and a device

-			 *  has been attached (but not yet fully enumerated), or when in device mode and the device is connected

-			 *  to a host, beginning the enumeration process.

-			 *

-			 *  When in device mode, this can be used to programmatically start the USB management task to reduce

-			 *  CPU usage.

-			 *

-			 *  \note For the smaller USB AVRs (AT90USBXX2) with limited USB controllers, VBUS is not available to the USB controller.

-			 *        this means that the current connection state is derived from the bus suspension and wake up events by default,

-			 *        which is not always accurate (host may suspend the bus while still connected). If the actual connection state

-			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by

-			 *        passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection

-			 *        and disconnection events may be manually fired, and the \ref USB_DeviceState global changed manually.

-			 *

-			 *  \see USBTask.h for more information on the USB management task and reducing CPU usage.

-			 */

-			void EVENT_USB_Connect(void);

-

-			/** Event for USB device disconnection. This event fires when the AVR is in USB host mode and an

-			 *  attached and enumerated device has been disconnected, or when in device mode and the device is

-			 *  disconnected from the host.

-			 *

-			 *  When in device mode, this can be used to programmatically stop the USB management task to reduce

-			 *  CPU usage.

-			 *

-			 *  \note For the smaller USB AVRs (AT90USBXX2) with limited USB controllers, VBUS is not available to the USB controller.

-			 *        this means that the current connection state is derived from the bus suspension and wake up events by default,

-			 *        which is not always accurate (host may suspend the bus while still connected). If the actual connection state

-			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by

-			 *        passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection

-			 *        and disconnection events may be manually fired, and the \ref USB_DeviceState global changed manually.

-			 *

-			 *  \see USBTask.h for more information on the USB management task and reducing CPU usage.

-			 */

-			void EVENT_USB_Disconnect(void);

-			

-			/** Event for USB initialization failure. This event fires when the USB interface fails to

+			/** Event for USB stack initialization failure. This event fires when the USB interface fails to

 			 *  initialize correctly due to a hardware or software fault.

 			 *

 			 *  \note This event only exists on USB AVR models which support dual role modes.

@@ -133,8 +73,8 @@
 

 			/** Event for USB mode pin level change. This event fires when the USB interface is set to dual role

 			 *  mode, and the UID pin level has changed to indicate a new mode (device or host). This event fires

-			 *  before the mode is switched to the newly indicated mode but after the \ref EVENT_USB_Disconnect event

-			 *  has fired (if connected before the role change).

+			 *  before the mode is switched to the newly indicated mode but after the \ref EVENT_USB_Device_Disconnect

+			 *  event has fired (if connected before the role change).

 			 *

 			 *  \note This event only exists on USB AVR models which support dual role modes.

 			 *

@@ -153,12 +93,12 @@
 			 *  \note This event does not exist if the USB_DEVICE_ONLY token is supplied to the compiler (see

 			 *        \ref Group_USBManagement documentation).

 			 */

-			void EVENT_USB_HostError(const uint8_t ErrorCode);

+			void EVENT_USB_Host_HostError(const uint8_t ErrorCode);

 			

 			/** Event for USB device attachment. This event fires when a the USB interface is in host mode, and

 			 *  a USB device has been connected to the USB interface. This is interrupt driven, thus fires before

-			 *  the standard \ref EVENT_USB_Connect event and so can be used to programmatically start the USB management

-			 *  task to reduce CPU consumption.

+			 *  the standard \ref EVENT_USB_Device_Connect event and so can be used to programmatically start the USB

+			 *  management task to reduce CPU consumption.

 			 *

 			 *  \note This event only exists on USB AVR models which supports host mode.

 			 *

@@ -167,7 +107,7 @@
 			 *

 			 *  \see \ref USB_USBTask() for more information on the USB management task and reducing CPU usage.

 			 */

-			void EVENT_USB_DeviceAttached(void);

+			void EVENT_USB_Host_DeviceAttached(void);

 

 			/** Event for USB device removal. This event fires when a the USB interface is in host mode, and

 			 *  a USB device has been removed the USB interface whether or not it has been enumerated. This

@@ -180,7 +120,7 @@
 			 *

 			 *  \see \ref USB_USBTask() for more information on the USB management task and reducing CPU usage.

 			 */

-			void EVENT_USB_DeviceUnattached(void);

+			void EVENT_USB_Host_DeviceUnattached(void);

 			

 			/** Event for USB device enumeration failure. This event fires when a the USB interface is

 			 *  in host mode, and an attached USB device has failed to enumerate completely.

@@ -197,14 +137,41 @@
 			 *  \note This event does not exist if the USB_DEVICE_ONLY token is supplied to the compiler (see

 			 *        \ref Group_USBManagement documentation).

 			 */

-			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);

 

 			/** Event for USB device enumeration completion. This event fires when a the USB interface is

 			 *  in host mode and an attached USB device has been completely enumerated and is ready to be

-			 *  controlled by the user application, or when the library is in device mode, and the Host

-			 *  has finished enumerating the device.

+			 *  controlled by the user application.

 			 */

-			void EVENT_USB_DeviceEnumerationComplete(void);

+			void EVENT_USB_Host_DeviceEnumerationComplete(void);

+

+			/** Event for USB device connection. This event fires when the AVR in device mode and the device is connected

+			 *  to a host, beginning the enumeration process, measured by a rising level on the AVR's VBUS pin.

+			 *

+			 *  \note For the smaller USB AVRs (AT90USBXX2) with limited USB controllers, VBUS is not available to the USB controller.

+			 *        this means that the current connection state is derived from the bus suspension and wake up events by default,

+			 *        which is not always accurate (host may suspend the bus while still connected). If the actual connection state

+			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by

+			 *        passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection

+			 *        and disconnection events may be manually fired, and the \ref USB_DeviceState global changed manually.

+			 *

+			 *  \see USBTask.h for more information on the USB management task and reducing CPU usage.

+			 */

+			void EVENT_USB_Device_Connect(void);

+

+			/** Event for USB device disconnection. This event fires when the AVR in device mode and the device is disconnected

+			 *  from a host, measured by a falling level on the AVR's VBUS pin.

+			 *

+			 *  \note For the smaller USB AVRs (AT90USBXX2) with limited USB controllers, VBUS is not available to the USB controller.

+			 *        this means that the current connection state is derived from the bus suspension and wake up events by default,

+			 *        which is not always accurate (host may suspend the bus while still connected). If the actual connection state

+			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by

+			 *        passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection

+			 *        and disconnection events may be manually fired, and the \ref USB_DeviceState global changed manually.

+			 *

+			 *  \see USBTask.h for more information on the USB management task and reducing CPU usage.

+			 */

+			void EVENT_USB_Device_Disconnect(void);

 

 			/** Event for unhandled control requests. This event fires when a the USB host issues a control

 			 *  request to the control endpoint (address 0) that the library does not handle. This may either

@@ -220,7 +187,7 @@
 			 *        request SETUP parameters into the \ref USB_ControlRequest structure which should then be used

 			 *        by the application to determine how to handle the issued request.

 			 */

-			void EVENT_USB_UnhandledControlPacket(void);

+			void EVENT_USB_Device_UnhandledControlRequest(void);

 

 			/** Event for USB configuration number changed. This event fires when a the USB host changes the

 			 *  selected configuration number while in device mode. This event should be hooked in device

@@ -231,7 +198,7 @@
 			 *  \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see

 			 *        \ref Group_USBManagement documentation).

 			 */

-			void EVENT_USB_ConfigurationChanged(void);

+			void EVENT_USB_Device_ConfigurationChanged(void);

 

 			/** Event for USB suspend. This event fires when a the USB host suspends the device by halting its

 			 *  transmission of Start Of Frame pulses to the device. This is generally hooked in order to move

@@ -242,9 +209,9 @@
 			 *  \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see

 			 *        \ref Group_USBManagement documentation).

 			 *

-			 *  \see \ref EVENT_USB_WakeUp() event for accompanying Wake Up event.

+			 *  \see \ref EVENT_USB_Device_WakeUp() event for accompanying Wake Up event.

 			 */

-			void EVENT_USB_Suspend(void);

+			void EVENT_USB_Device_Suspend(void);

 

 			/** Event for USB wake up. This event fires when a the USB interface is suspended while in device

 			 *  mode, and the host wakes up the device by supplying Start Of Frame pulses. This is generally

@@ -255,9 +222,9 @@
 			 *  \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see

 			 *        \ref Group_USBManagement documentation).

 			 *

-			 *  \see \ref EVENT_USB_Suspend() event for accompanying Suspend event.

+			 *  \see \ref EVENT_USB_Device_Suspend() event for accompanying Suspend event.

 			 */

-			void EVENT_USB_WakeUp(void);

+			void EVENT_USB_Device_WakeUp(void);

 

 			/** Event for USB interface reset. This event fires when the USB interface is in device mode, and

 			 *  a the USB host requests that the device reset its interface. This event fires after the control

@@ -266,7 +233,7 @@
 			 *  \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see

 			 *        \ref Group_USBManagement documentation).

 			 */

-			void EVENT_USB_Reset(void);

+			void EVENT_USB_Device_Reset(void);

 		#endif

 		

 	/* Private Interface - For use in library only: */

@@ -274,35 +241,30 @@
 		/* Function Prototypes: */

 			#if defined(INCLUDE_FROM_EVENTS_C)

 				void USB_Event_Stub(void) ATTR_CONST;

-

-				#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))

-					void EVENT_USB_VBUSChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-					void EVENT_USB_VBUSConnect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-					void EVENT_USB_VBUSDisconnect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-				#endif

 					

-				void EVENT_USB_Connect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-				void EVENT_USB_Disconnect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-				void EVENT_USB_DeviceEnumerationComplete(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-				

 				#if defined(USB_CAN_BE_BOTH)

 					void EVENT_USB_InitFailure(const uint8_t ErrorCode) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

 					void EVENT_USB_UIDChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

 				#endif

 				

 				#if defined(USB_CAN_BE_HOST)

-					void EVENT_USB_HostError(const uint8_t ErrorCode) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-					void EVENT_USB_DeviceAttached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-					void EVENT_USB_DeviceUnattached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

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

+					void EVENT_USB_Host_HostError(const uint8_t ErrorCode) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+					void EVENT_USB_Host_DeviceAttached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+					void EVENT_USB_Host_DeviceUnattached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+					void EVENT_USB_Host_DeviceEnumerationComplete(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

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

 					                                       ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

 				#endif

 

-				void EVENT_USB_UnhandledControlPacket(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-				void EVENT_USB_ConfigurationChanged(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-				void EVENT_USB_Suspend(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-				void EVENT_USB_WakeUp(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

-				void EVENT_USB_Reset(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+				#if defined(USB_CAN_BE_DEVICE)

+					void EVENT_USB_Device_Connect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+					void EVENT_USB_Device_Disconnect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+					void EVENT_USB_Device_UnhandledControlRequest(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+					void EVENT_USB_Device_ConfigurationChanged(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+					void EVENT_USB_Device_Suspend(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+					void EVENT_USB_Device_WakeUp(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+					void EVENT_USB_Device_Reset(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);

+				#endif

 			#endif

 	#endif

 

diff --git a/LUFA/Drivers/USB/HighLevel/StdRequestType.h b/LUFA/Drivers/USB/HighLevel/StdRequestType.h
index b9ae04598..c5be544b9 100644
--- a/LUFA/Drivers/USB/HighLevel/StdRequestType.h
+++ b/LUFA/Drivers/USB/HighLevel/StdRequestType.h
@@ -160,41 +160,41 @@
 			{

 				REQ_GetStatus           = 0, /**< Implemented in the library for device, endpoint and interface

 				                              *   recipients. Passed to the user application for other recipients

-				                              *   via the \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   via the \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 				REQ_ClearFeature        = 1, /**< Implemented in the library for device, endpoint and interface

 				                              *   recipients. Passed to the user application for other recipients

-				                              *   via the \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   via the \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 				REQ_SetFeature          = 3, /**< Implemented in the library for device, endpoint and interface

 				                              *   recipients. Passed to the user application for other recipients

-				                              *   via the \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   via the \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 				REQ_SetAddress          = 5, /**< Implemented in the library for the device recipient. Passed

 				                              *   to the user application for other recipients via the

-				                              *   \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 				REQ_GetDescriptor       = 6, /**< Implemented in the library for all recipients and all request

 				                              *   types. */

 				REQ_SetDescriptor       = 7, /**< Not implemented in the library, passed to the user application

-				                              *   via the \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   via the \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 				REQ_GetConfiguration    = 8, /**< Implemented in the library for the device recipient. Passed

 				                              *   to the user application for other recipients via the

-				                              *   \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 				REQ_SetConfiguration    = 9, /**< Implemented in the library for the device recipient. Passed

 				                              *   to the user application for other recipients via the

-				                              *   \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 				REQ_GetInterface        = 10, /**< Not implemented in the library, passed to the user application

-				                              *   via the \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   via the \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 				REQ_SetInterface        = 11, /**< Not implemented in the library, passed to the user application

-				                              *   via the \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   via the \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 				REQ_SynchFrame          = 12, /**< Not implemented in the library, passed to the user application

-				                              *   via the \ref EVENT_USB_UnhandledControlPacket() event when received in

+				                              *   via the \ref EVENT_USB_Device_UnhandledControlRequest() event when received in

 				                              *   device mode. */

 			};

 

diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
index 51a761ae7..56e54f25a 100644
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -72,36 +72,15 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 	{

 		USB_INT_Clear(USB_INT_VBUS);

 

-		EVENT_USB_VBUSChange();

-

 		if (USB_VBUS_GetStatus())

 		{

-			EVENT_USB_VBUSConnect();

-			

-			if (USB_DeviceState != DEVICE_STATE_Unattached)

-			  EVENT_USB_Disconnect();

-				

-			USB_ResetInterface();

-

 			USB_DeviceState = DEVICE_STATE_Powered;

-			EVENT_USB_Connect();

+			EVENT_USB_Device_Connect();

 		}

 		else

 		{

-			USB_DeviceState = DEVICE_STATE_Unattached;

-			EVENT_USB_Disconnect();

-		

-			USB_Detach();

-			USB_CLK_Freeze();

-

-			if (!(USB_Options & USB_OPT_MANUAL_PLL))

-			  USB_PLL_Off();

-

-			USB_REG_Off();

-

-			EVENT_USB_VBUSDisconnect();

-			

-			USB_INT_Clear(USB_INT_VBUS);

+			USB_DeviceState = DEVICE_STATE_Unattached;		

+			EVENT_USB_Device_Disconnect();

 		}

 	}

 	#endif

@@ -120,10 +99,10 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 

 		#if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)

 		USB_DeviceState = DEVICE_STATE_Unattached;

-		EVENT_USB_Disconnect();

+		EVENT_USB_Device_Disconnect();

 		#else

 		USB_DeviceState = DEVICE_STATE_Suspended;

-		EVENT_USB_Suspend();

+		EVENT_USB_Device_Suspend();

 		#endif

 	}

 

@@ -143,11 +122,11 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 		USB_INT_Enable(USB_INT_SUSPEND);

 		

 		#if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)

-		USB_DeviceState = DEVICE_STATE_Powered;

-		EVENT_USB_Connect();

+		USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;

+		EVENT_USB_Device_Connect();

 		#else

 		USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;

-		EVENT_USB_WakeUp();		

+		EVENT_USB_Device_WakeUp();		

 		#endif

 	}

    

@@ -172,7 +151,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 		USB_INT_Enable(USB_INT_ENDPOINT_SETUP);

 		#endif

 

-		EVENT_USB_Reset();

+		EVENT_USB_Device_Reset();

 	}

 	#endif

 	

@@ -183,8 +162,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 		USB_INT_Clear(USB_INT_DCONNI);

 		USB_INT_Disable(USB_INT_DDISCI);

 			

-		EVENT_USB_DeviceUnattached();

-		EVENT_USB_Disconnect();

+		EVENT_USB_Host_DeviceUnattached();

 

 		USB_ResetInterface();

 	}

@@ -196,8 +174,8 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 		USB_Host_VBUS_Manual_Off();

 		USB_Host_VBUS_Auto_Off();

 

-		EVENT_USB_HostError(HOST_ERROR_VBusVoltageDip);

-		EVENT_USB_DeviceUnattached();

+		EVENT_USB_Host_HostError(HOST_ERROR_VBusVoltageDip);

+		EVENT_USB_Host_DeviceUnattached();

 

 		USB_HostState = HOST_STATE_Unattached;

 	}

@@ -207,7 +185,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 		USB_INT_Clear(USB_INT_SRPI);

 		USB_INT_Disable(USB_INT_SRPI);

 	

-		EVENT_USB_DeviceAttached();

+		EVENT_USB_Host_DeviceAttached();

 

 		USB_INT_Enable(USB_INT_DDISCI);

 		

@@ -218,11 +196,8 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 	{

 		USB_INT_Clear(USB_INT_BCERRI);

 		

-		EVENT_USB_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);

-		EVENT_USB_DeviceUnattached();

-		

-		if (USB_HostState != HOST_STATE_Unattached)

-		  EVENT_USB_Disconnect();

+		EVENT_USB_Host_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);

+		EVENT_USB_Host_DeviceUnattached();

 

 		USB_ResetInterface();

 	}

@@ -237,15 +212,11 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 		  EVENT_USB_Disconnect();

 

 		if (USB_HostState != HOST_STATE_Unattached)

-		{

-			EVENT_USB_Disconnect();

-			EVENT_USB_DeviceUnattached();

-		}

-	

-		EVENT_USB_Disconnect();

-

-		EVENT_USB_UIDChange();

+		  EVENT_USB_Host_DeviceUnattached();

 		

+		USB_CurrentMode = USB_GetUSBModeFromUID();

+		EVENT_USB_UIDChange();

+

 		USB_ResetInterface();

 	}

 	#endif

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index c02a38bf6..f1277b9a7 100644
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -68,7 +68,7 @@ static void USB_DeviceTask(void)
 		Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);

 

 		if (Endpoint_IsSETUPReceived())

-		  USB_Device_ProcessControlPacket();

+		  USB_Device_ProcessControlRequest();

 		

 		Endpoint_SelectEndpoint(PrevEndpoint);

 	}

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index 9138e687f..08accc1ef 100644
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -65,7 +65,7 @@
 			extern volatile bool USB_IsInitialized;

 

 			/** Structure containing the last received Control request when in Device mode (for use in user-applications

-			 *  inside of the \ref EVENT_USB_UnhandledControlPacket() event, or for filling up with a control request to issue when

+			 *  inside of the \ref EVENT_USB_Device_UnhandledControlRequest() event, or for filling up with a control request to issue when

 			 *  in Host mode before calling \ref USB_Host_SendControlRequest().

 			 *

 			 *  \ingroup Group_USBManagement

@@ -108,7 +108,7 @@
 					 *

 					 *  This value should not be altered by the user application as it is handled automatically by the

 					 *  library. The only exception to this rule is if the NO_LIMITED_CONTROLLER_CONNECT token is used

-					 *  (see \ref EVENT_USB_Connect() and \ref EVENT_USB_Disconnect() events).

+					 *  (see \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events).

 					 *

 					 *  To reduce program size and speed up checks of this global, it can be placed into one of the AVR's

 					 *  GPIOR hardware registers instead of RAM by defining the DEVICE_STATE_AS_GPIOR token to a value 

@@ -142,12 +142,12 @@
 			 *  The USB task must be serviced within 30ms while in device mode, or within 1ms while in host mode.

 			 *  The task may be serviced at all times, or (for minimum CPU consumption):

 			 *

-			 *    - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Connect() event

-			 *    and disabled again on the firing of the \ref EVENT_USB_Disconnect() event.

+			 *    - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Device_Connect() 

+			 *      event and disabled again on the firing of the \ref EVENT_USB_Device_Disconnect() event.

 			 *

-			 *    - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_DeviceAttached()

-			 *    event and disabled again on the firing of the \ref EVENT_USB_DeviceEnumerationComplete() or

-			 *    \ref EVENT_USB_DeviceEnumerationFailed() events.

+			 *    - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Host_DeviceAttached()

+			 *      event and disabled again on the firing of the \ref EVENT_USB_Host_DeviceEnumerationComplete() or

+			 *      \ref EVENT_USB_Host_DeviceEnumerationFailed() events.

 			 *

 			 *  If in device mode (only), the control endpoint can instead be managed via interrupts entirely by the library

 			 *  by defining the INTERRUPT_CONTROL_ENDPOINT token and passing it to the compiler via the -D switch.