Changeset 9700578 in rtems for c/src/lib/include

Timestamp:

10/30/95 21:54:45 (28 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

c4808ca

Parents:

ea74482

Message:

SPARC port passes all tests

File:

• c/src/lib/include/ringbuf.h (modified) (2 diffs)

c/src/lib/include/ringbuf.h

@@ -11 +11 @@
 
 #ifndef RINGBUF_QUEUE_LENGTH
-#define RINGBUF_QUEUE_LENGTH 200
+#define RINGBUF_QUEUE_LENGTH 128
 #endif
 
 typedef struct {
   char buffer[RINGBUF_QUEUE_LENGTH];
-  int  head;
-  int  tail;
+  volatile int  head;
+  volatile int  tail;
 } Ring_buffer_t;
 
@@ -28 +28 @@
    ( (_buffer)->head == (_buffer)->tail )
 
+#define Ring_buffer_Is_full( _buffer ) \
+   ( (_buffer)->head == ((_buffer)->tail + 1) % RINGBUF_QUEUE_LENGTH )
+
 #define Ring_buffer_Add_character( _buffer, _ch ) \
   do { \
-    (_buffer)->buffer[ (_buffer)->tail ] = (_ch); \
-    (_buffer)->tail = ((_buffer)->tail+1) % RINGBUF_QUEUE_LENGTH; \
+    rtems_unsigned32 isrlevel; \
+    \
+    rtems_interrupt_disable( isrlevel ); \
+      (_buffer)->tail = ((_buffer)->tail+1) % RINGBUF_QUEUE_LENGTH; \
+      (_buffer)->buffer[ (_buffer)->tail ] = (_ch); \
+    rtems_interrupt_enable( isrlevel ); \
   } while ( 0 ) 
 
 #define Ring_buffer_Remove_character( _buffer, _ch ) \
   do { \
-    (_ch) = (_buffer)->buffer[ (_buffer)->head ]; \
-    (_buffer)->head = ((_buffer)->head+1) % RINGBUF_QUEUE_LENGTH; \
+    rtems_unsigned32 isrlevel; \
+    \
+    rtems_interrupt_disable( isrlevel ); \
+      (_buffer)->head = ((_buffer)->head+1) % RINGBUF_QUEUE_LENGTH; \
+      (_ch) = (_buffer)->buffer[ (_buffer)->head ]; \
+    rtems_interrupt_enable( isrlevel ); \
   } while ( 0 )