Changeset dc5c303 in mainline for uspace/lib/c/arch/arm32/src/atomic.c

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/lib/c/arch/arm32/src/atomic.c (modified) (4 diffs)

uspace/lib/c/arch/arm32/src/atomic.c

@@ -38 +38 @@
 volatile unsigned *ras_page;
 
-bool __atomic_compare_exchange_4(volatile unsigned *mem, unsigned *expected, unsigned desired, bool weak, int success, int failure)
+bool __atomic_compare_exchange_4(volatile void *mem0, void *expected0,
+    unsigned desired, bool weak, int success, int failure)
 {
+        volatile unsigned *mem = mem0;
+        unsigned *expected = expected0;
+
         (void) success;
         (void) failure;
@@ -82 +86 @@
 }
 
-unsigned short __atomic_fetch_add_2(volatile unsigned short *mem, unsigned short val, int model)
+unsigned short __atomic_fetch_add_2(volatile void *mem0, unsigned short val,
+    int model)
 {
+        volatile unsigned short *mem = mem0;
+
         (void) model;
 
@@ -116 +123 @@
 }
 
-unsigned __atomic_fetch_add_4(volatile unsigned *mem, unsigned val, int model)
+unsigned __atomic_fetch_add_4(volatile void *mem0, unsigned val, int model)
 {
+        volatile unsigned *mem = mem0;
+
         (void) model;
 
@@ -150 +159 @@
 }
 
-unsigned __atomic_fetch_sub_4(volatile unsigned *mem, unsigned val, int model)
+unsigned __atomic_fetch_sub_4(volatile void *mem, unsigned val, int model)
 {
         return __atomic_fetch_add_4(mem, -val, model);