6 files changed, 106 insertions, 0 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ee4238d2e..5578fa680 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -41,6 +41,7 @@ set(SRCS
             hle/service/apt_s.cpp
             hle/service/apt_u.cpp
             hle/service/boss_u.cpp
+            hle/service/cam_u.cpp
             hle/service/cecd_u.cpp
             hle/service/cfg/cfg.cpp
             hle/service/cfg/cfg_i.cpp
@@ -66,6 +67,7 @@ set(SRCS
             hle/service/nim_aoc.cpp
             hle/service/nwm_uds.cpp
             hle/service/pm_app.cpp
+            hle/service/ptm_play.cpp
             hle/service/ptm_u.cpp
             hle/service/ptm_sysm.cpp
             hle/service/service.cpp
@@ -140,6 +142,7 @@ set(HEADERS
             hle/service/apt_s.h
             hle/service/apt_u.h
             hle/service/boss_u.h
+            hle/service/cam_u.h
             hle/service/cecd_u.h
             hle/service/cfg/cfg.h
             hle/service/cfg/cfg_i.h
@@ -165,6 +168,7 @@ set(HEADERS
             hle/service/nim_aoc.h
             hle/service/nwm_uds.h
             hle/service/pm_app.h
+            hle/service/ptm_play.h
             hle/service/ptm_u.h
             hle/service/ptm_sysm.h
             hle/service/service.h
diff --git a/src/core/hle/service/cam_u.cpp b/src/core/hle/service/cam_u.cpp
new file mode 100644
index 000000000..549095339
--- /dev/null
+++ b/src/core/hle/service/cam_u.cpp
@@ -0,0 +1,24 @@
+// Copyright 2015 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/cam_u.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace CAM_U
+
+namespace CAM_U {
+
+// Empty arrays are illegal -- commented out until an entry is added.
+//const Interface::FunctionInfo FunctionTable[] = { };
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+
+Interface::Interface() {
+    //Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+    
+} // namespace
diff --git a/src/core/hle/service/cam_u.h b/src/core/hle/service/cam_u.h
new file mode 100644
index 000000000..3d48fe76d
--- /dev/null
+++ b/src/core/hle/service/cam_u.h
@@ -0,0 +1,23 @@
+// Copyright 2015 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "core/hle/service/service.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace CAM_U
+
+namespace CAM_U {
+
+class Interface : public Service::Interface {
+public:
+    Interface();
+
+    std::string GetPortName() const override {
+    return "cam:u";
+}
+};
+
+} // namespace
diff --git a/src/core/hle/service/ptm_play.cpp b/src/core/hle/service/ptm_play.cpp
new file mode 100644
index 000000000..ae9e2925c
--- /dev/null
+++ b/src/core/hle/service/ptm_play.cpp
@@ -0,0 +1,28 @@
+// Copyright 2015 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/ptm_play.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace PTM_PLAY
+
+namespace PTM_PLAY {
+
+const Interface::FunctionInfo FunctionTable[] = {
+    { 0x08070082, nullptr,               "GetPlayHistory" },
+    { 0x08080000, nullptr,               "GetPlayHistoryStart" },
+    { 0x08090000, nullptr,               "GetPlayHistoryLength" },
+    { 0x080B0080, nullptr,               "CalcPlayHistoryStart" },
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+    
+} // namespace
diff --git a/src/core/hle/service/ptm_play.h b/src/core/hle/service/ptm_play.h
new file mode 100644
index 000000000..2f4f0d6fd
--- /dev/null
+++ b/src/core/hle/service/ptm_play.h
@@ -0,0 +1,23 @@
+// Copyright 2015 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "core/hle/service/service.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace PTM_PLAY
+
+namespace PTM_PLAY {
+
+class Interface : public Service::Interface {
+public:
+    Interface();
+
+std::string GetPortName() const override {
+    return "ptm:play";
+}
+};
+
+} // namespace
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index b685fc905..444a4eab1 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -14,6 +14,7 @@
 #include "core/hle/service/apt_s.h"
 #include "core/hle/service/apt_u.h"
 #include "core/hle/service/boss_u.h"
+#include "core/hle/service/cam_u.h"
 #include "core/hle/service/cecd_u.h"
 #include "core/hle/service/cfg/cfg_i.h"
 #include "core/hle/service/cfg/cfg_s.h"
@@ -36,6 +37,7 @@
 #include "core/hle/service/nim_aoc.h"
 #include "core/hle/service/nwm_uds.h"
 #include "core/hle/service/pm_app.h"
+#include "core/hle/service/ptm_play.h"
 #include "core/hle/service/ptm_u.h"
 #include "core/hle/service/ptm_sysm.h"
 #include "core/hle/service/soc_u.h"
@@ -92,6 +94,7 @@ void Init() {
     g_manager->AddService(new APT_S::Interface);
     g_manager->AddService(new APT_U::Interface);
     g_manager->AddService(new BOSS_U::Interface);
+    g_manager->AddService(new CAM_U::Interface);
     g_manager->AddService(new CECD_U::Interface);
     g_manager->AddService(new CFG_I::Interface);
     g_manager->AddService(new CFG_S::Interface);
@@ -114,6 +117,7 @@ void Init() {
     g_manager->AddService(new NIM_AOC::Interface);
     g_manager->AddService(new NWM_UDS::Interface);
     g_manager->AddService(new PM_APP::Interface);
+    g_manager->AddService(new PTM_PLAY::Interface);
     g_manager->AddService(new PTM_U::Interface);
     g_manager->AddService(new PTM_SYSM::Interface);
     g_manager->AddService(new SOC_U::Interface);