summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-05-30 05:26:58 +0200
committerbunnei <ericbunnie@gmail.com>2014-05-30 05:26:58 +0200
commitc404d22036e16d20d91fca0cf29d56785656c0f5 (patch)
tree8dd5aa70a08441dc3139a22bf94e8fccd5414649 /src/core/hle/service
parentsvc: updated OutputDebugString to use OS_LOG (diff)
downloadyuzu-c404d22036e16d20d91fca0cf29d56785656c0f5.tar
yuzu-c404d22036e16d20d91fca0cf29d56785656c0f5.tar.gz
yuzu-c404d22036e16d20d91fca0cf29d56785656c0f5.tar.bz2
yuzu-c404d22036e16d20d91fca0cf29d56785656c0f5.tar.lz
yuzu-c404d22036e16d20d91fca0cf29d56785656c0f5.tar.xz
yuzu-c404d22036e16d20d91fca0cf29d56785656c0f5.tar.zst
yuzu-c404d22036e16d20d91fca0cf29d56785656c0f5.zip
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/apt.cpp8
-rw-r--r--src/core/hle/service/gsp.cpp4
-rw-r--r--src/core/hle/service/service.cpp8
-rw-r--r--src/core/hle/service/srv.cpp6
4 files changed, 15 insertions, 11 deletions
diff --git a/src/core/hle/service/apt.cpp b/src/core/hle/service/apt.cpp
index f2118ba03..10d9a94bd 100644
--- a/src/core/hle/service/apt.cpp
+++ b/src/core/hle/service/apt.cpp
@@ -17,7 +17,7 @@ namespace APT_U {
void Initialize(Service::Interface* self) {
u32* cmd_buff = Service::GetCommandBuffer();
- DEBUG_LOG(KERNEL, "APT_U::Initialize called");
+ DEBUG_LOG(KERNEL, "called");
cmd_buff[3] = Kernel::CreateEvent(RESETTYPE_ONESHOT); // APT menu event handle
cmd_buff[4] = Kernel::CreateEvent(RESETTYPE_ONESHOT); // APT pause event handle
@@ -33,14 +33,14 @@ void GetLockHandle(Service::Interface* self) {
u32 flags = cmd_buff[1]; // TODO(bunnei): Figure out the purpose of the flag field
cmd_buff[1] = 0; // No error
cmd_buff[5] = Kernel::CreateMutex(false);
- DEBUG_LOG(KERNEL, "APT_U::GetLockHandle called handle=0x%08X", cmd_buff[5]);
+ DEBUG_LOG(KERNEL, "called handle=0x%08X", cmd_buff[5]);
}
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) APT_U::Enable called unk=0x%08X", unk);
+ ERROR_LOG(KERNEL, "(UNIMPEMENTED) called unk=0x%08X", unk);
}
void InquireNotification(Service::Interface* self) {
@@ -48,7 +48,7 @@ void InquireNotification(Service::Interface* self) {
u32 app_id = cmd_buff[2];
cmd_buff[1] = 0; // No error
cmd_buff[3] = 0; // Signal type
- ERROR_LOG(KERNEL, "(UNIMPEMENTED) APT_U::InquireNotification called app_id=0x%08X", app_id);
+ ERROR_LOG(KERNEL, "(UNIMPEMENTED) called app_id=0x%08X", app_id);
}
const Interface::FunctionInfo FunctionTable[] = {
diff --git a/src/core/hle/service/gsp.cpp b/src/core/hle/service/gsp.cpp
index 50cee2c41..575db86c1 100644
--- a/src/core/hle/service/gsp.cpp
+++ b/src/core/hle/service/gsp.cpp
@@ -92,7 +92,7 @@ void ReadHWRegs(Service::Interface* self) {
break;
default:
- ERROR_LOG(GSP, "ReadHWRegs unknown register read at address %08X", reg_addr);
+ ERROR_LOG(GSP, "unknown register read at address %08X", reg_addr);
}
}
@@ -117,7 +117,7 @@ void TriggerCmdReqQueue(Service::Interface* self) {
break;
default:
- ERROR_LOG(GSP, "TriggerCmdReqQueue unknown command 0x%08X", cmd_buff[0]);
+ ERROR_LOG(GSP, "unknown command 0x%08X", cmd_buff[0]);
}
GX_FinishCommand(g_thread_id);
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 08d0c43ff..904670e62 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -12,6 +12,8 @@
#include "core/hle/service/apt.h"
#include "core/hle/service/gsp.h"
#include "core/hle/service/hid.h"
+#include "core/hle/service/ndm.h"
+#include "core/hle/service/pt.h"
#include "core/hle/service/srv.h"
#include "core/hle/kernel/kernel.h"
@@ -72,14 +74,16 @@ void Init() {
g_manager->AddService(new APT_U::Interface);
g_manager->AddService(new GSP_GPU::Interface);
g_manager->AddService(new HID_User::Interface);
+ g_manager->AddService(new NDM_U::Interface);
+ g_manager->AddService(new PT_A::Interface);
- NOTICE_LOG(HLE, "Services initialized OK");
+ NOTICE_LOG(HLE, "initialized OK");
}
/// Shutdown ServiceManager
void Shutdown() {
delete g_manager;
- NOTICE_LOG(HLE, "Services shutdown OK");
+ NOTICE_LOG(HLE, "shutdown OK");
}
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index 97e7fc8fa..ac8f398fc 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -15,14 +15,14 @@ namespace SRV {
Handle g_mutex = 0;
void Initialize(Service::Interface* self) {
- DEBUG_LOG(OSHLE, "SRV::Initialize called");
+ DEBUG_LOG(OSHLE, "called");
if (!g_mutex) {
g_mutex = Kernel::CreateMutex(false);
}
}
void GetProcSemaphore(Service::Interface* self) {
- DEBUG_LOG(OSHLE, "SRV::GetProcSemaphore called");
+ DEBUG_LOG(OSHLE, "called");
// Get process semaphore?
u32* cmd_buff = Service::GetCommandBuffer();
cmd_buff[1] = 0; // No error
@@ -36,7 +36,7 @@ void GetServiceHandle(Service::Interface* self) {
std::string port_name = std::string((const char*)&cmd_buff[1], 0, Service::kMaxPortSize);
Service::Interface* service = Service::g_manager->FetchFromPortName(port_name);
- DEBUG_LOG(OSHLE, "SRV::Sync - GetHandle - port: %s, handle: 0x%08X", port_name.c_str(),
+ DEBUG_LOG(OSHLE, "called port=%s, handle=0x%08X", port_name.c_str(),
service->GetHandle());
if (NULL != service) {