X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/28a1ee29a1a200c8e8c76355a9036a7456425bc3..a7dd98444674e407ef58d70d60b3d89fd548cd58:/LUFA/Drivers/Misc/RingBuffer.h

diff --git a/LUFA/Drivers/Misc/RingBuffer.h b/LUFA/Drivers/Misc/RingBuffer.h
index 1a825ac23..023cc25c4 100644
--- a/LUFA/Drivers/Misc/RingBuffer.h
+++ b/LUFA/Drivers/Misc/RingBuffer.h
@@ -66,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
@@ -125,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
@@ -153,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;
 		}
 
@@ -210,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.
@@ -235,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;
 		}