APT: Added stubbed ReceiveParameter and various cleanups.

APT: More cleanups.

APT: Changed SignalType to be type u32.

1 files changed, 93 insertions, 71 deletions

diff --git a/src/core/hle/service/apt.cpp b/src/core/hle/service/apt.cpp
index a0012b5d..e97e7dbf 100644
--- a/src/core/hle/service/apt.cpp
+++ b/src/core/hle/service/apt.cpp
@@ -15,9 +15,16 @@
 
 namespace APT_U {
 
+/// Signals used by APT functions
+enum class SignalType : u32 {
+    None            = 0x0,
+    AppJustStarted  = 0x1,
+    ReturningToApp  = 0xB,
+    ExitingApp      = 0xC,
+};
+
 void Initialize(Service::Interface* self) {
     u32* cmd_buff = Service::GetCommandBuffer();
-    DEBUG_LOG(KERNEL, "called");
     
     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
@@ -26,6 +33,7 @@ void Initialize(Service::Interface* self) {
     Kernel::SetEventLocked(cmd_buff[4], false); // Fire start event
 
     cmd_buff[1] = 0; // No error
+    DEBUG_LOG(KERNEL, "called");
 }
 
 void GetLockHandle(Service::Interface* self) {
@@ -40,15 +48,29 @@ void Enable(Service::Interface* self) {
     u32* cmd_buff = Service::GetCommandBuffer();
     u32 unk = cmd_buff[1]; // TODO(bunnei): What is this field used for?
     cmd_buff[1] = 0; // No error
-    ERROR_LOG(KERNEL, "(UNIMPEMENTED) called unk=0x%08X", unk);
+    WARN_LOG(KERNEL, "(STUBBED) called unk=0x%08X", unk);
 }
 
 void InquireNotification(Service::Interface* self) {
     u32* cmd_buff = Service::GetCommandBuffer();
     u32 app_id = cmd_buff[2];
     cmd_buff[1] = 0; // No error
-    cmd_buff[3] = 0; // Signal type
-    ERROR_LOG(KERNEL, "(UNIMPEMENTED) called app_id=0x%08X", app_id);
+    cmd_buff[2] = static_cast<u32>(SignalType::None); // Signal type
+    WARN_LOG(KERNEL, "(STUBBED) called app_id=0x%08X", app_id);
+}
+
+void ReceiveParameter(Service::Interface* self) {
+    u32* cmd_buff = Service::GetCommandBuffer();
+    u32 app_id = cmd_buff[1];
+    u32 buffer_size = cmd_buff[2];
+    cmd_buff[1] = 0; // No error
+    cmd_buff[2] = 0;
+    cmd_buff[3] = static_cast<u32>(SignalType::AppJustStarted); // Signal type
+    cmd_buff[4] = 0x10;
+    cmd_buff[5] = 0;
+    cmd_buff[6] = 0;
+    cmd_buff[7] = 0;
+    WARN_LOG(KERNEL, "(STUBBED) called app_id=0x%08X, buffer_size=0x%08X", app_id, buffer_size);
 }
 
 const Interface::FunctionInfo FunctionTable[] = {
@@ -63,73 +85,73 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x00090040, nullptr,               "IsRegistered"},
     {0x000A0040, nullptr,               "GetAttribute"},
     {0x000B0040, InquireNotification,   "InquireNotification"},
-    {0x000C0104, nullptr,                "SendParameter"},
-    {0x000D0080, nullptr,                "ReceiveParameter"},
-    {0x000E0080, nullptr,                "GlanceParameter"},
-    {0x000F0100, nullptr,                "CancelParameter"},
-    {0x001000C2, nullptr,                "DebugFunc"},
-    {0x001100C0, nullptr,                "MapProgramIdForDebug"},
-    {0x00120040, nullptr,                "SetHomeMenuAppletIdForDebug"},
-    {0x00130000, nullptr,                "GetPreparationState"},
-    {0x00140040, nullptr,                "SetPreparationState"},
-    {0x00150140, nullptr,                "PrepareToStartApplication"},
-    {0x00160040, nullptr,                "PreloadLibraryApplet"},
-    {0x00170040, nullptr,                "FinishPreloadingLibraryApplet"},
-    {0x00180040, nullptr,                "PrepareToStartLibraryApplet"},
-    {0x00190040, nullptr,                "PrepareToStartSystemApplet"},
-    {0x001A0000, nullptr,                "PrepareToStartNewestHomeMenu"},
-    {0x001B00C4, nullptr,                "StartApplication"},
-    {0x001C0000, nullptr,                "WakeupApplication"},
-    {0x001D0000, nullptr,                "CancelApplication"},
-    {0x001E0084, nullptr,                "StartLibraryApplet"},
-    {0x001F0084, nullptr,                "StartSystemApplet"},
-    {0x00200044, nullptr,                "StartNewestHomeMenu"},
-    {0x00210000, nullptr,                "OrderToCloseApplication"},
-    {0x00220040, nullptr,                "PrepareToCloseApplication"},
-    {0x00230040, nullptr,                "PrepareToJumpToApplication"},
-    {0x00240044, nullptr,                "JumpToApplication"},
-    {0x002500C0, nullptr,                "PrepareToCloseLibraryApplet"},
-    {0x00260000, nullptr,                "PrepareToCloseSystemApplet"},
-    {0x00270044, nullptr,                "CloseApplication"},
-    {0x00280044, nullptr,                "CloseLibraryApplet"},
-    {0x00290044, nullptr,                "CloseSystemApplet"},
-    {0x002A0000, nullptr,                "OrderToCloseSystemApplet"},
-    {0x002B0000, nullptr,                "PrepareToJumpToHomeMenu"},
-    {0x002C0044, nullptr,                "JumpToHomeMenu"},
-    {0x002D0000, nullptr,                "PrepareToLeaveHomeMenu"},
-    {0x002E0044, nullptr,                "LeaveHomeMenu"},
-    {0x002F0040, nullptr,                "PrepareToLeaveResidentApplet"},
-    {0x00300044, nullptr,                "LeaveResidentApplet"},
-    {0x00310100, nullptr,                "PrepareToDoApplicationJump"},
-    {0x00320084, nullptr,                "DoApplicationJump"},
-    {0x00330000, nullptr,                "GetProgramIdOnApplicationJump"},
-    {0x00340084, nullptr,                "SendDeliverArg"},
-    {0x00350080, nullptr,                "ReceiveDeliverArg"},
-    {0x00360040, nullptr,                "LoadSysMenuArg"},
-    {0x00370042, nullptr,                "StoreSysMenuArg"},
-    {0x00380040, nullptr,                "PreloadResidentApplet"},
-    {0x00390040, nullptr,                "PrepareToStartResidentApplet"},
-    {0x003A0044, nullptr,                "StartResidentApplet"},
-    {0x003B0040, nullptr,                "CancelLibraryApplet"},
-    {0x003C0042, nullptr,                "SendDspSleep"},
-    {0x003D0042, nullptr,                "SendDspWakeUp"},
-    {0x003E0080, nullptr,                "ReplySleepQuery"},
-    {0x003F0040, nullptr,                "ReplySleepNotificationComplete"},
-    {0x00400042, nullptr,                "SendCaptureBufferInfo"},
-    {0x00410040, nullptr,                "ReceiveCaptureBufferInfo"},
-    {0x00420080, nullptr,                "SleepSystem"},
-    {0x00430040, nullptr,                "NotifyToWait"},
-    {0x00440000, nullptr,                "GetSharedFont"},
-    {0x00450040, nullptr,                "GetWirelessRebootInfo"},
-    {0x00460104, nullptr,                "Wrap"},
-    {0x00470104, nullptr,                "Unwrap"},
-    {0x00480100, nullptr,                "GetProgramInfo"},
-    {0x00490180, nullptr,                "Reboot"},
-    {0x004A0040, nullptr,                "GetCaptureInfo"},
-    {0x004B00C2, nullptr,                "AppletUtility"},
-    {0x004C0000, nullptr,                "SetFatalErrDispMode"},
-    {0x004D0080, nullptr,                "GetAppletProgramInfo"},
-    {0x004E0000, nullptr,                "HardwareResetAsync"},
+    {0x000C0104, nullptr,               "SendParameter"},
+    {0x000D0080, ReceiveParameter,      "ReceiveParameter"},
+    {0x000E0080, nullptr,               "GlanceParameter"},
+    {0x000F0100, nullptr,               "CancelParameter"},
+    {0x001000C2, nullptr,               "DebugFunc"},
+    {0x001100C0, nullptr,               "MapProgramIdForDebug"},
+    {0x00120040, nullptr,               "SetHomeMenuAppletIdForDebug"},
+    {0x00130000, nullptr,               "GetPreparationState"},
+    {0x00140040, nullptr,               "SetPreparationState"},
+    {0x00150140, nullptr,               "PrepareToStartApplication"},
+    {0x00160040, nullptr,               "PreloadLibraryApplet"},
+    {0x00170040, nullptr,               "FinishPreloadingLibraryApplet"},
+    {0x00180040, nullptr,               "PrepareToStartLibraryApplet"},
+    {0x00190040, nullptr,               "PrepareToStartSystemApplet"},
+    {0x001A0000, nullptr,               "PrepareToStartNewestHomeMenu"},
+    {0x001B00C4, nullptr,               "StartApplication"},
+    {0x001C0000, nullptr,               "WakeupApplication"},
+    {0x001D0000, nullptr,               "CancelApplication"},
+    {0x001E0084, nullptr,               "StartLibraryApplet"},
+    {0x001F0084, nullptr,               "StartSystemApplet"},
+    {0x00200044, nullptr,               "StartNewestHomeMenu"},
+    {0x00210000, nullptr,               "OrderToCloseApplication"},
+    {0x00220040, nullptr,               "PrepareToCloseApplication"},
+    {0x00230040, nullptr,               "PrepareToJumpToApplication"},
+    {0x00240044, nullptr,               "JumpToApplication"},
+    {0x002500C0, nullptr,               "PrepareToCloseLibraryApplet"},
+    {0x00260000, nullptr,               "PrepareToCloseSystemApplet"},
+    {0x00270044, nullptr,               "CloseApplication"},
+    {0x00280044, nullptr,               "CloseLibraryApplet"},
+    {0x00290044, nullptr,               "CloseSystemApplet"},
+    {0x002A0000, nullptr,               "OrderToCloseSystemApplet"},
+    {0x002B0000, nullptr,               "PrepareToJumpToHomeMenu"},
+    {0x002C0044, nullptr,               "JumpToHomeMenu"},
+    {0x002D0000, nullptr,               "PrepareToLeaveHomeMenu"},
+    {0x002E0044, nullptr,               "LeaveHomeMenu"},
+    {0x002F0040, nullptr,               "PrepareToLeaveResidentApplet"},
+    {0x00300044, nullptr,               "LeaveResidentApplet"},
+    {0x00310100, nullptr,               "PrepareToDoApplicationJump"},
+    {0x00320084, nullptr,               "DoApplicationJump"},
+    {0x00330000, nullptr,               "GetProgramIdOnApplicationJump"},
+    {0x00340084, nullptr,               "SendDeliverArg"},
+    {0x00350080, nullptr,               "ReceiveDeliverArg"},
+    {0x00360040, nullptr,               "LoadSysMenuArg"},
+    {0x00370042, nullptr,               "StoreSysMenuArg"},
+    {0x00380040, nullptr,               "PreloadResidentApplet"},
+    {0x00390040, nullptr,               "PrepareToStartResidentApplet"},
+    {0x003A0044, nullptr,               "StartResidentApplet"},
+    {0x003B0040, nullptr,               "CancelLibraryApplet"},
+    {0x003C0042, nullptr,               "SendDspSleep"},
+    {0x003D0042, nullptr,               "SendDspWakeUp"},
+    {0x003E0080, nullptr,               "ReplySleepQuery"},
+    {0x003F0040, nullptr,               "ReplySleepNotificationComplete"},
+    {0x00400042, nullptr,               "SendCaptureBufferInfo"},
+    {0x00410040, nullptr,               "ReceiveCaptureBufferInfo"},
+    {0x00420080, nullptr,               "SleepSystem"},
+    {0x00430040, nullptr,               "NotifyToWait"},
+    {0x00440000, nullptr,               "GetSharedFont"},
+    {0x00450040, nullptr,               "GetWirelessRebootInfo"},
+    {0x00460104, nullptr,               "Wrap"},
+    {0x00470104, nullptr,               "Unwrap"},
+    {0x00480100, nullptr,               "GetProgramInfo"},
+    {0x00490180, nullptr,               "Reboot"},
+    {0x004A0040, nullptr,               "GetCaptureInfo"},
+    {0x004B00C2, nullptr,               "AppletUtility"},
+    {0x004C0000, nullptr,               "SetFatalErrDispMode"},
+    {0x004D0080, nullptr,               "GetAppletProgramInfo"},
+    {0x004E0000, nullptr,               "HardwareResetAsync"},
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////