X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Ffifobuf.h;h=12de29495cf64fc9bbafc8eb0ba14cfeb366c664;hb=38ced89fd9f856520a83833672cee0fe16eafcd2;hp=67528b97dd2170567d5abda0be9883977284fe10;hpb=ba17a56d0c988fee6a42ed2cd5a7da0625164121;p=bertos.git

diff --git a/mware/fifobuf.h b/mware/fifobuf.h
index 67528b97..12de2949 100755
--- a/mware/fifobuf.h
+++ b/mware/fifobuf.h
@@ -43,6 +43,12 @@
 
 /*
  * $Log$
+ * Revision 1.12  2004/08/02 20:20:29  aleph
+ * Merge from project_ks
+ *
+ * Revision 1.11  2004/07/30 14:15:53  rasky
+ * Nuovo supporto unificato per detect della CPU
+ *
  * Revision 1.10  2004/07/29 22:57:09  bernie
  * Doxygen fix.
  *
@@ -184,14 +190,14 @@ INLINE void fifo_flush(FIFOBuffer *fb)
 }
 
 
-#if !defined(__AVR__)
+#if !CPU_AVR
 
 	/* No tricks needed on 16/32bit CPUs */
 #	define fifo_isempty_locked(fb) fifo_isempty((fb))
 #	define fifo_push_locked(fb, c) fifo_push((fb), (c))
-#	define fifo_flush_locked(fb, c) fifo_flush((fb), (c))
+#	define fifo_flush_locked(fb) fifo_flush((fb))
 
-#else /* !__AVR__ */
+#else /* !CPU_AVR */
 
 	/*!
 	 * Similar to fifo_isempty(), but with stronger guarantees for
@@ -245,7 +251,7 @@ INLINE void fifo_flush(FIFOBuffer *fb)
 		ENABLE_IRQRESTORE(flags);
 	}
 
-#endif /* !__AVR__ */
+#endif /* !CPU_AVR */
 
 
 /*!