Fix build errors in Joystick device demo and library LEDs driver (on *nix systems).

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

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 748dc59..7e81cf6 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -128,7 +128,7 @@
                        /** Default size of the default control pipe's bank, until altered by the Endpoint0Size value \r
                         *  in the device descriptor of the attached device.\r
                         */\r
-                       #define PIPE_CONTROLPIPE_DEFAULT_SIZE   8\r
+                       #define PIPE_CONTROLPIPE_DEFAULT_SIZE   64\r
                        \r
                        /** Pipe number mask, for masking against pipe addresses to retrieve the pipe's numerical address\r
                         *  in the device.\r
@@ -568,18 +568,18 @@
                         */\r
                        enum Pipe_Stream_RW_ErrorCodes_t\r
                        {\r
-                               PIPE_RWSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r
-                               PIPE_RWSTREAM_ERROR_PipeStalled        = 1, /**< The device stalled the pipe during the transfer. */            \r
-                               PIPE_RWSTREAM_ERROR_DeviceDisconnected = 2, /**< Device was disconnected from the host during\r
-                                                                        *   the transfer.\r
-                                                                        */             \r
-                               PIPE_RWSTREAM_ERROR_Timeout            = 3, /**< The device failed to accept or send the next packet\r
-                                                                            *   within the software timeout period set by the\r
-                                                                            *   \ref USB_STREAM_TIMEOUT_MS macro.\r
-                                                                            */\r
-                               PIPE_RWSTREAM_ERROR_CallbackAborted    = 4, /**< Indicates that the stream's callback function aborted\r
-                                                                        *   the transfer early.\r
-                                                                            */\r
+                               PIPE_RWSTREAM_NoError            = 0, /**< Command completed successfully, no error. */\r
+                               PIPE_RWSTREAM_PipeStalled        = 1, /**< The device stalled the pipe during the transfer. */          \r
+                               PIPE_RWSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during\r
+                                                                  *   the transfer.\r
+                                                                  */           \r
+                               PIPE_RWSTREAM_Timeout            = 3, /**< The device failed to accept or send the next packet\r
+                                                                      *   within the software timeout period set by the\r
+                                                                      *   \ref USB_STREAM_TIMEOUT_MS macro.\r
+                                                                      */\r
+                               PIPE_RWSTREAM_CallbackAborted    = 4, /**< Indicates that the stream's callback function aborted\r
+                                                                  *   the transfer early.\r
+                                                                      */\r
                        };\r
 \r
                /* Inline Functions: */\r
@@ -955,6 +955,10 @@
                /* Macros: */\r
                        #define PIPE_TOKEN_MASK                (0x03 << PTOKEN0)\r
 \r
+                       #if !defined(ENDPOINT_CONTROLEP)\r
+                               #define ENDPOINT_CONTROLEP         0\r
+                       #endif\r
+                       \r
                        #define Pipe_AllocateMemory()          MACROS{ UPCFG1X |=  (1 << ALLOC); }MACROE\r
                        #define Pipe_DeallocateMemory()        MACROS{ UPCFG1X &= ~(1 << ALLOC); }MACROE\r
 \r