4 files changed, 42 insertions, 11 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index 62e3460e1..b7434aaf2 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -29,7 +29,7 @@ public:
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /// Arbitrate an address
-ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s32 value) {
+ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s32 value, u64 nanoseconds) {
     Object* object = Kernel::g_handle_table.GetGeneric(handle).get();
     if (object == nullptr)
         return InvalidHandle(ErrorModule::Kernel);
@@ -55,7 +55,13 @@ ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s3
             HLE::Reschedule(__func__);
         }
         break;
-    
+    case ArbitrationType::WaitIfLessThanWithTimeout:
+        if ((s32)Memory::Read32(address) <= value) {
+            Kernel::WaitCurrentThread(WAITTYPE_ARB, object, address);
+            Kernel::WakeThreadAfterDelay(GetCurrentThread(), nanoseconds);
+            HLE::Reschedule(__func__);
+        }
+        break;
     case ArbitrationType::DecrementAndWaitIfLessThan:
     {
         s32 memory_value = Memory::Read32(address) - 1;
@@ -66,6 +72,17 @@ ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s3
         }
         break;
     }
+    case ArbitrationType::DecrementAndWaitIfLessThanWithTimeout:
+    {
+        s32 memory_value = Memory::Read32(address) - 1;
+        Memory::Write32(address, memory_value);
+        if (memory_value <= value) {
+            Kernel::WaitCurrentThread(WAITTYPE_ARB, object, address);
+            Kernel::WakeThreadAfterDelay(GetCurrentThread(), nanoseconds);
+            HLE::Reschedule(__func__);
+        }
+        break;
+    }
 
     default:
         LOG_ERROR(Kernel, "unknown type=%d", type);
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h
index 030e7ad7b..3ffd465a2 100644
--- a/src/core/hle/kernel/address_arbiter.h
+++ b/src/core/hle/kernel/address_arbiter.h
@@ -28,7 +28,7 @@ enum class ArbitrationType : u32 {
 };
 
 /// Arbitrate an address
-ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s32 value);
+ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s32 value, u64 nanoseconds);
 
 /// Create an address arbiter
 Handle CreateAddressArbiter(const std::string& name = "Unknown");
diff --git a/src/core/hle/service/apt_u.cpp b/src/core/hle/service/apt_u.cpp
index a38621088..007c6efef 100644
--- a/src/core/hle/service/apt_u.cpp
+++ b/src/core/hle/service/apt_u.cpp
@@ -25,10 +25,12 @@ namespace APT_U {
 // correctly mapping it in Citra, however we still do not understand how the mapping is determined.
 static const VAddr SHARED_FONT_VADDR = 0x18000000;
 
-// Handle to shared memory region designated to for shared system font
+/// Handle to shared memory region designated to for shared system font
 static Handle shared_font_mem = 0;
 
 static Handle lock_handle = 0;
+static Handle notification_event_handle = 0; ///< APT notification event handle
+static Handle pause_event_handle = 0; ///< APT pause event handle
 static std::vector<u8> shared_font;
 
 /// Signals used by APT functions
@@ -42,11 +44,14 @@ enum class SignalType : u32 {
 void Initialize(Service::Interface* self) {
     u32* cmd_buff = Kernel::GetCommandBuffer();
 
-    cmd_buff[3] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Menu");  // APT menu event handle
-    cmd_buff[4] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Pause"); // APT pause event handle
+    notification_event_handle = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Notification");
+    pause_event_handle = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Pause");
 
-    Kernel::SetEventLocked(cmd_buff[3], true);
-    Kernel::SetEventLocked(cmd_buff[4], false); // Fire start event
+    cmd_buff[3] = notification_event_handle;
+    cmd_buff[4] = pause_event_handle;
+
+    Kernel::SetEventLocked(notification_event_handle, true);
+    Kernel::SetEventLocked(pause_event_handle, false); // Fire start event
 
     _assert_msg_(KERNEL, (0 != lock_handle), "Cannot initialize without lock");
     Kernel::ReleaseMutex(lock_handle);
@@ -54,6 +59,15 @@ void Initialize(Service::Interface* self) {
     cmd_buff[1] = 0; // No error
 }
 
+void NotifyToWait(Service::Interface* self) {
+    u32* cmd_buff = Kernel::GetCommandBuffer();
+    u32 app_id = cmd_buff[1];
+    // TODO(Subv): Verify this, it seems to get SWKBD and Home Menu further.
+    Kernel::SignalEvent(pause_event_handle);
+    LOG_WARNING(Service_APT, "(STUBBED) app_id=%u", app_id);
+    cmd_buff[0] = 0;
+}
+
 void GetLockHandle(Service::Interface* self) {
     u32* cmd_buff = Kernel::GetCommandBuffer();
     u32 flags = cmd_buff[1]; // TODO(bunnei): Figure out the purpose of the flag field
@@ -84,7 +98,7 @@ void Enable(Service::Interface* self) {
 
 void InquireNotification(Service::Interface* self) {
     u32* cmd_buff = Kernel::GetCommandBuffer();
-    u32 app_id = cmd_buff[2];
+    u32 app_id = cmd_buff[1];
     cmd_buff[1] = 0; // No error
     cmd_buff[2] = static_cast<u32>(SignalType::None); // Signal type
     LOG_WARNING(Service_APT, "(STUBBED) called app_id=0x%08X", app_id);
@@ -277,7 +291,7 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x00400042, nullptr,               "SendCaptureBufferInfo"},
     {0x00410040, nullptr,               "ReceiveCaptureBufferInfo"},
     {0x00420080, nullptr,               "SleepSystem"},
-    {0x00430040, nullptr,               "NotifyToWait"},
+    {0x00430040, NotifyToWait,          "NotifyToWait"},
     {0x00440000, GetSharedFont,         "GetSharedFont"},
     {0x00450040, nullptr,               "GetWirelessRebootInfo"},
     {0x00460104, nullptr,               "Wrap"},
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 5c6a3be80..a487f757c 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -194,7 +194,7 @@ static Result ArbitrateAddress(Handle arbiter, u32 address, u32 type, u32 value,
     LOG_TRACE(Kernel_SVC, "called handle=0x%08X, address=0x%08X, type=0x%08X, value=0x%08X", arbiter,
         address, type, value);
     return Kernel::ArbitrateAddress(arbiter, static_cast<Kernel::ArbitrationType>(type),
-            address, value).raw;
+            address, value, nanoseconds).raw;
 }
 
 /// Used to output a message on a debug hardware unit - does nothing on a retail unit