X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/a49b5bfd8a1dce6276ff5dac1bddfe43d6ad73ab..a7dd98444674e407ef58d70d60b3d89fd548cd58:/LUFA/Drivers/Misc/RingBuffer.h diff --git a/LUFA/Drivers/Misc/RingBuffer.h b/LUFA/Drivers/Misc/RingBuffer.h index d9d3a8340..023cc25c4 100644 --- a/LUFA/Drivers/Misc/RingBuffer.h +++ b/LUFA/Drivers/Misc/RingBuffer.h @@ -29,19 +29,20 @@ */ /** \file - * \brief Lightweight ring buffer, for fast insertion/deletion. + * \brief Lightweight ring buffer, for fast insertion/deletion of bytes. * * Lightweight ring buffer, for fast insertion/deletion. Multiple buffers can be created of * different sizes to suit different needs. * * Note that for each buffer, insertion and removal operations may occur at the same time (via - * a multithreaded ISR based system) however the same kind of operation (two or more insertions + * a multi-threaded ISR based system) however the same kind of operation (two or more insertions * or deletions) must not overlap. If there is possibility of two or more of the same kind of - * operating occuring at the same point in time, atomic (mutex) locking should be used. + * 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 + * \defgroup Group_RingBuff Generic Byte Ring Buffer - LUFA/Drivers/Misc/RingBuffer.h + * \brief Lightweight ring buffer, for fast insertion/deletion of bytes. * * \section Sec_Dependencies Module Source Dependencies * The following files must be built with any user project that uses this module: @@ -52,9 +53,9 @@ * different sizes to suit different needs. * * Note that for each buffer, insertion and removal operations may occur at the same time (via - * a multithreaded ISR based system) however the same kind of operation (two or more insertions + * a multi-threaded ISR based system) however the same kind of operation (two or more insertions * or deletions) must not overlap. If there is possibility of two or more of the same kind of - * operating occuring at the same point in time, atomic (mutex) locking should be used. + * operating occurring at the same point in time, atomic (mutex) locking should be used. * * \section Sec_ExampleUsage Example Usage * The following snippet is an example of how this module may be used within a typical @@ -65,7 +66,7 @@ * RingBuffer_t Buffer; * uint8_t BufferData[128]; * - * // Initialise the buffer with the created storage array + * // Initialize the buffer with the created storage array * RingBuffer_InitBuffer(&Buffer, BufferData, sizeof(BufferData)); * * // Insert some data into the buffer @@ -89,15 +90,11 @@ * @{ */ -#ifndef __RING_BUFF_H__ -#define __RING_BUFF_H__ +#ifndef __RING_BUFFER_H__ +#define __RING_BUFFER_H__ /* Includes: */ - #include - #include - #include - - #include + #include "../../Common/Common.h" /* Type Defines: */ /** \brief Ring Buffer Management Structure. @@ -107,12 +104,12 @@ */ typedef struct { - uint8_t* In; /**< Current storage location in the circular buffer */ - 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 Count; /**< Number of bytes currently stored in the buffer */ + uint8_t* In; /**< Current storage location in the circular buffer. */ + 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 Count; /**< Number of bytes currently stored in the buffer. */ } RingBuffer_t; /* Inline Functions: */ @@ -126,17 +123,19 @@ */ static inline void RingBuffer_InitBuffer(RingBuffer_t* Buffer, uint8_t* const DataPtr, const uint16_t Size) { - ATOMIC_BLOCK(ATOMIC_RESTORESTATE) - { - GCC_FORCE_POINTER_ACCESS(Buffer); - - Buffer->In = DataPtr; - Buffer->Out = DataPtr; - Buffer->Start = &DataPtr[0]; - Buffer->End = &DataPtr[Size]; - Buffer->Size = Size; - Buffer->Count = 0; - } + GCC_FORCE_POINTER_ACCESS(Buffer); + + uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); + GlobalInterruptDisable(); + + Buffer->In = DataPtr; + Buffer->Out = DataPtr; + Buffer->Start = &DataPtr[0]; + Buffer->End = &DataPtr[Size]; + Buffer->Size = Size; + Buffer->Count = 0; + + SetGlobalInterruptMask(CurrentGlobalInt); } /** Retrieves the minimum number of bytes stored in a particular buffer. This value is computed @@ -156,11 +155,12 @@ { uint16_t Count; - ATOMIC_BLOCK(ATOMIC_RESTORESTATE) - { - Count = Buffer->Count; - } + uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); + GlobalInterruptDisable(); + + Count = Buffer->Count; + SetGlobalInterruptMask(CurrentGlobalInt); return Count; } @@ -170,7 +170,7 @@ * * \param[in,out] Buffer Pointer to a ring buffer structure to insert into. * - * \return Boolean true if the buffer contains no free space, false otherwise. + * \return Boolean \c true if the buffer contains no free space, false otherwise. */ static inline bool RingBuffer_IsFull(RingBuffer_t* const Buffer) { @@ -187,7 +187,7 @@ * * \param[in,out] Buffer Pointer to a ring buffer structure to insert into. * - * \return Boolean true if the buffer contains no free space, false otherwise. + * \return Boolean \c true if the buffer contains no free space, false otherwise. */ static inline bool RingBuffer_IsEmpty(RingBuffer_t* const Buffer) { @@ -203,18 +203,22 @@ * \param[in,out] Buffer Pointer to a ring buffer structure to insert into. * \param[in] Data Data element to insert into the buffer. */ - static inline void RingBuffer_Insert(RingBuffer_t* const Buffer, + static inline void RingBuffer_Insert(RingBuffer_t* Buffer, const uint8_t Data) { + GCC_FORCE_POINTER_ACCESS(Buffer); + *Buffer->In = Data; if (++Buffer->In == Buffer->End) Buffer->In = Buffer->Start; - ATOMIC_BLOCK(ATOMIC_RESTORESTATE) - { - Buffer->Count++; - } + uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); + GlobalInterruptDisable(); + + Buffer->Count++; + + SetGlobalInterruptMask(CurrentGlobalInt); } /** Removes an element from the ring buffer. @@ -227,17 +231,21 @@ * * \return Next data element stored in the buffer. */ - static inline uint8_t RingBuffer_Remove(RingBuffer_t* const Buffer) + static inline uint8_t RingBuffer_Remove(RingBuffer_t* Buffer) { + GCC_FORCE_POINTER_ACCESS(Buffer); + uint8_t Data = *Buffer->Out; if (++Buffer->Out == Buffer->End) Buffer->Out = Buffer->Start; - ATOMIC_BLOCK(ATOMIC_RESTORESTATE) - { - Buffer->Count--; - } + uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); + GlobalInterruptDisable(); + + Buffer->Count--; + + SetGlobalInterruptMask(CurrentGlobalInt); return Data; }