kernel: Review comments (move to private interface to private headers, atomics)

nx/include/switch/kernel/uevent.h

@@ -16,8 +16,3 @@ struct UsermodeEvent
 void ueventCreate(UsermodeEvent* e, bool auto_clear);
 void ueventClear(UsermodeEvent* e);
 void ueventSignal(UsermodeEvent* e);
-
-// Internal methods (do not use!):
-bool _ueventConsumeIfSignalled(UsermodeEvent* e);
-void _ueventAddListener(UsermodeEvent* e, WaiterNode* w);
-void _ueventRemoveListener(UsermodeEvent* e, WaiterNode* w);

nx/include/switch/kernel/utimer.h

@@ -13,7 +13,3 @@ struct UsermodeTimer
 void utimerCreate(UsermodeTimer* t, u64 interval, bool start);
 void utimerStart(UsermodeTimer* t);
 void utimerStop(UsermodeTimer* t);
-
-// Internal methods (do not use!):
-void _utimerRecalculate(UsermodeTimer* t, u64 old_time);
-u64  _utimerGetNextTime(UsermodeTimer* t);

nx/include/switch/kernel/waiter.h

@@ -26,10 +26,3 @@ struct Waiter
     WaiterNode nodes[MAX_WAIT];
     size_t num_nodes;
 };
-
-// Internal methods (do not use!):
-void _waiterCreate(Waiter* w);
-void _waiterFree(Waiter* w, WaitObject* objects);
-void _waiterSubscribe(Waiter* w, UsermodeEvent* e);
-bool _waiterSignal(Waiter* w, s32 idx);
-s32  _waiterGetSignalledIndex(Waiter* w);

nx/source/kernel/uevent.c

@@ -3,6 +3,7 @@
 #include "kernel/mutex.h"
 #include "kernel/waiter.h"
 #include "kernel/uevent.h"
+#include "waiter.h"
 
 void ueventCreate(UsermodeEvent* e, bool auto_clear)
 {

nx/source/kernel/uevent.h

@@ -0,0 +1,7 @@
+// Copyright 2018 plutoo
+#pragma once
+#include "kernel/uevent.h"
+
+bool _ueventConsumeIfSignalled(UsermodeEvent* e);
+void _ueventAddListener(UsermodeEvent* e, WaiterNode* w);
+void _ueventRemoveListener(UsermodeEvent* e, WaiterNode* w);

nx/source/kernel/utimer.c

@@ -14,22 +14,23 @@ void utimerCreate(UsermodeTimer* t, u64 interval, bool start)
 
 void utimerStart(UsermodeTimer* t)
 {
-    __sync_bool_compare_and_swap(&t->next_time, 0, armGetSystemTick() + armNsToTick(t->interval));
+    u64 zero = 0;
+    __atomic_compare_exchange_n(&t->next_time, &zero, armGetSystemTick() + armNsToTick(t->interval), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
 }
 
 void utimerStop(UsermodeTimer* t)
 {
-    while (__sync_bool_compare_and_swap(&t->next_time, t->next_time, 0));
+    while (!__atomic_compare_exchange_n(&t->next_time, &t->next_time, 0, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST));
 }
 
 void _utimerRecalculate(UsermodeTimer* t, u64 old_time)
 {
     s64 interval = t->interval;
     s64 new_time = ((armGetSystemTick() - old_time + interval - 1) / interval) * interval;
-    __sync_bool_compare_and_swap(&t->next_time, old_time, new_time);
+    __atomic_compare_exchange_n(&t->next_time, &old_time, new_time, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
 }
 
 u64 _utimerGetNextTime(UsermodeTimer* t)
 {
-    return t->next_time;
+    return __atomic_load_n(&t->next_time, __ATOMIC_SEQ_CST);
 }

nx/source/kernel/utimer.h

@@ -0,0 +1,6 @@
+// Copyright 2018 plutoo
+#pragma once
+#include "kernel/utimer.h"
+
+void _utimerRecalculate(UsermodeTimer* t, u64 old_time);
+u64  _utimerGetNextTime(UsermodeTimer* t);

nx/source/kernel/wait.c

@@ -6,6 +6,9 @@
 #include "kernel/utimer.h"
 #include "kernel/uevent.h"
 #include "arm/counter.h"
+#include "waiter.h"
+#include "utimer.h"
+#include "uevent.h"
 #include "../internal.h"
 
 Result waitN(s32* idx_out, WaitObject* objects, size_t num_objects, u64 timeout)

nx/source/kernel/waiter.c

@@ -1,6 +1,8 @@
 // Copyright 2018 plutoo
 #include "kernel/waiter.h"
 #include "kernel/uevent.h"
+#include "waiter.h"
+#include "uevent.h"
 #include "../internal.h"
 
 #define NOT_YET_SIGNALLED (-1)

nx/source/kernel/waiter.h

@@ -0,0 +1,10 @@
+// Copyright 2018 plutoo
+#pragma once
+#include "kernel/waiter.h"
+
+void _waiterCreate(Waiter* w);
+void _waiterFree(Waiter* w, WaitObject* objects);
+void _waiterSubscribe(Waiter* w, UsermodeEvent* e);
+bool _waiterSignal(Waiter* w, s32 idx);
+s32  _waiterGetSignalledIndex(Waiter* w);
+