Oops - fix broken SPI driver due to missing bit inversion on a port mask.

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

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index 37ad0ad..25b08b7 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */


@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 /*
   Copyright 2010  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


@@ -55,15 +55,15 @@ void USB_Host_ProcessNextHostState(void)
                                        ErrorCode     = HOST_ENUMERROR_WaitStage;
                                        break;
                                }
                                        ErrorCode     = HOST_ENUMERROR_WaitStage;
                                        break;
                                }

-                               
+

                                if (!(--WaitMSRemaining))
                                  USB_HostState = PostWaitState;
                        }
                                if (!(--WaitMSRemaining))
                                  USB_HostState = PostWaitState;
                        }

-               
+

                        break;
                case HOST_STATE_Powered:
                        WaitMSRemaining = HOST_DEVICE_SETTLE_DELAY_MS;
                        break;
                case HOST_STATE_Powered:
                        WaitMSRemaining = HOST_DEVICE_SETTLE_DELAY_MS;

-               
+

                        USB_HostState = HOST_STATE_Powered_WaitForDeviceSettle;
                        break;
                case HOST_STATE_Powered_WaitForDeviceSettle:
                        USB_HostState = HOST_STATE_Powered_WaitForDeviceSettle;
                        break;
                case HOST_STATE_Powered_WaitForDeviceSettle:


@@ -79,23 +79,23 @@ void USB_Host_ProcessNextHostState(void)
                                USB_OTGPAD_On();
                                USB_Host_VBUS_Auto_Enable();
                                USB_Host_VBUS_Auto_On();
                                USB_OTGPAD_On();
                                USB_Host_VBUS_Auto_Enable();
                                USB_Host_VBUS_Auto_On();

-                               
+

                                USB_HostState = HOST_STATE_Powered_WaitForConnect;
                        }
                                USB_HostState = HOST_STATE_Powered_WaitForConnect;
                        }

-                       
+

                        break;
                        break;

-               case HOST_STATE_Powered_WaitForConnect:         
+               case HOST_STATE_Powered_WaitForConnect:

                        if (USB_INT_HasOccurred(USB_INT_DCONNI))
                        if (USB_INT_HasOccurred(USB_INT_DCONNI))

-                       {       
+                       {

                                USB_INT_Clear(USB_INT_DCONNI);
                                USB_INT_Clear(USB_INT_DDISCI);
 
                                USB_INT_Clear(USB_INT_VBERRI);
                                USB_INT_Enable(USB_INT_VBERRI);
                                USB_INT_Clear(USB_INT_DCONNI);
                                USB_INT_Clear(USB_INT_DDISCI);
 
                                USB_INT_Clear(USB_INT_VBERRI);
                                USB_INT_Enable(USB_INT_VBERRI);

-                                       
+

                                USB_Host_ResumeBus();
                                Pipe_ClearPipes();
                                USB_Host_ResumeBus();
                                Pipe_ClearPipes();

-                               
+

                                HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Powered_DoReset);
                        }
 
                                HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Powered_DoReset);
                        }
 


@@ -108,8 +108,8 @@ void USB_Host_ProcessNextHostState(void)
                case HOST_STATE_Powered_ConfigPipe:
                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
                                                           PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
                case HOST_STATE_Powered_ConfigPipe:
                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
                                                           PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,

-                                                          PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE);            
-               
+                                                          PIPE_CONTROLPIPE_DEFAULT_SIZE, PIPE_BANK_SINGLE);
+

                        if (!(Pipe_IsConfigured()))
                        {
                                ErrorCode    = HOST_ENUMERROR_PipeConfigError;
                        if (!(Pipe_IsConfigured()))
                        {
                                ErrorCode    = HOST_ENUMERROR_PipeConfigError;


@@ -138,16 +138,12 @@ void USB_Host_ProcessNextHostState(void)
                        }
 
                        USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];
                        }
 
                        USB_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];

-       
+

                        USB_Host_ResetDevice();
                        USB_Host_ResetDevice();

-                       
+

                        HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset);
                        break;
                case HOST_STATE_Default_PostReset:
                        HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset);
                        break;
                case HOST_STATE_Default_PostReset:

-                       Pipe_DisablePipe();
-                       Pipe_DeallocateMemory();                
-                       Pipe_ResetPipe(PIPE_CONTROLPIPE);
-                       

                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
                                           PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
                                           USB_ControlPipeSize, PIPE_BANK_SINGLE);
                        Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
                                           PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
                                           USB_ControlPipeSize, PIPE_BANK_SINGLE);


@@ -200,7 +196,11 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
 {
        bool    BusSuspended = USB_Host_IsBusSuspended();
        uint8_t ErrorCode    = HOST_WAITERROR_Successful;
 {
        bool    BusSuspended = USB_Host_IsBusSuspended();
        uint8_t ErrorCode    = HOST_WAITERROR_Successful;

-       
+       bool    HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI);
+
+       USB_INT_Disable(USB_INT_HSOFI);
+       USB_INT_Clear(USB_INT_HSOFI);
+

        USB_Host_ResumeBus();
 
        while (MS)
        USB_Host_ResumeBus();
 
        while (MS)


@@ -210,11 +210,11 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
                        USB_INT_Clear(USB_INT_HSOFI);
                        MS--;
                }
                        USB_INT_Clear(USB_INT_HSOFI);
                        MS--;
                }

-                                       
-               if ((USB_HostState == HOST_STATE_Unattached) || (USB_CurrentMode == USB_MODE_DEVICE))
+
+               if ((USB_HostState == HOST_STATE_Unattached) || (USB_CurrentMode != USB_MODE_Host))

                {
                        ErrorCode = HOST_WAITERROR_DeviceDisconnect;
                {
                        ErrorCode = HOST_WAITERROR_DeviceDisconnect;

-                       
+

                        break;
                }
 
                        break;
                }
 


@@ -222,22 +222,25 @@ uint8_t USB_Host_WaitMS(uint8_t MS)
                {
                        Pipe_ClearError();
                        ErrorCode = HOST_WAITERROR_PipeError;
                {
                        Pipe_ClearError();
                        ErrorCode = HOST_WAITERROR_PipeError;

-                       
+

                        break;
                }
                        break;
                }

-               
+

                if (Pipe_IsStalled() == true)
                {
                        Pipe_ClearStall();
                        ErrorCode = HOST_WAITERROR_SetupStalled;
                if (Pipe_IsStalled() == true)
                {
                        Pipe_ClearStall();
                        ErrorCode = HOST_WAITERROR_SetupStalled;

-                       
-                       break;                  
+
+                       break;

                }
        }
 
        if (BusSuspended)
          USB_Host_SuspendBus();
 
                }
        }
 
        if (BusSuspended)
          USB_Host_SuspendBus();
 

+       if (HSOFIEnabled)
+         USB_INT_Enable(USB_INT_HSOFI);
+

        return ErrorCode;
 }
 
        return ErrorCode;
 }
 


@@ -246,12 +249,14 @@ static void USB_Host_ResetDevice(void)
        bool BusSuspended = USB_Host_IsBusSuspended();
 
        USB_INT_Disable(USB_INT_DDISCI);
        bool BusSuspended = USB_Host_IsBusSuspended();
 
        USB_INT_Disable(USB_INT_DDISCI);

-       
+

        USB_Host_ResetBus();
        while (!(USB_Host_IsBusResetComplete()));
        USB_Host_ResetBus();
        while (!(USB_Host_IsBusResetComplete()));

-

        USB_Host_ResumeBus();
 
        USB_Host_ResumeBus();
 

+       bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI);
+
+       USB_INT_Disable(USB_INT_HSOFI);

        USB_INT_Clear(USB_INT_HSOFI);
 
        for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
        USB_INT_Clear(USB_INT_HSOFI);
 
        for (uint8_t MSRem = 10; MSRem != 0; MSRem--)


@@ -267,10 +272,13 @@ static void USB_Host_ResetDevice(void)
                        USB_INT_Clear(USB_INT_DDISCI);
                        break;
                }
                        USB_INT_Clear(USB_INT_DDISCI);
                        break;
                }

-               
+

                _delay_ms(1);
        }
 
                _delay_ms(1);
        }
 

+       if (HSOFIEnabled)
+         USB_INT_Enable(USB_INT_HSOFI);
+

        if (BusSuspended)
          USB_Host_SuspendBus();
 
        if (BusSuspended)
          USB_Host_SuspendBus();
 


@@ -289,7 +297,7 @@ uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber)
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);

-       
+

        return USB_Host_SendControlRequest(NULL);
 }
 
        return USB_Host_SendControlRequest(NULL);
 }
 


@@ -305,11 +313,13 @@ uint8_t USB_Host_GetDeviceDescriptor(void* const DeviceDescriptorPtr)
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);

-       
+

        return USB_Host_SendControlRequest(DeviceDescriptorPtr);
 }
 
        return USB_Host_SendControlRequest(DeviceDescriptorPtr);
 }
 

-uint8_t USB_Host_GetDeviceStringDescriptor(const uint8_t Index, void* const Buffer, const uint8_t BufferLength)
+uint8_t USB_Host_GetDeviceStringDescriptor(const uint8_t Index,
+                                           void* const Buffer,
+                                           const uint8_t BufferLength)

 {
        USB_ControlRequest = (USB_Request_Header_t)
                {
 {
        USB_ControlRequest = (USB_Request_Header_t)
                {


@@ -321,15 +331,12 @@ uint8_t USB_Host_GetDeviceStringDescriptor(const uint8_t Index, void* const Buff
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);

-       
+

        return USB_Host_SendControlRequest(Buffer);
 }
 
        return USB_Host_SendControlRequest(Buffer);
 }
 

-uint8_t USB_Host_ClearPipeStall(uint8_t EndpointNum)
+uint8_t USB_Host_ClearPipeStall(const uint8_t EndpointNum)

 {
 {

-       if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)
-         EndpointNum |= ENDPOINT_DESCRIPTOR_DIR_IN;
-

        USB_ControlRequest = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),
        USB_ControlRequest = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),


@@ -340,8 +347,9 @@ uint8_t USB_Host_ClearPipeStall(uint8_t EndpointNum)
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);

-       
+

        return USB_Host_SendControlRequest(NULL);
 }
 
 #endif
        return USB_Host_SendControlRequest(NULL);
 }
 
 #endif

+