More UC3B architecture port updates.

[pub/lufa.git] / LUFA / Drivers / USB / Core / UC3B / USBController_UC3B.c

diff --git a/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c b/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
index 1a80c5b..8e18add 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
+++ b/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
@@ -60,15 +60,10 @@ void USB_Init(
        USB_Options = Options;\r
        #endif\r
 \r
-       if (!(USB_Options & USB_OPT_REG_DISABLED))\r
-         USB_REG_On();\r
-       else\r
-         USB_REG_Off();\r
-\r
        #if defined(USB_CAN_BE_BOTH)\r
        if (Mode == USB_MODE_UID)\r
        {\r
-               UHWCON |= (1 << UIDE);\r
+               AVR32_USBB.USBCON.uide = true;\r
                USB_INT_Enable(USB_INT_IDTI);\r
                USB_CurrentMode = USB_GetUSBModeFromUID();\r
        }\r
@@ -91,14 +86,7 @@ void USB_Disable(void)
        USB_Detach();\r
        USB_Controller_Disable();\r
 \r
-       if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
-         USB_PLL_Off();\r
-\r
-       USB_REG_Off();\r
-\r
-       #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r
        USB_OTGPAD_Off();\r
-       #endif\r
 \r
        #if defined(USB_CAN_BE_BOTH)\r
        USB_CurrentMode = USB_MODE_None;\r
@@ -118,20 +106,10 @@ void USB_ResetInterface(void)
 \r
        USB_Controller_Reset();\r
 \r
-       if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
-       {\r
-               #if defined(USB_SERIES_4_AVR)\r
-               PLLFRQ = ((1 << PLLUSB) | (1 << PDIV3) | (1 << PDIV1));\r
-               #endif\r
-\r
-               USB_PLL_On();\r
-               while (!(USB_PLL_IsReady()));\r
-       }\r
-\r
        #if defined(USB_CAN_BE_BOTH)\r
        if (UIDModeSelectEnabled)\r
        {\r
-               UHWCON |= (1 << UIDE);\r
+               AVR32_USBB.USBCON.uide = true;\r
                USB_INT_Enable(USB_INT_IDTI);\r
        }\r
        #endif\r
@@ -141,25 +119,19 @@ void USB_ResetInterface(void)
        if (USB_CurrentMode == USB_MODE_Device)\r
        {\r
                #if defined(USB_CAN_BE_DEVICE)\r
-               #if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
-               UHWCON |=  (1 << UIMOD);\r
-               #endif\r
-\r
+               AVR32_USBB.USBCON.uimod = true;\r
                USB_Init_Device();\r
                #endif\r
        }\r
        else if (USB_CurrentMode == USB_MODE_Host)\r
        {\r
                #if defined(USB_CAN_BE_HOST)\r
-               UHWCON &= ~(1 << UIMOD);\r
-\r
+               AVR32_USBB.USBCON.uimod = false;\r
                USB_Init_Host();\r
                #endif\r
        }\r
 \r
-       #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
        USB_OTGPAD_On();\r
-       #endif\r
 }\r
 \r
 #if defined(USB_CAN_BE_DEVICE)\r