From ffabed8c25490be0e61409cebd1615eedb223c3d Mon Sep 17 00:00:00 2001
From: bunnei
Date: Tue, 15 Apr 2014 23:28:03 -0400
Subject: restructured hle:services completely to use function lookup tables

---
 src/core/hle/service/srv.cpp | 55 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/core/hle/service/srv.cpp

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

diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
new file mode 100644
index 000000000..bb6c08b78
--- /dev/null
+++ b/src/core/hle/service/srv.cpp
@@ -0,0 +1,55 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#include "core/hle/hle.h"
+#include "core/hle/service/srv.h"
+#include "core/hle/service/service.h"
+
+
+namespace SRV {
+
+void Initialize() {
+    NOTICE_LOG(OSHLE, "SRV::Sync - Initialize");
+}
+
+void GetServiceHandle() {
+    Syscall::Result res = 0;
+    u32* cmd_buff = (u32*)HLE::GetPointer(HLE::CMD_BUFFER_ADDR + Service::kCommandHeaderOffset);
+
+    const char* port_name = (const char*)&cmd_buff[1];
+    Service::Interface* service = Service::g_manager->FetchFromPortName(port_name);
+
+    NOTICE_LOG(OSHLE, "SRV::Sync - GetHandle - port: %s, handle: 0x%08X", port_name, 
+        service->GetUID());
+
+    if (NULL != service) {
+        cmd_buff[3] = service->GetUID();
+    } else {
+        ERROR_LOG(OSHLE, "Service %s does not exist", port_name);
+        res = -1;
+    }
+    cmd_buff[1] = res;
+
+    //return res;
+}
+
+const HLE::FunctionDef FunctionTable[] = {
+    {0x00010002, Initialize,        "Initialize"},
+    {0x00020000, NULL,              "GetProcSemaphore"},
+    {0x00030100, NULL,              "RegisterService"},
+    {0x000400C0, NULL,              "UnregisterService"},
+    {0x00050100, GetServiceHandle,  "GetServiceHandle"},
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+
+Interface::~Interface() {
+}
+
+} // namespace
-- 
cgit v1.2.3


From 32c3462047d814eada8f3b80ee5ea2cd03936ae0 Mon Sep 17 00:00:00 2001
From: bunnei
Date: Wed, 16 Apr 2014 00:03:41 -0400
Subject: - added stubbed out GSP::Gpu service interface

- various cleanups/refactors to HLE services
---
 src/core/hle/service/srv.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index bb6c08b78..ad7448461 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -17,7 +17,7 @@ void GetServiceHandle() {
     Syscall::Result res = 0;
     u32* cmd_buff = (u32*)HLE::GetPointer(HLE::CMD_BUFFER_ADDR + Service::kCommandHeaderOffset);
 
-    const char* port_name = (const char*)&cmd_buff[1];
+    std::string port_name = std::string((const char*)&cmd_buff[1], 0, Service::kMaxPortSize);
     Service::Interface* service = Service::g_manager->FetchFromPortName(port_name);
 
     NOTICE_LOG(OSHLE, "SRV::Sync - GetHandle - port: %s, handle: 0x%08X", port_name, 
-- 
cgit v1.2.3


From b8851305bd9840c55a50ca386630f59166ae9578 Mon Sep 17 00:00:00 2001
From: bunnei
Date: Wed, 16 Apr 2014 20:46:05 -0400
Subject: updated service comments

---
 src/core/hle/service/srv.cpp | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index ad7448461..1ec78dd15 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -7,6 +7,9 @@
 #include "core/hle/service/service.h"
 
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace SRV
+
 namespace SRV {
 
 void Initialize() {
-- 
cgit v1.2.3


From 9d1a17ca88ee05cacb6e0f87d9a80b50d3acf69b Mon Sep 17 00:00:00 2001
From: bunnei
Date: Wed, 16 Apr 2014 21:22:15 -0400
Subject: fixed bug with printing std::string in log messages

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

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

diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index 1ec78dd15..579ea4a34 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -23,13 +23,13 @@ void GetServiceHandle() {
     std::string port_name = std::string((const char*)&cmd_buff[1], 0, Service::kMaxPortSize);
     Service::Interface* service = Service::g_manager->FetchFromPortName(port_name);
 
-    NOTICE_LOG(OSHLE, "SRV::Sync - GetHandle - port: %s, handle: 0x%08X", port_name, 
+    NOTICE_LOG(OSHLE, "SRV::Sync - GetHandle - port: %s, handle: 0x%08X", port_name.c_str(), 
         service->GetUID());
 
     if (NULL != service) {
         cmd_buff[3] = service->GetUID();
     } else {
-        ERROR_LOG(OSHLE, "Service %s does not exist", port_name);
+        ERROR_LOG(OSHLE, "Service %s does not exist", port_name.c_str());
         res = -1;
     }
     cmd_buff[1] = res;
-- 
cgit v1.2.3