Renamed all library events to properly seperate out Device and Host mode events....

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / DevChapter9.c

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index f9c52e6..033db09 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -39,7 +39,7 @@ uint8_t USB_ConfigurationNumber;
 bool    USB_RemoteWakeupEnabled;\r
 bool    USB_CurrentlySelfPowered;\r
 \r
-void USB_Device_ProcessControlPacket(void)\r
+void USB_Device_ProcessControlRequest(void)\r
 {\r
        bool     RequestHandled = false;\r
        uint8_t* RequestHeader  = (uint8_t*)&USB_ControlRequest;\r
@@ -106,7 +106,7 @@ void USB_Device_ProcessControlPacket(void)
        }\r
 \r
        if (!(RequestHandled))\r
-         EVENT_USB_UnhandledControlPacket();\r
+         EVENT_USB_Device_UnhandledControlRequest();\r
          \r
        if (Endpoint_IsSETUPReceived())\r
        {\r
@@ -139,8 +139,6 @@ static void USB_Device_SetAddress(void)
 \r
 static void USB_Device_SetConfiguration(void)\r
 {\r
-       bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
-\r
 #if defined(FIXED_NUM_CONFIGURATIONS)\r
        if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)\r
          return;\r
@@ -195,18 +193,11 @@ static void USB_Device_SetConfiguration(void)
        Endpoint_ClearIN();\r
 \r
        if (USB_ConfigurationNumber)\r
-       {\r
-               USB_DeviceState = DEVICE_STATE_Configured;\r
-\r
-               if (!(AlreadyConfigured))\r
-                 EVENT_USB_DeviceEnumerationComplete();\r
-       }\r
+         USB_DeviceState = DEVICE_STATE_Configured;\r
        else\r
-       {\r
-               USB_DeviceState = DEVICE_STATE_Addressed;\r
-       }\r
+         USB_DeviceState = DEVICE_STATE_Addressed;\r
 \r
-       EVENT_USB_ConfigurationChanged();\r
+       EVENT_USB_Device_ConfigurationChanged();\r
 }\r
 \r
 void USB_Device_GetConfiguration(void)\r