Ooops - TeensyHID bootloader makefile should use a 16MHz FCPU, not 8MHz.

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

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index 5bbbb87..ef23253 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -338,9 +338,11 @@
                                 */\r
                                static inline void Endpoint_SetEndpointDirection(uint8_t DirectionMask);\r
                        #else\r
                                 */\r
                                static inline void Endpoint_SetEndpointDirection(uint8_t DirectionMask);\r
                        #else\r

-                               #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || defined(__DOXYGEN__)\r
+                               #if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r

                                        #define Endpoint_BytesInEndpoint()        UEBCX\r
                                        #define Endpoint_BytesInEndpoint()        UEBCX\r

-                               #else\r
+                               #elif defined(USB_SERIES_4_AVR)\r
+                                       #define Endpoint_BytesInEndpoint()        (((uint16_t)UEBCHX << 8) | UEBCLX)                            \r
+                               #elif defined(USB_SERIES_2_AVR)\r

                                        #define Endpoint_BytesInEndpoint()        UEBCLX\r
                                #endif\r
                                \r
                                        #define Endpoint_BytesInEndpoint()        UEBCLX\r
                                #endif\r
                                \r


@@ -353,7 +355,7 @@
                                #if !defined(CONTROL_ONLY_DEVICE)\r
                                        #define Endpoint_SelectEndpoint(epnum)    MACROS{ UENUM = (epnum); }MACROE\r
                                #else\r
                                #if !defined(CONTROL_ONLY_DEVICE)\r
                                        #define Endpoint_SelectEndpoint(epnum)    MACROS{ UENUM = (epnum); }MACROE\r
                                #else\r

-                                       #define Endpoint_SelectEndpoint(epnum)    (void)epnum\r
+                                       #define Endpoint_SelectEndpoint(epnum)    (void)(epnum)\r

                                #endif\r
 \r
                                #define Endpoint_ResetFIFO(epnum)             MACROS{ UERST = (1 << (epnum)); UERST = 0; }MACROE\r
                                #endif\r
 \r
                                #define Endpoint_ResetFIFO(epnum)             MACROS{ UERST = (1 << (epnum)); UERST = 0; }MACROE\r


@@ -735,7 +737,7 @@
                        bool Endpoint_ConfigureEndpoint(const uint8_t  Number, const uint8_t Type, const uint8_t Direction,\r
                                                        const uint16_t Size, const uint8_t Banks);\r
 \r
                        bool Endpoint_ConfigureEndpoint(const uint8_t  Number, const uint8_t Type, const uint8_t Direction,\r
                                                        const uint16_t Size, const uint8_t Banks);\r
 \r

-                       /** Spinloops until the currently selected non-control endpoint is ready for the next packet of data\r
+                       /** Spin-loops until the currently selected non-control endpoint is ready for the next packet of data\r

                         *  to be read or written to it.\r
                         *\r
                         *  \note This routine should not be called on CONTROL type endpoints.\r
                         *  to be read or written to it.\r
                         *\r
                         *  \note This routine should not be called on CONTROL type endpoints.\r


@@ -1205,7 +1207,7 @@
                                }\r
                                \r
                                return (MaskVal << EPSIZE0);\r
                                }\r
                                \r
                                return (MaskVal << EPSIZE0);\r

-                       };\r
+                       }\r

 \r
        #endif\r
 \r
 \r
        #endif\r
 \r