From 61a2fe8c3bcd5e6dc7e97945b923d1a5bd8099ec Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Mon, 5 Dec 2016 13:44:41 -0500
Subject: HLE: Use a member variable instead of a virtual function to retrieve
 the max number of sessions that can be connected to an HLE service at the
 same time.

---
 src/core/hle/service/apt/apt.h     | 2 ++
 src/core/hle/service/apt/apt_a.cpp | 2 +-
 src/core/hle/service/apt/apt_s.cpp | 2 +-
 src/core/hle/service/apt/apt_u.cpp | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index 44dbd8757..9bc6327ed 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -14,6 +14,8 @@ class Interface;
 
 namespace APT {
 
+static const u32 MaxAPTSessions = 2; ///< Each APT service can only have up to 2 sessions connected at the same time.
+
 /// Holds information about the parameters used in Send/Glance/ReceiveParameter
 struct MessageParameter {
     u32 sender_id = 0;
diff --git a/src/core/hle/service/apt/apt_a.cpp b/src/core/hle/service/apt/apt_a.cpp
index a7a0c8a41..7f37a7f54 100644
--- a/src/core/hle/service/apt/apt_a.cpp
+++ b/src/core/hle/service/apt/apt_a.cpp
@@ -39,7 +39,7 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x01020000, CheckNew3DS, "CheckNew3DS"},
 };
 
-APT_A_Interface::APT_A_Interface() {
+APT_A_Interface::APT_A_Interface() : Interface(MaxAPTSessions) {
     Register(FunctionTable);
 }
 
diff --git a/src/core/hle/service/apt/apt_s.cpp b/src/core/hle/service/apt/apt_s.cpp
index c4556a5de..933f26e60 100644
--- a/src/core/hle/service/apt/apt_s.cpp
+++ b/src/core/hle/service/apt/apt_s.cpp
@@ -99,7 +99,7 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x01020000, CheckNew3DS, "CheckNew3DS"},
 };
 
-APT_S_Interface::APT_S_Interface() {
+APT_S_Interface::APT_S_Interface() : Interface(MaxAPTSessions) {
     Register(FunctionTable);
 }
 
diff --git a/src/core/hle/service/apt/apt_u.cpp b/src/core/hle/service/apt/apt_u.cpp
index a731c39f6..e06084a1e 100644
--- a/src/core/hle/service/apt/apt_u.cpp
+++ b/src/core/hle/service/apt/apt_u.cpp
@@ -99,7 +99,7 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x01020000, CheckNew3DS, "CheckNew3DS"},
 };
 
-APT_U_Interface::APT_U_Interface() {
+APT_U_Interface::APT_U_Interface() : Interface(MaxAPTSessions) {
     Register(FunctionTable);
 }
 
-- 
cgit v1.2.3


From 016307ae656afc85ab59a5c2598205ef81f99231 Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Wed, 14 Dec 2016 12:33:49 -0500
Subject: Fixed the codestyle to match our clang-format rules.

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

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

diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index 9bc6327ed..bcc437f93 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -14,7 +14,8 @@ class Interface;
 
 namespace APT {
 
-static const u32 MaxAPTSessions = 2; ///< Each APT service can only have up to 2 sessions connected at the same time.
+/// Each APT service can only have up to 2 sessions connected at the same time.
+static const u32 MaxAPTSessions = 2;
 
 /// Holds information about the parameters used in Send/Glance/ReceiveParameter
 struct MessageParameter {
-- 
cgit v1.2.3