X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7dc3d3a68f889efeca5af51b22bd043eff8e0926..a7dd98444674e407ef58d70d60b3d89fd548cd58:/LUFA/Drivers/Misc/RingBuffer.h?ds=inline

diff --git a/LUFA/Drivers/Misc/RingBuffer.h b/LUFA/Drivers/Misc/RingBuffer.h
index 4b2b9b22c..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 <util/atomic.h>
-		#include <stdint.h>
-		#include <stdbool.h>
-
-		#include <LUFA/Common/Common.h>
+		#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: */
@@ -128,15 +125,17 @@
 		{
 			GCC_FORCE_POINTER_ACCESS(Buffer);
 
-			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
-			{	
-				Buffer->In     = DataPtr;
-				Buffer->Out    = DataPtr;
-				Buffer->Start  = &DataPtr[0];
-				Buffer->End    = &DataPtr[Size];
-				Buffer->Size   = Size;
-				Buffer->Count  = 0;
-			}
+			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;
 		}
 
@@ -213,10 +213,12 @@
 			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.
@@ -238,10 +240,12 @@
 			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;
 		}