X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7e7124e40ba2155c5ee4348701be30d3790edca3..6198289b388e4122afe4913f899b37a8e7cd8af4:/LUFA/Drivers/USB/LowLevel/Pipe.h diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index f7d10bc1d..df3ac7ddc 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -46,8 +46,9 @@ #include "../HighLevel/USBTask.h" #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__) - #include "StreamCallbacks.h" + #include "StreamCallbacks.h" #endif + /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) extern "C" { @@ -347,7 +348,7 @@ */ #define Pipe_IsSetupOUTReady() ((UPINTX & (1 << TXOUTI)) ? true : false) - /** Acknowedges the reception of a setup IN request from the attached device on the currently selected + /** Acknowledges the reception of a setup IN request from the attached device on the currently selected * CONTROL type endpoint, allowing for the transmission of a setup OUT packet, or the reception of * another setup IN packet. */ @@ -356,7 +357,7 @@ /** Sends the currently selected CONTROL type pipe's contents to the device as a setup OUT packet. */ #define Pipe_ClearSetupOUT() MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE - /** Returns true if the device sent a NAK (Negative Acknowedge) in response to the last sent packet on + /** Returns true if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on * the currently selected pipe. This ocurrs when the host sends a packet to the device, but the device * is not currently ready to handle the packet (i.e. its endpoint banks are full). Once a NAK has been * received, it must be cleard using Pipe_ClearNAKReceived() before the previous (or any other) packet @@ -761,7 +762,7 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ - #define PIPE_TOKEN_MASK (0x03 << PTOKEN0) + #define PIPE_TOKEN_MASK (0x03 << PTOKEN0) #define Pipe_AllocateMemory() MACROS{ UPCFG1X |= (1 << ALLOC); }MACROE #define Pipe_DeallocateMemory() MACROS{ UPCFG1X &= ~(1 << ALLOC); }MACROE @@ -781,7 +782,7 @@ return (2 << EPSIZE0); else if (Bytes <= 64) return (3 << EPSIZE0); - else if (Bytes <= (8 << 4)) + else if (Bytes <= 128) return (4 << EPSIZE0); else return (5 << EPSIZE0);