Fixed programming errors in the AVRISP-MKII project when the programming packet is...
[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / HostStandardReq.c
index cc6dc41..16d0ffb 100644 (file)
@@ -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
@@ -36,7 +36,7 @@
 #define  __INCLUDE_FROM_HOSTSTDREQ_C
 #include "HostStandardReq.h"
 
 #define  __INCLUDE_FROM_HOSTSTDREQ_C
 #include "HostStandardReq.h"
 
-uint8_t USB_Host_SendControlRequest(void* BufferPtr)
+uint8_t USB_Host_SendControlRequest(void* const BufferPtr)
 {
        uint8_t* HeaderStream   = (uint8_t*)&USB_ControlRequest;
        uint8_t* DataStream     = (uint8_t*)BufferPtr;
 {
        uint8_t* HeaderStream   = (uint8_t*)&USB_ControlRequest;
        uint8_t* DataStream     = (uint8_t*)BufferPtr;
@@ -45,7 +45,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
        uint16_t DataLen        = USB_ControlRequest.wLength;
 
        USB_Host_ResumeBus();
        uint16_t DataLen        = USB_ControlRequest.wLength;
 
        USB_Host_ResumeBus();
-       
+
        if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
          goto End_Of_Control_Send;
 
        if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
          goto End_Of_Control_Send;
 
@@ -58,7 +58,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
          Pipe_Write_Byte(*(HeaderStream++));
 
        Pipe_ClearSETUP();
          Pipe_Write_Byte(*(HeaderStream++));
 
        Pipe_ClearSETUP();
-       
+
        if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)) != HOST_SENDCONTROL_Successful)
          goto End_Of_Control_Send;
 
        if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)) != HOST_SENDCONTROL_Successful)
          goto End_Of_Control_Send;
 
@@ -70,7 +70,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
        if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_DIRECTION) == REQDIR_DEVICETOHOST)
        {
                Pipe_SetPipeToken(PIPE_TOKEN_IN);
        if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_DIRECTION) == REQDIR_DEVICETOHOST)
        {
                Pipe_SetPipeToken(PIPE_TOKEN_IN);
-               
+
                if (DataStream != NULL)
                {
                        while (DataLen)
                if (DataStream != NULL)
                {
                        while (DataLen)
@@ -79,10 +79,10 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 
                                if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)
                                  goto End_Of_Control_Send;
 
                                if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)
                                  goto End_Of_Control_Send;
-                                                       
+
                                if (!(Pipe_BytesInPipe()))
                                  DataLen = 0;
                                if (!(Pipe_BytesInPipe()))
                                  DataLen = 0;
-                               
+
                                while (Pipe_BytesInPipe() && DataLen)
                                {
                                        *(DataStream++) = Pipe_Read_Byte();
                                while (Pipe_BytesInPipe() && DataLen)
                                {
                                        *(DataStream++) = Pipe_Read_Byte();
@@ -96,7 +96,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 
                Pipe_SetPipeToken(PIPE_TOKEN_OUT);
                Pipe_Unfreeze();
 
                Pipe_SetPipeToken(PIPE_TOKEN_OUT);
                Pipe_Unfreeze();
-               
+
                if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)
                  goto End_Of_Control_Send;
 
                if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)
                  goto End_Of_Control_Send;
 
@@ -110,7 +110,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                if (DataStream != NULL)
                {
                        Pipe_SetPipeToken(PIPE_TOKEN_OUT);
                if (DataStream != NULL)
                {
                        Pipe_SetPipeToken(PIPE_TOKEN_OUT);
-                       Pipe_Unfreeze();        
+                       Pipe_Unfreeze();
 
                        while (DataLen)
                        {
 
                        while (DataLen)
                        {
@@ -118,11 +118,11 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                                  goto End_Of_Control_Send;
 
                                while (DataLen && (Pipe_BytesInPipe() < USB_ControlPipeSize))
                                  goto End_Of_Control_Send;
 
                                while (DataLen && (Pipe_BytesInPipe() < USB_ControlPipeSize))
-                               {                                       
+                               {
                                        Pipe_Write_Byte(*(DataStream++));
                                        DataLen--;
                                }
                                        Pipe_Write_Byte(*(DataStream++));
                                        DataLen--;
                                }
-                               
+
                                Pipe_ClearOUT();
                        }
 
                                Pipe_ClearOUT();
                        }
 
@@ -131,7 +131,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 
                        Pipe_Freeze();
                }
 
                        Pipe_Freeze();
                }
-               
+
                Pipe_SetPipeToken(PIPE_TOKEN_IN);
                Pipe_Unfreeze();
 
                Pipe_SetPipeToken(PIPE_TOKEN_IN);
                Pipe_Unfreeze();
 
@@ -143,7 +143,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 
 End_Of_Control_Send:
        Pipe_Freeze();
 
 End_Of_Control_Send:
        Pipe_Freeze();
-       
+
        if (BusSuspended)
          USB_Host_SuspendBus();
 
        if (BusSuspended)
          USB_Host_SuspendBus();
 
@@ -155,11 +155,11 @@ End_Of_Control_Send:
 static uint8_t USB_Host_WaitForIOS(const uint8_t WaitType)
 {
        #if (USB_HOST_TIMEOUT_MS < 0xFF)
 static uint8_t USB_Host_WaitForIOS(const uint8_t WaitType)
 {
        #if (USB_HOST_TIMEOUT_MS < 0xFF)
-       uint8_t  TimeoutCounter = USB_HOST_TIMEOUT_MS;  
+       uint8_t  TimeoutCounter = USB_HOST_TIMEOUT_MS;
        #else
        uint16_t TimeoutCounter = USB_HOST_TIMEOUT_MS;
        #endif
        #else
        uint16_t TimeoutCounter = USB_HOST_TIMEOUT_MS;
        #endif
-       
+
        while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSETUPSent())  ||
                 ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsINReceived()) ||
                 ((WaitType == USB_HOST_WAITFOR_OutReady)   && Pipe_IsOUTReady())))
        while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSETUPSent())  ||
                 ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsINReceived()) ||
                 ((WaitType == USB_HOST_WAITFOR_OutReady)   && Pipe_IsOUTReady())))
@@ -168,7 +168,7 @@ static uint8_t USB_Host_WaitForIOS(const uint8_t WaitType)
 
                if ((ErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
                  return ErrorCode;
 
                if ((ErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
                  return ErrorCode;
-                       
+
                if (!(TimeoutCounter--))
                  return HOST_SENDCONTROL_SoftwareTimeOut;
        }
                if (!(TimeoutCounter--))
                  return HOST_SENDCONTROL_SoftwareTimeOut;
        }
@@ -177,3 +177,4 @@ static uint8_t USB_Host_WaitForIOS(const uint8_t WaitType)
 }
 
 #endif
 }
 
 #endif
+