Fixed incorrect ADC driver init register manipulation (thanks to Tobias).

[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 f7d10bc..df3ac7d 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -46,8 +46,9 @@
                #include "../HighLevel/USBTask.h"\r
 \r
                #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)\r
                #include "../HighLevel/USBTask.h"\r
 \r
                #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)\r

-               #include "StreamCallbacks.h"\r
+                       #include "StreamCallbacks.h"\r

                #endif\r
                #endif\r

+               \r

        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                        extern "C" {\r
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                        extern "C" {\r


@@ -347,7 +348,7 @@
                         */\r
                        #define Pipe_IsSetupOUTReady()         ((UPINTX & (1 << TXOUTI)) ? true : false)\r
 \r
                         */\r
                        #define Pipe_IsSetupOUTReady()         ((UPINTX & (1 << TXOUTI)) ? true : false)\r
 \r

-                       /** Acknowedges the reception of a setup IN request from the attached device on the currently selected\r
+                       /** Acknowledges the reception of a setup IN request from the attached device on the currently selected\r

                         *  CONTROL type endpoint, allowing for the transmission of a setup OUT packet, or the reception of\r
                         *  another setup IN packet.\r
                         */\r
                         *  CONTROL type endpoint, allowing for the transmission of a setup OUT packet, or the reception of\r
                         *  another setup IN packet.\r
                         */\r


@@ -356,7 +357,7 @@
                        /** Sends the currently selected CONTROL type pipe's contents to the device as a setup OUT packet. */\r
                        #define Pipe_ClearSetupOUT()           MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE\r
                        \r
                        /** Sends the currently selected CONTROL type pipe's contents to the device as a setup OUT packet. */\r
                        #define Pipe_ClearSetupOUT()           MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE\r
                        \r

-                       /** Returns true if the device sent a NAK (Negative Acknowedge) in response to the last sent packet on\r
+                       /** Returns true if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on\r

                         *  the currently selected pipe. This ocurrs when the host sends a packet to the device, but the device\r
                         *  is not currently ready to handle the packet (i.e. its endpoint banks are full). Once a NAK has been\r
                         *  received, it must be cleard using Pipe_ClearNAKReceived() before the previous (or any other) packet\r
                         *  the currently selected pipe. This ocurrs when the host sends a packet to the device, but the device\r
                         *  is not currently ready to handle the packet (i.e. its endpoint banks are full). Once a NAK has been\r
                         *  received, it must be cleard using Pipe_ClearNAKReceived() before the previous (or any other) packet\r


@@ -761,7 +762,7 @@
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Macros: */\r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Macros: */\r

-                       #define PIPE_TOKEN_MASK                    (0x03 << PTOKEN0)\r
+                       #define PIPE_TOKEN_MASK                (0x03 << PTOKEN0)\r

 \r
                        #define Pipe_AllocateMemory()          MACROS{ UPCFG1X |=  (1 << ALLOC); }MACROE\r
                        #define Pipe_DeallocateMemory()        MACROS{ UPCFG1X &= ~(1 << ALLOC); }MACROE\r
 \r
                        #define Pipe_AllocateMemory()          MACROS{ UPCFG1X |=  (1 << ALLOC); }MACROE\r
                        #define Pipe_DeallocateMemory()        MACROS{ UPCFG1X &= ~(1 << ALLOC); }MACROE\r


@@ -781,7 +782,7 @@
                                  return (2 << EPSIZE0);\r
                                else if (Bytes <= 64)\r
                                  return (3 << EPSIZE0);\r
                                  return (2 << EPSIZE0);\r
                                else if (Bytes <= 64)\r
                                  return (3 << EPSIZE0);\r

-                               else if (Bytes <= (8 << 4))\r
+                               else if (Bytes <= 128)\r

                                  return (4 << EPSIZE0);\r
                                else\r
                                  return (5 << EPSIZE0);\r
                                  return (4 << EPSIZE0);\r
                                else\r
                                  return (5 << EPSIZE0);\r