Update UC3 platform driver support to use the bitmasks defined in the header files...

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

diff --git a/LUFA/Drivers/USB/Core/Pipe.h b/LUFA/Drivers/USB/Core/Pipe.h
index 6ab8fc2..5f82937 100644 (file)
--- a/LUFA/Drivers/USB/Core/Pipe.h
+++ b/LUFA/Drivers/USB/Core/Pipe.h
@@ -45,7 +45,7 @@
 \r
 /** \ingroup Group_PipeRW\r
  *  \defgroup Group_PipePrimitiveRW Read/Write of Primitive Data Types\r
 \r
 /** \ingroup Group_PipeRW\r
  *  \defgroup Group_PipePrimitiveRW Read/Write of Primitive Data Types\r

- *  \brief Pipe data primative read/write definitions.\r
+ *  \brief Pipe data primitive read/write definitions.\r

  *\r
  *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types\r
  *  from and to pipes.\r
  *\r
  *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types\r
  *  from and to pipes.\r


@@ -84,9 +84,11 @@
 \r
        /* Includes: */\r
                #include "../../../Common/Common.h"\r
 \r
        /* Includes: */\r
                #include "../../../Common/Common.h"\r

+               #include "USBMode.h"\r

 \r
 \r

-               #if (ARCH == ARCH_AVR8)\r
-                       #include "AVR8/Pipe.h"\r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r

                #endif\r
 \r
        /* Preprocessor Checks: */\r
                #endif\r
 \r
        /* Preprocessor Checks: */\r


@@ -94,6 +96,40 @@
                        #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
                #endif\r
 \r
                        #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
                #endif\r
 \r

+       /* Public Interface - May be used in end-application: */\r
+               /* Macros: */\r
+                       /** Pipe address for the default control pipe, which always resides in address 0. This is\r
+                        *  defined for convenience to give more readable code when used with the pipe macros.\r
+                        */\r
+                       #define PIPE_CONTROLPIPE                0\r
+\r
+                       /** Pipe number mask, for masking against pipe addresses to retrieve the pipe's numerical address\r
+                        *  in the device.\r
+                        */\r
+                       #define PIPE_PIPENUM_MASK               0x07\r
+\r
+                       /** Endpoint number mask, for masking against endpoint addresses to retrieve the endpoint's\r
+                        *  numerical address in the attached device.\r
+                        */\r
+                       #define PIPE_EPNUM_MASK                 0x0F\r
+\r
+                       /** Endpoint direction mask, for masking against endpoint addresses to retrieve the endpoint's\r
+                        *  direction for comparing with the \c ENDPOINT_DESCRIPTOR_DIR_* masks.\r
+                        */\r
+                       #define PIPE_EPDIR_MASK                 0x80\r
+\r
+       /* Architecture Includes: */\r
+               #if (ARCH == ARCH_AVR8)\r
+                       #include "AVR8/Pipe_AVR8.h"\r
+               #elif (ARCH == ARCH_UC3)\r
+                       #include "UC3/Pipe_UC3.h"\r
+               #endif\r
+\r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r

 #endif\r
 \r
 /** @} */\r
 #endif\r
 \r
 /** @} */\r