pm: Support for 6.0.0

include/stratosphere/hossynch.hpp

@@ -66,15 +66,15 @@ class HosCondVar {
     public:
         HosCondVar() {
             mutexInit(&m);
-            condvarInit(&cv, &m);
+            condvarInit(&cv);
         }
         
         Result WaitTimeout(u64 timeout) {
-            return condvarWaitTimeout(&cv, timeout);
+            return condvarWaitTimeout(&cv, &m, timeout);
         }
         
         Result Wait() {
-            return condvarWait(&cv);
+            return condvarWait(&cv, &m);
         }
         
         Result Wake(int num) {
@@ -92,45 +92,25 @@ class HosCondVar {
 
 class HosSemaphore {
     private:
-        CondVar cv;
+        Semaphore s;
-        Mutex m;
-        u64 count;
     public:
         HosSemaphore() {
-            count = 0;
+            semaphoreInit(&s, 0);
-            mutexInit(&m);
-            condvarInit(&cv, &m);
         }
         
-        HosSemaphore(u64 c) : count(c) {
+        HosSemaphore(u64 c) {
-            mutexInit(&m);
+            semaphoreInit(&s, c);
-            condvarInit(&cv, &m);
         }
         
         void Signal() {
-            mutexLock(&this->m);
+            semaphoreSignal(&s);
-            count++;
-            condvarWakeOne(&cv);
-            mutexUnlock(&this->m);
         }
         
         void Wait() {
-            mutexLock(&this->m);
+            semaphoreWait(&s);
-            while (!count) {
-                condvarWait(&cv);
-            }
-            count--;
-            mutexUnlock(&this->m);
         }
         
         bool TryWait() {
-            mutexLock(&this->m);
+            return semaphoreTryWait(&s);
-            bool success = false;
-            if (count) {
-                count--;
-                success = true;
-            }
-            mutexUnlock(&this->m);
-            return success;
         }
 };