From 1fd7190cf51f07461186b6d78bdde31e01bbc40e Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Fri, 3 Sep 2021 17:25:45 -0500
Subject: [PATCH] Fix RTEMS-4 uC5282 build and atomic typos

---
 modules/libcom/src/osi/os/RTEMS-score/epicsAtomicOSD.h | 4 ++--
 modules/libcom/src/osi/os/posix/epicsAtomicOSD.h       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/libcom/src/osi/os/RTEMS-score/epicsAtomicOSD.h b/modules/libcom/src/osi/os/RTEMS-score/epicsAtomicOSD.h
index 510bdbc7c..b92afafe4 100644
--- a/modules/libcom/src/osi/os/RTEMS-score/epicsAtomicOSD.h
+++ b/modules/libcom/src/osi/os/RTEMS-score/epicsAtomicOSD.h
@@ -35,11 +35,11 @@ extern "C" {
 #ifndef EPICS_ATOMIC_READ_MEMORY_BARRIER
 EPICS_ATOMIC_INLINE void epicsAtomicReadMemoryBarrier (void)
 {
-    epicsAtomicMemoryBarrierFallback();
+    rbarr();
 }
 #endif
 
-#ifndef EPICS_ATOMIC_READ_MEMORY_BARRIER
+#ifndef EPICS_ATOMIC_WRITE_MEMORY_BARRIER
 EPICS_ATOMIC_INLINE void epicsAtomicWriteMemoryBarrier (void)
 {
     rwbarr();
diff --git a/modules/libcom/src/osi/os/posix/epicsAtomicOSD.h b/modules/libcom/src/osi/os/posix/epicsAtomicOSD.h
index 7a555d9d9..7cf2352be 100644
--- a/modules/libcom/src/osi/os/posix/epicsAtomicOSD.h
+++ b/modules/libcom/src/osi/os/posix/epicsAtomicOSD.h
@@ -38,7 +38,7 @@ EPICS_ATOMIC_INLINE void epicsAtomicReadMemoryBarrier (void)
 }
 #endif
 
-#ifndef EPICS_ATOMIC_READ_MEMORY_BARRIER
+#ifndef EPICS_ATOMIC_WRITE_MEMORY_BARRIER
 EPICS_ATOMIC_INLINE void epicsAtomicWriteMemoryBarrier (void)
 {
     epicsAtomicMemoryBarrierFallback();