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

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

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index 5f10902..74a8f51 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
-              
+
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
@@ -9,13 +9,13 @@
 /*
   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
-  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
-  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
@@ -44,47 +44,17 @@ bool Pipe_ConfigurePipe(const uint8_t Number,
                         const uint16_t Size,
                         const uint8_t Banks)
 {
-       uint8_t UPCFG0XTemp[PIPE_TOTAL_PIPES];
-       uint8_t UPCFG1XTemp[PIPE_TOTAL_PIPES];
-       
-       for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)
-       {
-               Pipe_SelectPipe(PNum);
-               UPCFG0XTemp[PNum] = UPCFG0X;
-               UPCFG1XTemp[PNum] = UPCFG1X;
-       }
-       
-       UPCFG0XTemp[Number] = ((Type << EPTYPE0) | Token | ((EndpointNumber & PIPE_EPNUM_MASK) << PEPNUM0));
-       UPCFG1XTemp[Number] = ((1 << ALLOC) | Banks | Pipe_BytesToEPSizeMask(Size));
-       
-       for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)
-       {
-               Pipe_SelectPipe(PNum);
-               UPIENX  = 0;
-               UPINTX  = 0;
-               UPCFG1X = 0;
-               Pipe_DisablePipe();
-       }
+       Pipe_SelectPipe(Number);
+       Pipe_EnablePipe();
 
-       for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)
-       {
-               if (!(UPCFG1XTemp[PNum] & (1 << ALLOC)))
-                 continue;
-               
-               Pipe_SelectPipe(PNum);          
-               Pipe_EnablePipe();
+       UPCFG1X = 0;
+
+       UPCFG0X = ((Type << EPTYPE0) | Token | ((EndpointNumber & PIPE_EPNUM_MASK) << PEPNUM0));
+       UPCFG1X = ((1 << ALLOC) | Banks | Pipe_BytesToEPSizeMask(Size));
 
-               UPCFG0X = UPCFG0XTemp[PNum];
-               UPCFG1X = UPCFG1XTemp[PNum];
-               
-               if (!(Pipe_IsConfigured()))
-                 return false;
-       }
-       
-       Pipe_SelectPipe(Number);
        Pipe_SetInfiniteINRequests();
-       
-       return true;
+
+       return Pipe_IsConfigured();
 }
 
 void Pipe_ClearPipes(void)
@@ -108,20 +78,20 @@ bool Pipe_IsEndpointBound(const uint8_t EndpointAddress)
        for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)
        {
                Pipe_SelectPipe(PNum);
-               
+
                if (!(Pipe_IsConfigured()))
                  continue;
-               
+
                uint8_t PipeToken        = Pipe_GetPipeToken();
                bool    PipeTokenCorrect = true;
 
                if (PipeToken != PIPE_TOKEN_SETUP)
                  PipeTokenCorrect = (PipeToken == ((EndpointAddress & PIPE_EPDIR_MASK) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT));
-               
+
                if (PipeTokenCorrect && (Pipe_BoundEndpointNumber() == (EndpointAddress & PIPE_EPNUM_MASK)))
                  return true;
        }
-       
+
        Pipe_SelectPipe(PrevPipeNumber);
        return false;
 }
@@ -129,13 +99,13 @@ bool Pipe_IsEndpointBound(const uint8_t EndpointAddress)
 uint8_t Pipe_WaitUntilReady(void)
 {
        #if (USB_STREAM_TIMEOUT_MS < 0xFF)
-       uint8_t  TimeoutMSRem = USB_STREAM_TIMEOUT_MS;  
+       uint8_t  TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
        #else
        uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
        #endif
 
        uint16_t PreviousFrameNumber = USB_Host_GetFrameNumber();
-       
+
        for (;;)
        {
                if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)
@@ -146,7 +116,7 @@ uint8_t Pipe_WaitUntilReady(void)
                else
                {
                        if (Pipe_IsOUTReady())
-                         return PIPE_READYWAIT_NoError;                
+                         return PIPE_READYWAIT_NoError;
                }
 
                if (Pipe_IsStalled())
@@ -167,3 +137,4 @@ uint8_t Pipe_WaitUntilReady(void)
 }
 
 #endif
+