Updated all host mode demos and projects to use the EVENT_USB_Host_DeviceEnumerationC...

[pub/USBasp.git] / LUFA / Drivers / USB / Core / UC3 / USBController_UC3.c

diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c
index 0b0d04d..7cfa28e 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c
+++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c
@@ -147,22 +147,22 @@ void USB_ResetInterface(void)
 #if defined(USB_CAN_BE_DEVICE)\r
 static void USB_Init_Device(void)\r
 {\r
-       USB_DeviceState          = DEVICE_STATE_Unattached;\r
-       USB_ConfigurationNumber  = 0;\r
+       USB_DeviceState                 = DEVICE_STATE_Unattached;\r
+       USB_Device_ConfigurationNumber  = 0;\r
 \r
        #if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
-       USB_RemoteWakeupEnabled  = false;\r
+       USB_Device_RemoteWakeupEnabled  = false;\r
        #endif\r
 \r
        #if !defined(NO_DEVICE_SELF_POWER)\r
-       USB_CurrentlySelfPowered = false;\r
+       USB_Device_CurrentlySelfPowered = false;\r
        #endif\r
 \r
        #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)\r
        USB_Descriptor_Device_t* DeviceDescriptorPtr;\r
 \r
        if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)\r
-         USB_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;\r
+         USB_Device_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;\r
        #endif\r
 \r
        if (USB_Options & USB_DEVICE_OPT_LOWSPEED)\r
@@ -173,7 +173,7 @@ static void USB_Init_Device(void)
        USB_INT_Enable(USB_INT_VBUSTI);\r
 \r
        Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,\r
-                                                          ENDPOINT_DIR_OUT, USB_ControlEndpointSize,\r
+                                                          ENDPOINT_DIR_OUT, USB_Device_ControlEndpointSize,\r
                                                           ENDPOINT_BANK_SINGLE);\r
 \r
        USB_INT_Clear(USB_INT_SUSPI);\r
@@ -187,8 +187,9 @@ static void USB_Init_Device(void)
 #if defined(USB_CAN_BE_HOST)\r
 static void USB_Init_Host(void)\r
 {\r
-       USB_HostState       = HOST_STATE_Unattached;\r
-       USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r
+       USB_HostState                = HOST_STATE_Unattached;\r
+       USB_Host_ConfigurationNumber = 0;\r
+       USB_Host_ControlPipeSize     = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r
 \r
        USB_Host_HostMode_On();\r
 \r