From 386dd722e7a2463eadefd3b1fd82681e8edcb5b7 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 15 Apr 2014 22:42:35 -0400 Subject: [PATCH] fixed naming for APT_U --- src/core/hle/service/apt.cpp | 6 +++--- src/core/hle/service/apt.h | 10 +++++----- src/core/hle/service/service.cpp | 2 +- 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 @@ #include "core/hle/hle.h" #include "core/hle/service/apt.h" -namespace Service { +namespace APT_U { const HLE::FunctionDef APT_U_Table[] = { {0x00010040, NULL, "GetLockHandle"}, @@ -92,7 +92,7 @@ const HLE::FunctionDef APT_U_Table[] = { }; // Returns handle to APT Mutex. Not imlemented. -Syscall::Result APT_U::GetLockHandle() { +Syscall::Result Interface::GetLockHandle() { return 0x00000000; } @@ -100,7 +100,7 @@ Syscall::Result APT_U::GetLockHandle() { * Called when svcSendSyncRequest is called, loads command buffer and executes comand * @return Return result of svcSendSyncRequest passed back to user app */ -Syscall::Result APT_U::Sync() { +Syscall::Result Interface::Sync() { Syscall::Result res = 0; u32* cmd_buff = (u32*)HLE::GetPointer(HLE::CMD_BUFFER_ADDR + CMD_OFFSET); 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 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// // Namespace Service -namespace Service { +namespace APT_U { // Application and title launching service. These services handle signaling for home/power button as // well. Only one session for either APT service can be open at a time, normally processes close the @@ -17,13 +17,13 @@ namespace Service { // exactly the same, however certain commands are only accessible with APT:S(NS module will call // svcBreak when the command isn't accessible). See http://3dbrew.org/wiki/NS#APT_Services. -class APT_U : public Interface { +class Interface : public Service::Interface { public: - APT_U() { + Interface() { } - ~APT_U() { + ~Interface() { } enum { @@ -62,7 +62,7 @@ private: Syscall::Result GetLockHandle(); - DISALLOW_COPY_AND_ASSIGN(APT_U); + DISALLOW_COPY_AND_ASSIGN(Interface); }; } // 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) { void Init() { g_manager = new Manager; g_manager->AddService(new SRV::Interface); - g_manager->AddService(new APT_U); + g_manager->AddService(new APT_U::Interface); NOTICE_LOG(HLE, "Services initialized OK"); }