Fixed PDI/TPI programming speed of ~250KHz in the AVRISP-MKII Clone project, instead...

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / USBTask.c

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index 5ec1746..a4c47c7 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   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 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


@@ -50,9 +50,9 @@ void USB_USBTask(void)
        #elif defined(USB_DEVICE_ONLY)
                USB_DeviceTask();
        #else
        #elif defined(USB_DEVICE_ONLY)
                USB_DeviceTask();
        #else

-               if (USB_CurrentMode == USB_MODE_DEVICE)
+               if (USB_CurrentMode == USB_MODE_Device)

                  USB_DeviceTask();
                  USB_DeviceTask();

-               else if (USB_CurrentMode == USB_MODE_HOST)
+               else if (USB_CurrentMode == USB_MODE_Host)

                  USB_HostTask();
        #endif
 }
                  USB_HostTask();
        #endif
 }


@@ -63,12 +63,12 @@ static void USB_DeviceTask(void)
        if (USB_DeviceState != DEVICE_STATE_Unattached)
        {
                uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint();
        if (USB_DeviceState != DEVICE_STATE_Unattached)
        {
                uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint();

-       
+

                Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
 
                if (Endpoint_IsSETUPReceived())
                  USB_Device_ProcessControlRequest();
                Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
 
                if (Endpoint_IsSETUPReceived())
                  USB_Device_ProcessControlRequest();

-               
+

                Endpoint_SelectEndpoint(PrevEndpoint);
        }
 }
                Endpoint_SelectEndpoint(PrevEndpoint);
        }
 }


@@ -78,11 +78,12 @@ static void USB_DeviceTask(void)
 static void USB_HostTask(void)
 {
        uint8_t PrevPipe = Pipe_GetCurrentPipe();
 static void USB_HostTask(void)
 {
        uint8_t PrevPipe = Pipe_GetCurrentPipe();

-       
+

        Pipe_SelectPipe(PIPE_CONTROLPIPE);
 
        USB_Host_ProcessNextHostState();
        Pipe_SelectPipe(PIPE_CONTROLPIPE);
 
        USB_Host_ProcessNextHostState();

-       
+

        Pipe_SelectPipe(PrevPipe);
 }
 #endif
        Pipe_SelectPipe(PrevPipe);
 }
 #endif

+