From c404d22036e16d20d91fca0cf29d56785656c0f5 Mon Sep 17 00:00:00 2001
From: bunnei
Date: Thu, 29 May 2014 23:26:58 -0400
Subject: hle: cleaned up log messages

---
 src/core/hle/service/service.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/core/hle/service/service.cpp')

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");
 }
 
 
-- 
cgit v1.2.3


From 2482be13df81eaae17b721e080249bd6c4de759e Mon Sep 17 00:00:00 2001
From: bunnei
Date: Fri, 30 May 2014 00:22:25 -0400
Subject: service: removed PT_A from, as this was just an alias for APT_U

---
 src/core/hle/service/service.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/core/hle/service/service.cpp')

diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 904670e62..781b41fb0 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -13,7 +13,6 @@
 #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"
@@ -75,7 +74,6 @@ void Init() {
     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, "initialized OK");
 }
-- 
cgit v1.2.3


From c95972275e276abe3afcac79d956ea29a0879c8e Mon Sep 17 00:00:00 2001
From: bunnei
Date: Fri, 6 Jun 2014 00:35:49 -0400
Subject: HLE: Updated all uses of NULL to nullptr (to be C++11 compliant)

---
 src/core/hle/service/service.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core/hle/service/service.cpp')

diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 781b41fb0..4a1ac857e 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -19,7 +19,7 @@
 
 namespace Service {
 
-Manager* g_manager = NULL;  ///< Service manager
+Manager* g_manager = nullptr;  ///< Service manager
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Service Manager class
@@ -56,7 +56,7 @@ Interface* Manager::FetchFromHandle(Handle handle) {
 Interface* Manager::FetchFromPortName(std::string port_name) {
     auto itr = m_port_map.find(port_name);
     if (itr == m_port_map.end()) {
-        return NULL;
+        return nullptr;
     }
     return FetchFromHandle(itr->second);
 }
-- 
cgit v1.2.3