Semaphores v0.1

include/kernel/kernel.hpp

@@ -48,6 +48,7 @@ class Kernel {
 
 public:
 	Handle makeMutex(bool locked = false); // Needs to be public to be accessible to the APT/DSP services
+	Handle makeSemaphore(u32 initialCount, u32 maximumCount); // Needs to be public to be accessible to the service manager port
 
 private:
 	void signalArbiter(u32 waitingAddress, s32 threadCount);

include/kernel/kernel_types.hpp

@@ -118,7 +118,7 @@ struct Thread {
     u32 waitingAddress;
 
     // The nanoseconds until a thread wakes up from being asleep or from timing out while waiting on an arbiter
-    s64 waitingNanoseconds;
+    u64 waitingNanoseconds;
     // The tick this thread went to sleep on
     u64 sleepTick;
     // For WaitSynchronization: A vector of objects this thread is waiting for
@@ -157,6 +157,13 @@ struct Mutex {
     Mutex(bool lock = false) : locked(lock) {}
 };
 
+struct Semaphore {
+    u32 initialCount;
+    u32 maximumCount;
+
+    Semaphore(u32 initialCount, u32 maximumCount) : initialCount(initialCount), maximumCount(maximumCount) {}
+};
+
 // Generic kernel object class
 struct KernelObject {
     Handle handle = 0; // A u32 the OS will use to identify objects

include/services/service_manager.hpp

@@ -1,6 +1,7 @@
 #pragma once
 #include <array>
-#include "helpers.hpp"
+#include <optional>
+#include "kernel_types.hpp"
 #include "logger.hpp"
 #include "memory.hpp"
 #include "services/apt.hpp"
@@ -15,11 +16,16 @@
 #include "services/ndm.hpp"
 #include "services/ptm.hpp"
 
+// More circular dependencies!!
 class Kernel;
 
 class ServiceManager {
 	std::array<u32, 16>& regs;
 	Memory& mem;
+	Kernel& kernel;
+
+	std::optional<Handle> notificationSemaphore;
+
 	MAKE_LOG_FUNCTION(log, srvLogger)
 
 	APTService apt;