Thank you for the review notes. I updated the branch with those items,
and also added a forgotten install of the new header file for external
components to use.
Jeff
diff --git a/docs/man/man3/rtapi_atomic.3rtapi
b/docs/man/man3/rtapi_atomic.3rtapi
index 6f3bff2..3acf6dd 100644
--- a/docs/man/man3/rtapi_atomic.3rtapi
+++ b/docs/man/man3/rtapi_atomic.3rtapi
@@ -15,7 +15,7 @@ enum memory_order { ... };
.HP
#define atomic_load(obj)...
.HP
-#define atomic_load_explicit(obj, desired)...
+#define atomic_load_explicit(obj, order)...
.SH ARGUMENTS
.IP "\fBvolatile A*\fR \fIobj\fR"
diff --git a/src/Makefile b/src/Makefile
index 0f2e665..8bbfede 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -353,6 +353,7 @@ HEADERS := \
libnml/rcs/rcsversion.h \
rtapi/rtapi.h \
rtapi/rtapi_app.h \
+ rtapi/rtapi_atomic.h \
rtapi/rtapi_bitops.h \
rtapi/rtapi_bool.h \
rtapi/rtapi_byteorder.h \
diff --git a/src/hal/components/streamer.c b/src/hal/components/streamer.c
index 256c230..1fa7620 100644
--- a/src/hal/components/streamer.c
+++ b/src/hal/components/streamer.c
@@ -241,7 +241,7 @@ static void update(void *arg, long period)
dptr = (shmem_data_t *)(fifo+1);
/* find the next block of data in the fifo */
tmpin = atomic_load_explicit(&fifo->in, memory_order_acquire);
- tmpout = atomic_load_explicit(&fifo->out, memory_order_acquire);
+ tmpout = fifo->out;
if ( tmpout == tmpin ) {
/* fifo empty - log it */
*(str->empty) = 1;
------------------------------------------------------------------------------
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers
