summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2014-04-15 22:42:35 -0400
committerGravatar bunnei2014-04-15 22:42:35 -0400
commit386dd722e7a2463eadefd3b1fd82681e8edcb5b7 (patch)
tree20fd5439d515afa4cf1035ab15af7af5d2ca77ec /src
parent- extracted srv: calls from service.cpp and put in its own module (diff)
downloadyuzu-386dd722e7a2463eadefd3b1fd82681e8edcb5b7.tar.gz
yuzu-386dd722e7a2463eadefd3b1fd82681e8edcb5b7.tar.xz
yuzu-386dd722e7a2463eadefd3b1fd82681e8edcb5b7.zip
fixed naming for APT_U
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/apt.cpp6
-rw-r--r--src/core/hle/service/apt.h10
-rw-r--r--src/core/hle/service/service.cpp2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/core/hle/service/apt.cpp b/src/core/hle/service/apt.cpp
index b1e49db97..288a68a86 100644
--- a/src/core/hle/service/apt.cpp
+++ b/src/core/hle/service/apt.cpp
@@ -8,7 +8,7 @@
8#include "core/hle/hle.h" 8#include "core/hle/hle.h"
9#include "core/hle/service/apt.h" 9#include "core/hle/service/apt.h"
10 10
11namespace Service { 11namespace APT_U {
12 12
13const HLE::FunctionDef APT_U_Table[] = { 13const HLE::FunctionDef APT_U_Table[] = {
14 {0x00010040, NULL, "GetLockHandle"}, 14 {0x00010040, NULL, "GetLockHandle"},
@@ -92,7 +92,7 @@ const HLE::FunctionDef APT_U_Table[] = {
92}; 92};
93 93
94// Returns handle to APT Mutex. Not imlemented. 94// Returns handle to APT Mutex. Not imlemented.
95Syscall::Result APT_U::GetLockHandle() { 95Syscall::Result Interface::GetLockHandle() {
96 return 0x00000000; 96 return 0x00000000;
97} 97}
98 98
@@ -100,7 +100,7 @@ Syscall::Result APT_U::GetLockHandle() {
100 * Called when svcSendSyncRequest is called, loads command buffer and executes comand 100 * Called when svcSendSyncRequest is called, loads command buffer and executes comand
101 * @return Return result of svcSendSyncRequest passed back to user app 101 * @return Return result of svcSendSyncRequest passed back to user app
102 */ 102 */
103Syscall::Result APT_U::Sync() { 103Syscall::Result Interface::Sync() {
104 Syscall::Result res = 0; 104 Syscall::Result res = 0;
105 u32* cmd_buff = (u32*)HLE::GetPointer(HLE::CMD_BUFFER_ADDR + CMD_OFFSET); 105 u32* cmd_buff = (u32*)HLE::GetPointer(HLE::CMD_BUFFER_ADDR + CMD_OFFSET);
106 106
diff --git a/src/core/hle/service/apt.h b/src/core/hle/service/apt.h
index 0e1f205c7..2be5a7e15 100644
--- a/src/core/hle/service/apt.h
+++ b/src/core/hle/service/apt.h
@@ -9,7 +9,7 @@
9//////////////////////////////////////////////////////////////////////////////////////////////////// 9////////////////////////////////////////////////////////////////////////////////////////////////////
10// Namespace Service 10// Namespace Service
11 11
12namespace Service { 12namespace APT_U {
13 13
14// Application and title launching service. These services handle signaling for home/power button as 14// Application and title launching service. These services handle signaling for home/power button as
15// well. Only one session for either APT service can be open at a time, normally processes close the 15// well. Only one session for either APT service can be open at a time, normally processes close the
@@ -17,13 +17,13 @@ namespace Service {
17// exactly the same, however certain commands are only accessible with APT:S(NS module will call 17// exactly the same, however certain commands are only accessible with APT:S(NS module will call
18// svcBreak when the command isn't accessible). See http://3dbrew.org/wiki/NS#APT_Services. 18// svcBreak when the command isn't accessible). See http://3dbrew.org/wiki/NS#APT_Services.
19 19
20class APT_U : public Interface { 20class Interface : public Service::Interface {
21public: 21public:
22 22
23 APT_U() { 23 Interface() {
24 } 24 }
25 25
26 ~APT_U() { 26 ~Interface() {
27 } 27 }
28 28
29 enum { 29 enum {
@@ -62,7 +62,7 @@ private:
62 62
63 Syscall::Result GetLockHandle(); 63 Syscall::Result GetLockHandle();
64 64
65 DISALLOW_COPY_AND_ASSIGN(APT_U); 65 DISALLOW_COPY_AND_ASSIGN(Interface);
66}; 66};
67 67
68} // namespace 68} // namespace
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 799dbe90e..81a34ed06 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -74,7 +74,7 @@ Interface* Manager::FetchFromPortName(std::string port_name) {
74void Init() { 74void Init() {
75 g_manager = new Manager; 75 g_manager = new Manager;
76 g_manager->AddService(new SRV::Interface); 76 g_manager->AddService(new SRV::Interface);
77 g_manager->AddService(new APT_U); 77 g_manager->AddService(new APT_U::Interface);
78 NOTICE_LOG(HLE, "Services initialized OK"); 78 NOTICE_LOG(HLE, "Services initialized OK");
79} 79}
80 80