projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add more const-ness to the stream endpoint/pipe functions where possible.
[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / USBController.c
diff --git a/LUFA/Drivers/USB/LowLevel/USBController.c b/LUFA/Drivers/USB/LowLevel/USBController.c
index f6b1b12..f41b5cc 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/USBController.c
+++ b/LUFA/Drivers/USB/LowLevel/USBController.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+
   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 
-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in
   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -33,7 +33,7 @@
 #include "USBController.h"
 
 #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))
 #include "USBController.h"
 
 #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))
-volatile uint8_t USB_CurrentMode     = USB_MODE_NONE;
+volatile uint8_t USB_CurrentMode = USB_MODE_None;
 #endif
 
 #if !defined(USE_STATIC_OPTIONS)
 #endif
 
 #if !defined(USE_STATIC_OPTIONS)
@@ -50,7 +50,7 @@ void USB_Init(
                #elif (!defined(USB_CAN_BE_BOTH) && defined(USE_STATIC_OPTIONS))
                void
                #endif
                #elif (!defined(USB_CAN_BE_BOTH) && defined(USE_STATIC_OPTIONS))
                void
                #endif
-                          
+
                #if !defined(USE_STATIC_OPTIONS)
                const uint8_t Options
                #endif
                #if !defined(USE_STATIC_OPTIONS)
                const uint8_t Options
                #endif
@@ -59,7 +59,7 @@ void USB_Init(
        #if !defined(USE_STATIC_OPTIONS)
        USB_Options = Options;
        #endif
        #if !defined(USE_STATIC_OPTIONS)
        USB_Options = Options;
        #endif
-       
+
        if (!(USB_Options & USB_OPT_REG_DISABLED))
          USB_REG_On();
        else
        if (!(USB_Options & USB_OPT_REG_DISABLED))
          USB_REG_On();
        else
@@ -69,7 +69,7 @@ void USB_Init(
        if (Mode == USB_MODE_UID)
        {
                UHWCON |= (1 << UIDE);
        if (Mode == USB_MODE_UID)
        {
                UHWCON |= (1 << UIDE);
-               USB_INT_Enable(USB_INT_IDTI);           
+               USB_INT_Enable(USB_INT_IDTI);
                USB_CurrentMode = USB_GetUSBModeFromUID();
        }
        else
                USB_CurrentMode = USB_GetUSBModeFromUID();
        }
        else
@@ -83,17 +83,17 @@ void USB_Init(
        USB_ResetInterface();
 }
 
        USB_ResetInterface();
 }
 
-void USB_ShutDown(void)
+void USB_Disable(void)
 {
        USB_INT_DisableAllInterrupts();
        USB_INT_ClearAllInterrupts();
 
        USB_Detach();
        USB_Controller_Disable();
 {
        USB_INT_DisableAllInterrupts();
        USB_INT_ClearAllInterrupts();
 
        USB_Detach();
        USB_Controller_Disable();
-       
+
        if (!(USB_Options & USB_OPT_MANUAL_PLL))
          USB_PLL_Off();
        if (!(USB_Options & USB_OPT_MANUAL_PLL))
          USB_PLL_Off();
-       
+
        USB_REG_Off();
 
        #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
        USB_REG_Off();
 
        #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
@@ -101,7 +101,7 @@ void USB_ShutDown(void)
        #endif
 
        #if defined(USB_CAN_BE_BOTH)
        #endif
 
        #if defined(USB_CAN_BE_BOTH)
-       USB_CurrentMode = USB_MODE_NONE;
+       USB_CurrentMode = USB_MODE_None;
        #endif
 
        USB_IsInitialized = false;
        #endif
 
        USB_IsInitialized = false;
@@ -115,9 +115,9 @@ void USB_ResetInterface(void)
 
        USB_INT_DisableAllInterrupts();
        USB_INT_ClearAllInterrupts();
 
        USB_INT_DisableAllInterrupts();
        USB_INT_ClearAllInterrupts();
-       
+
        USB_Controller_Reset();
        USB_Controller_Reset();
-         
+
        if (!(USB_Options & USB_OPT_MANUAL_PLL))
        {
                #if defined(USB_SERIES_4_AVR)
        if (!(USB_Options & USB_OPT_MANUAL_PLL))
        {
                #if defined(USB_SERIES_4_AVR)
@@ -137,25 +137,26 @@ void USB_ResetInterface(void)
        #endif
 
        USB_CLK_Unfreeze();
        #endif
 
        USB_CLK_Unfreeze();
-       
-       if (USB_CurrentMode == USB_MODE_DEVICE)
+
+       if (USB_CurrentMode == USB_MODE_Device)
        {
                #if defined(USB_CAN_BE_DEVICE)
                #if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
                UHWCON |=  (1 << UIMOD);
                #endif
        {
                #if defined(USB_CAN_BE_DEVICE)
                #if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
                UHWCON |=  (1 << UIMOD);
                #endif
-               
+
                USB_Init_Device();
                #endif
        }
                USB_Init_Device();
                #endif
        }
-       else
+       else if (USB_CurrentMode == USB_MODE_Host)
        {
                #if defined(USB_CAN_BE_HOST)
                UHWCON &= ~(1 << UIMOD);
        {
                #if defined(USB_CAN_BE_HOST)
                UHWCON &= ~(1 << UIMOD);
+
                USB_Init_Host();
                #endif
        }
                USB_Init_Host();
                #endif
        }
-       
+
        #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
        USB_OTGPAD_On();
        #endif
        #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
        USB_OTGPAD_On();
        #endif
@@ -170,7 +171,7 @@ static void USB_Init_Device(void)
        #if !defined(NO_DEVICE_REMOTE_WAKEUP)
        USB_RemoteWakeupEnabled  = false;
        #endif
        #if !defined(NO_DEVICE_REMOTE_WAKEUP)
        USB_RemoteWakeupEnabled  = false;
        #endif
-       
+
        #if !defined(NO_DEVICE_SELF_POWER)
        USB_CurrentlySelfPowered = false;
        #endif
        #if !defined(NO_DEVICE_SELF_POWER)
        USB_CurrentlySelfPowered = false;
        #endif
@@ -179,7 +180,7 @@ static void USB_Init_Device(void)
        USB_Descriptor_Device_t* DeviceDescriptorPtr;
 
        if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)
        USB_Descriptor_Device_t* DeviceDescriptorPtr;
 
        if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)
-       {                 
+       {
                #if defined(USE_RAM_DESCRIPTORS)
                USB_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
                #elif defined(USE_EEPROM_DESCRIPTORS)
                #if defined(USE_RAM_DESCRIPTORS)
                USB_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
                #elif defined(USE_EEPROM_DESCRIPTORS)
@@ -201,7 +202,7 @@ static void USB_Init_Device(void)
 
        Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
                                                           ENDPOINT_DIR_OUT, USB_ControlEndpointSize,
 
        Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
                                                           ENDPOINT_DIR_OUT, USB_ControlEndpointSize,
-                                                          ENDPOINT_BANK_SINGLE);               
+                                                          ENDPOINT_BANK_SINGLE);
 
        USB_INT_Clear(USB_INT_SUSPI);
        USB_INT_Enable(USB_INT_SUSPI);
 
        USB_INT_Clear(USB_INT_SUSPI);
        USB_INT_Enable(USB_INT_SUSPI);
@@ -218,7 +219,7 @@ static void USB_Init_Host(void)
        USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
 
        USB_Host_HostMode_On();
        USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
 
        USB_Host_HostMode_On();
-       
+
        USB_Host_VBUS_Auto_Off();
        USB_Host_VBUS_Manual_Enable();
        USB_Host_VBUS_Manual_On();
        USB_Host_VBUS_Auto_Off();
        USB_Host_VBUS_Manual_Enable();
        USB_Host_VBUS_Manual_On();
@@ -229,3 +230,4 @@ static void USB_Init_Host(void)
        USB_Attach();
 }
 #endif
        USB_Attach();
 }
 #endif
+
USB isp AVR programmer