X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/0c2ad9eb349e1a5676468af3b407329dde4a53b4..154d28e39f114c1e1af223ae6c37e34323e6be9d:/LUFA/Drivers/Misc/RingBuffer.h diff --git a/LUFA/Drivers/Misc/RingBuffer.h b/LUFA/Drivers/Misc/RingBuffer.h index 3c5552143..4b98498eb 100644 --- a/LUFA/Drivers/Misc/RingBuffer.h +++ b/LUFA/Drivers/Misc/RingBuffer.h @@ -39,7 +39,7 @@ * or deletions) must not overlap. If there is possibility of two or more of the same kind of * operating occurring at the same point in time, atomic (mutex) locking should be used. */ - + /** \ingroup Group_MiscDrivers * \defgroup Group_RingBuff Generic Byte Ring Buffer - LUFA/Drivers/Misc/RingBuffer.h * \brief Lightweight ring buffer, for fast insertion/deletion of bytes. @@ -113,7 +113,7 @@ uint8_t* Out; /**< Current retrieval location in the circular buffer. */ uint8_t* Start; /**< Pointer to the start of the buffer's underlying storage array. */ uint8_t* End; /**< Pointer to the end of the buffer's underlying storage array. */ - uint8_t Size; /**< Size of the buffer's underlying storage array. */ + uint16_t Size; /**< Size of the buffer's underlying storage array. */ uint16_t Count; /**< Number of bytes currently stored in the buffer. */ } RingBuffer_t; @@ -134,7 +134,7 @@ uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + Buffer->In = DataPtr; Buffer->Out = DataPtr; Buffer->Start = &DataPtr[0]; @@ -166,7 +166,7 @@ uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + Count = Buffer->Count; SetGlobalInterruptMask(CurrentGlobalInt); @@ -244,7 +244,7 @@ uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + Buffer->Count++; SetGlobalInterruptMask(CurrentGlobalInt); @@ -264,7 +264,7 @@ static inline uint8_t RingBuffer_Remove(RingBuffer_t* Buffer) { GCC_FORCE_POINTER_ACCESS(Buffer); - + uint8_t Data = *Buffer->Out; if (++Buffer->Out == Buffer->End) @@ -272,7 +272,7 @@ uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); GlobalInterruptDisable(); - + Buffer->Count--; SetGlobalInterruptMask(CurrentGlobalInt);