X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Ffifobuf.h;h=3bc2b5d02310063c3d20c51286cc5f42884882a0;hb=0ee1d8ff312b2b8fa07932cacc10d95ba3b23498;hp=d1885a400a0431fd9119888a9b0763c0066d4dcb;hpb=4a500f3b2f112b23b0662c7640eb7e25780c0d5c;p=bertos.git

diff --git a/mware/fifobuf.h b/mware/fifobuf.h
index d1885a40..3bc2b5d0 100755
--- a/mware/fifobuf.h
+++ b/mware/fifobuf.h
@@ -43,6 +43,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.17  2004/09/14 20:57:00  bernie
+ *#* Use debug.h instead of kdebug.h.
+ *#*
+ *#* Revision 1.16  2004/09/06 21:39:08  bernie
+ *#* Simplify code using ATOMIC().
+ *#*
  *#* Revision 1.15  2004/08/29 22:05:16  bernie
  *#* Rename BITS_PER_PTR to CPU_BITS_PER_PTR.
  *#*
@@ -84,7 +90,7 @@
 #ifndef MWARE_FIFO_H
 #define MWARE_FIFO_H
 
-#include "cpu.h"
+#include <cpu.h>
 
 typedef struct FIFOBuffer
 {
@@ -95,6 +101,15 @@ typedef struct FIFOBuffer
 } FIFOBuffer;
 
 
+#define ASSERT_VALID_FIFO(fifo) \
+	ATOMIC( \
+		ASSERT((fifo)->head >= (fifo)->begin); \
+		ASSERT((fifo)->head <= (fifo)->end); \
+		ASSERT((fifo)->tail >= (fifo)->begin); \
+		ASSERT((fifo)->tail <= (fifo)->end); \
+	)
+
+
 /*!
  * Check whether the fifo is empty
  *
@@ -107,6 +122,7 @@ typedef struct FIFOBuffer
  */
 INLINE bool fifo_isempty(const FIFOBuffer *fb)
 {
+	//ASSERT_VALID_FIFO(fb);
 	return fb->head == fb->tail;
 }
 
@@ -126,6 +142,7 @@ INLINE bool fifo_isempty(const FIFOBuffer *fb)
  */
 INLINE bool fifo_isfull(const FIFOBuffer *fb)
 {
+	//ASSERT_VALID_FIFO(fb);
 	return
 		((fb->head == fb->begin) && (fb->tail == fb->end))
 		|| (fb->tail == fb->head - 1);
@@ -151,10 +168,12 @@ INLINE void fifo_push(FIFOBuffer *fb, unsigned char c)
 #ifdef __MWERKS__
 #pragma interrupt called
 #endif
+	//ASSERT_VALID_FIFO(fb);
+
 	/* Write at tail position */
 	*(fb->tail) = c;
 
-	if (fb->tail == fb->end)
+	if (UNLIKELY(fb->tail == fb->end))
 		/* wrap tail around */
 		fb->tail = fb->begin;
 	else
@@ -178,7 +197,9 @@ INLINE unsigned char fifo_pop(FIFOBuffer *fb)
 #ifdef __MWERKS__
 #pragma interrupt called
 #endif
-	if (fb->head == fb->end)
+	//ASSERT_VALID_FIFO(fb);
+
+	if (UNLIKELY(fb->head == fb->end))
 	{
 		/* wrap head around */
 		fb->head = fb->begin;
@@ -195,6 +216,7 @@ INLINE unsigned char fifo_pop(FIFOBuffer *fb)
  */
 INLINE void fifo_flush(FIFOBuffer *fb)
 {
+	//ASSERT_VALID_FIFO(fb);
 	fb->head = fb->tail;
 }
 
@@ -207,7 +229,8 @@ INLINE void fifo_flush(FIFOBuffer *fb)
 	 */
 	#define fifo_isempty_locked(fb) fifo_isempty((fb))
 	#define fifo_push_locked(fb, c) fifo_push((fb), (c))
-	#define fifo_flush_locked(fb) fifo_flush((fb))
+	#define fifo_pop_locked(fb)     fifo_pop((fb))
+	#define fifo_flush_locked(fb)   fifo_flush((fb))
 
 #else /* CPU_REG_BITS < CPU_BITS_PER_PTR */
 
@@ -222,12 +245,7 @@ INLINE void fifo_flush(FIFOBuffer *fb)
 	INLINE bool fifo_isempty_locked(const FIFOBuffer *fb)
 	{
 		bool result;
-		cpuflags_t flags;
-
-		DISABLE_IRQSAVE(flags);
-		result = fifo_isempty(fb);
-		ENABLE_IRQRESTORE(flags);
-
+		ATOMIC(result = fifo_isempty(fb));
 		return result;
 	}
 
@@ -242,12 +260,16 @@ INLINE void fifo_flush(FIFOBuffer *fb)
 	 */
 	INLINE void fifo_push_locked(FIFOBuffer *fb, unsigned char c)
 	{
-		cpuflags_t flags;
-		DISABLE_IRQSAVE(flags);
-		fifo_push(fb, c);
-		ENABLE_IRQRESTORE(flags);
+		ATOMIC(fifo_push(fb, c));
 	}
 
+	/* Probably not really needed, but hard to prove. */
+	INLINE unsigned char fifo_pop_locked(FIFOBuffer *fb)
+	{
+		unsigned char c;
+		ATOMIC(c = fifo_pop(fb));
+		return c;
+	}
 
 	/*!
 	 * Similar to fifo_flush(), but with stronger guarantees for
@@ -259,10 +281,7 @@ INLINE void fifo_flush(FIFOBuffer *fb)
 	 */
 	INLINE void fifo_flush_locked(FIFOBuffer *fb)
 	{
-		cpuflags_t flags;
-		DISABLE_IRQSAVE(flags);
-		fifo_flush(fb);
-		ENABLE_IRQRESTORE(flags);
+		ATOMIC(fifo_flush(fb));
 	}
 
 #endif /* CPU_REG_BITS < BITS_PER_PTR */
@@ -273,14 +292,9 @@ INLINE void fifo_flush(FIFOBuffer *fb)
  */
 INLINE bool fifo_isfull_locked(const FIFOBuffer *_fb)
 {
-	bool _result;
-	cpuflags_t _flags;
-
-	DISABLE_IRQSAVE(_flags);
-	_result = fifo_isfull(_fb);
-	ENABLE_IRQRESTORE(_flags);
-
-	return _result;
+	bool result;
+	ATOMIC(result = fifo_isfull(_fb));
+	return result;
 }