Add LUFA-side channel open/close routines, add signalling handlers for the creation...

[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 2b956a8..8784bea 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -28,11 +28,12 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+#define  __INCLUDE_FROM_USB_DRIVER\r

 #include "../HighLevel/USBMode.h"\r
 \r
 #if defined(USB_CAN_BE_HOST)\r
 \r
 #include "../HighLevel/USBMode.h"\r
 \r
 #if defined(USB_CAN_BE_HOST)\r
 \r

-#define  INCLUDE_FROM_PIPE_C\r
+#define  __INCLUDE_FROM_PIPE_C\r

 #include "Pipe.h"\r
 \r
 uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r
 #include "Pipe.h"\r
 \r
 uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r


@@ -79,14 +80,13 @@ bool Pipe_IsEndpointBound(const uint8_t EndpointAddress)
                Pipe_SelectPipe(PNum);\r
                \r
                uint8_t PipeToken = Pipe_GetPipeToken();\r
                Pipe_SelectPipe(PNum);\r
                \r
                uint8_t PipeToken = Pipe_GetPipeToken();\r

+               bool    PipeTokenCorrect = true;\r

 \r
                if (PipeToken != PIPE_TOKEN_SETUP)\r
 \r
                if (PipeToken != PIPE_TOKEN_SETUP)\r

-                 PipeToken = (PipeToken == ((EndpointAddress & PIPE_EPDIR_MASK) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT));\r
+                 PipeTokenCorrect = (PipeToken == ((EndpointAddress & PIPE_EPDIR_MASK) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT));\r

                \r
                \r

-               if (Pipe_IsConfigured() && (Pipe_BoundEndpointNumber() == (EndpointAddress & PIPE_EPNUM_MASK)) && PipeToken)\r
-               {               \r
-                       return true;\r
-               }\r
+               if (Pipe_IsConfigured() && PipeTokenCorrect && (Pipe_BoundEndpointNumber() == (EndpointAddress & PIPE_EPNUM_MASK)))\r
+                 return true;\r

        }\r
        \r
        Pipe_SelectPipe(PrevPipeNumber);\r
        }\r
        \r
        Pipe_SelectPipe(PrevPipeNumber);\r