From 68596a706860f37de876ca070f9de6e664df0d05 Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Fri, 21 Jul 2017 13:19:55 -0500
Subject: Services/APT: Return the proper error code when calling SendParameter
 with an outstanding parameter already in memory.

---
 src/core/hle/service/apt/apt.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/core/hle/service/apt/apt.h')

diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index ee80926d2..106754853 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -116,6 +116,12 @@ enum class ScreencapPostPermission : u32 {
     DisableScreenshotPostingToMiiverse = 3
 };
 
+namespace ErrCodes {
+enum {
+    ParameterPresent = 2,
+};
+}
+
 /// Send a parameter to the currently-running application, which will read it via ReceiveParameter
 void SendParameter(const MessageParameter& parameter);
 
-- 
cgit v1.2.3


From 73fba0de46aef0b18ef0ef5221cc23a60be4cb6c Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Sat, 22 Jul 2017 12:33:03 -0500
Subject: Services/APT: Use an array to hold data about the 4 possible
 concurrent applet types (Application, Library, HomeMenu, System).

This gives each applet type its own set of events as per the real NS module.
---
 src/core/hle/service/apt/apt.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/core/hle/service/apt/apt.h')

diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index 106754853..96b28b438 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -72,6 +72,8 @@ enum class SignalType : u32 {
 
 /// App Id's used by APT functions
 enum class AppletId : u32 {
+    None = 0,
+    AnySystemApplet = 0x100,
     HomeMenu = 0x101,
     AlternateMenu = 0x103,
     Camera = 0x110,
@@ -83,6 +85,7 @@ enum class AppletId : u32 {
     Miiverse = 0x117,
     MiiversePost = 0x118,
     AmiiboSettings = 0x119,
+    AnySysLibraryApplet = 0x200,
     SoftwareKeyboard1 = 0x201,
     Ed1 = 0x202,
     PnoteApp = 0x204,
@@ -119,8 +122,9 @@ enum class ScreencapPostPermission : u32 {
 namespace ErrCodes {
 enum {
     ParameterPresent = 2,
+    InvalidAppletSlot = 4,
 };
-}
+} // namespace ErrCodes
 
 /// Send a parameter to the currently-running application, which will read it via ReceiveParameter
 void SendParameter(const MessageParameter& parameter);
-- 
cgit v1.2.3


From 7096f01c14ff76aefd829ae449a8ab5d474eacf7 Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Sat, 23 Sep 2017 14:01:04 -0500
Subject: HLE/APT: Always return an error from PrepareToStartNewestHomeMenu so
 that the Home Menu doesn't try to reboot the system.

As per 3dbrew:
"During Home Menu start-up it uses APT:PrepareToStartNewestHomeMenu. If that doesn't return an error(normally NS returns 0xC8A0CFFC for that), Home Menu starts a hardware reboot with APT:StartNewestHomeMenu etc. "
---
 src/core/hle/service/apt/apt.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/core/hle/service/apt/apt.h')

diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index 96b28b438..7b79e1f3e 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -419,6 +419,16 @@ void GetAppCpuTimeLimit(Service::Interface* self);
  */
 void PrepareToStartLibraryApplet(Service::Interface* self);
 
+/**
+ * APT::PrepareToStartNewestHomeMenu service function
+ *  Inputs:
+ *      0 : Command header [0x001A0000]
+ *  Outputs:
+ *      0 : Return header
+ *      1 : Result of function
+ */
+void PrepareToStartNewestHomeMenu(Service::Interface* self);
+
 /**
  * APT::PreloadLibraryApplet service function
  *  Inputs:
-- 
cgit v1.2.3