atomic: New syntax

al_atomic_ptr_load() -> al_atomic_load(void)()
al_atomic_u16_store() -> al_atomic_store(u16)()
...

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 22 insertions, 22 deletions

diff --git a/src/ring_buffer.c b/src/ring_buffer.c
index c985d86..adb22ad 100644
--- a/src/ring_buffer.c
+++ b/src/ring_buffer.c
@@ -23,20 +23,20 @@ static inline void add(struct al_ring_buffer *buf, u8 **v, u8 *ptr, size_t n)
     ptr += n;
     al_assert(ptr <= buf->end);
     if (ptr == buf->end) ptr = buf->start;
-    al_atomic_ptr_store(v, ptr, AL_ATOMIC_RELEASE);
+    al_atomic_store(void)(v, ptr, AL_ATOMIC_RELEASE);
 }
 
 size_t al_ring_buffer_space(struct al_ring_buffer *buf)
 {
-    u8 *wp = al_atomic_ptr_load(&buf->write, AL_ATOMIC_RELAXED);
-    u8 *rp = previous(buf, (u8 *)al_atomic_ptr_load(&buf->read, AL_ATOMIC_RELAXED));
+    u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED);
+    u8 *rp = previous(buf, (u8 *)al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED));
     return (wp <= rp) ? rp - wp : (buf->end - wp) + (rp - buf->start);
 }
 
 u8 *al_ring_buffer_write_chunk(struct al_ring_buffer *buf, size_t *size)
 {
-    u8 *wp = al_atomic_ptr_load(&buf->write, AL_ATOMIC_ACQUIRE);
-    u8 *rp = previous(buf, al_atomic_ptr_load(&buf->read, AL_ATOMIC_RELAXED));
+    u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_ACQUIRE);
+    u8 *rp = previous(buf, al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED));
     *size = (wp <= rp ? rp : buf->end) - wp;
     return wp;
 }
@@ -48,15 +48,15 @@ void al_ring_buffer_append(struct al_ring_buffer *buf, u8 *ptr, size_t n)
 
 size_t al_ring_buffer_occupied(struct al_ring_buffer *buf)
 {
-    u8 *rp = al_atomic_ptr_load(&buf->read, AL_ATOMIC_RELAXED);
-    u8 *wp = al_atomic_ptr_load(&buf->write, AL_ATOMIC_RELAXED);
+    u8 *rp = al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED);
+    u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED);
     return (rp <= wp) ? wp - rp : (buf->end - rp) + (wp - buf->start);
 }
 
 u8 *al_ring_buffer_read_chunk(struct al_ring_buffer *buf, size_t *size)
 {
-    u8 *rp = al_atomic_ptr_load(&buf->read, AL_ATOMIC_ACQUIRE);
-    u8 *wp = al_atomic_ptr_load(&buf->write, AL_ATOMIC_RELAXED);
+    u8 *rp = al_atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE);
+    u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED);
     *size = (rp <= wp ? wp : buf->end) - rp;
     return rp;
 }
@@ -68,8 +68,8 @@ void al_ring_buffer_consume(struct al_ring_buffer *buf, u8 *ptr, size_t n)
 
 size_t al_ring_buffer_write(struct al_ring_buffer *buf, u8 *data, size_t n)
 {
-    u8 *wp = al_atomic_ptr_load(&buf->write, AL_ATOMIC_ACQUIRE);
-    u8 *rp = previous(buf, al_atomic_ptr_load(&buf->read, AL_ATOMIC_RELAXED));
+    u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_ACQUIRE);
+    u8 *rp = previous(buf, al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED));
 
     size_t size = AL_MIN((wp <= rp ? rp : buf->end) - wp, (ptrdiff_t)n);
 
@@ -83,15 +83,15 @@ size_t al_ring_buffer_write(struct al_ring_buffer *buf, u8 *data, size_t n)
         size += wrap;
     }
 
-    al_atomic_ptr_store(&buf->write, wp, AL_ATOMIC_RELEASE);
+    al_atomic_store(void)(&buf->write, wp, AL_ATOMIC_RELEASE);
 
     return size;
 }
 
 size_t al_ring_buffer_read(struct al_ring_buffer *buf, u8 *ptr, size_t n)
 {
-    u8 *rp = al_atomic_ptr_load(&buf->read, AL_ATOMIC_ACQUIRE);
-    u8 *wp = al_atomic_ptr_load(&buf->write, AL_ATOMIC_RELAXED);
+    u8 *rp = al_atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE);
+    u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED);
 
     size_t size = AL_MIN((rp <= wp ? wp : buf->end) - rp, (ptrdiff_t)n);
 
@@ -105,15 +105,15 @@ size_t al_ring_buffer_read(struct al_ring_buffer *buf, u8 *ptr, size_t n)
         size += wrap;
     }
 
-    al_atomic_ptr_store(&buf->read, rp, AL_ATOMIC_RELEASE);
+    al_atomic_store(void)(&buf->read, rp, AL_ATOMIC_RELEASE);
 
     return size;
 }
 
 size_t al_ring_buffer_peek(struct al_ring_buffer *buf, u8 *ptr, size_t offset, size_t n)
 {
-    u8 *rp = al_atomic_ptr_load(&buf->read, AL_ATOMIC_RELAXED);
-    u8 *wp = al_atomic_ptr_load(&buf->write, AL_ATOMIC_RELAXED);
+    u8 *rp = al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED);
+    u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED);
 
     ptrdiff_t size;
 
@@ -145,8 +145,8 @@ size_t al_ring_buffer_peek(struct al_ring_buffer *buf, u8 *ptr, size_t offset, s
 
 size_t al_ring_buffer_discard(struct al_ring_buffer *buf, size_t n)
 {
-    u8 *rp = al_atomic_ptr_load(&buf->read, AL_ATOMIC_ACQUIRE);
-    u8 *wp = al_atomic_ptr_load(&buf->write, AL_ATOMIC_RELAXED);
+    u8 *rp = al_atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE);
+    u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED);
 
     size_t discard = AL_MIN((rp <= wp ? wp : buf->end) - rp, (ptrdiff_t)n);
     rp += discard;
@@ -157,7 +157,7 @@ size_t al_ring_buffer_discard(struct al_ring_buffer *buf, size_t n)
         discard += wrap;
     }
 
-    al_atomic_ptr_store(&buf->read, rp, AL_ATOMIC_RELEASE);
+    al_atomic_store(void)(&buf->read, rp, AL_ATOMIC_RELEASE);
 
     return discard;
 }
@@ -165,6 +165,6 @@ size_t al_ring_buffer_discard(struct al_ring_buffer *buf, size_t n)
 // Not thread-safe.
 void al_ring_buffer_reset(struct al_ring_buffer *buf)
 {
-    al_atomic_ptr_store(&buf->read, buf->start, AL_ATOMIC_RELAXED);
-    al_atomic_ptr_store(&buf->write, buf->start, AL_ATOMIC_RELAXED);
+    al_atomic_store(void)(&buf->read, buf->start, AL_ATOMIC_RELAXED);
+    al_atomic_store(void)(&buf->write, buf->start, AL_ATOMIC_RELAXED);
 }