diff options
| author | 2015-01-22 13:25:19 -0500 | |
|---|---|---|
| committer | 2015-01-22 13:25:19 -0500 | |
| commit | 92550013cf316cd4ee631d11429bddb7ee0b5e94 (patch) | |
| tree | dbe511b60590488f84cfb740ced8c99511568017 | |
| parent | Merge pull request #501 from lioncash/clean (diff) | |
| parent | Stubbed cam:u service (diff) | |
| download | yuzu-92550013cf316cd4ee631d11429bddb7ee0b5e94.tar.gz yuzu-92550013cf316cd4ee631d11429bddb7ee0b5e94.tar.xz yuzu-92550013cf316cd4ee631d11429bddb7ee0b5e94.zip | |
Merge pull request #493 from archshift/ptmplay
Stubbed some services
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/core/hle/service/cam_u.cpp | 24 | ||||
| -rw-r--r-- | src/core/hle/service/cam_u.h | 23 | ||||
| -rw-r--r-- | src/core/hle/service/ptm_play.cpp | 28 | ||||
| -rw-r--r-- | src/core/hle/service/ptm_play.h | 23 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 4 |
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 | |||
| 41 | hle/service/apt_s.cpp | 41 | hle/service/apt_s.cpp |
| 42 | hle/service/apt_u.cpp | 42 | hle/service/apt_u.cpp |
| 43 | hle/service/boss_u.cpp | 43 | hle/service/boss_u.cpp |
| 44 | hle/service/cam_u.cpp | ||
| 44 | hle/service/cecd_u.cpp | 45 | hle/service/cecd_u.cpp |
| 45 | hle/service/cfg/cfg.cpp | 46 | hle/service/cfg/cfg.cpp |
| 46 | hle/service/cfg/cfg_i.cpp | 47 | hle/service/cfg/cfg_i.cpp |
| @@ -66,6 +67,7 @@ set(SRCS | |||
| 66 | hle/service/nim_aoc.cpp | 67 | hle/service/nim_aoc.cpp |
| 67 | hle/service/nwm_uds.cpp | 68 | hle/service/nwm_uds.cpp |
| 68 | hle/service/pm_app.cpp | 69 | hle/service/pm_app.cpp |
| 70 | hle/service/ptm_play.cpp | ||
| 69 | hle/service/ptm_u.cpp | 71 | hle/service/ptm_u.cpp |
| 70 | hle/service/ptm_sysm.cpp | 72 | hle/service/ptm_sysm.cpp |
| 71 | hle/service/service.cpp | 73 | hle/service/service.cpp |
| @@ -140,6 +142,7 @@ set(HEADERS | |||
| 140 | hle/service/apt_s.h | 142 | hle/service/apt_s.h |
| 141 | hle/service/apt_u.h | 143 | hle/service/apt_u.h |
| 142 | hle/service/boss_u.h | 144 | hle/service/boss_u.h |
| 145 | hle/service/cam_u.h | ||
| 143 | hle/service/cecd_u.h | 146 | hle/service/cecd_u.h |
| 144 | hle/service/cfg/cfg.h | 147 | hle/service/cfg/cfg.h |
| 145 | hle/service/cfg/cfg_i.h | 148 | hle/service/cfg/cfg_i.h |
| @@ -165,6 +168,7 @@ set(HEADERS | |||
| 165 | hle/service/nim_aoc.h | 168 | hle/service/nim_aoc.h |
| 166 | hle/service/nwm_uds.h | 169 | hle/service/nwm_uds.h |
| 167 | hle/service/pm_app.h | 170 | hle/service/pm_app.h |
| 171 | hle/service/ptm_play.h | ||
| 168 | hle/service/ptm_u.h | 172 | hle/service/ptm_u.h |
| 169 | hle/service/ptm_sysm.h | 173 | hle/service/ptm_sysm.h |
| 170 | hle/service/service.h | 174 | 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 @@ | |||
| 1 | // Copyright 2015 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include "common/log.h" | ||
| 6 | #include "core/hle/hle.h" | ||
| 7 | #include "core/hle/service/cam_u.h" | ||
| 8 | |||
| 9 | //////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| 10 | // Namespace CAM_U | ||
| 11 | |||
| 12 | namespace CAM_U { | ||
| 13 | |||
| 14 | // Empty arrays are illegal -- commented out until an entry is added. | ||
| 15 | //const Interface::FunctionInfo FunctionTable[] = { }; | ||
| 16 | |||
| 17 | //////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| 18 | // Interface class | ||
| 19 | |||
| 20 | Interface::Interface() { | ||
| 21 | //Register(FunctionTable, ARRAY_SIZE(FunctionTable)); | ||
| 22 | } | ||
| 23 | |||
| 24 | } // 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 @@ | |||
| 1 | // Copyright 2015 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include "core/hle/service/service.h" | ||
| 8 | |||
| 9 | //////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| 10 | // Namespace CAM_U | ||
| 11 | |||
| 12 | namespace CAM_U { | ||
| 13 | |||
| 14 | class Interface : public Service::Interface { | ||
| 15 | public: | ||
| 16 | Interface(); | ||
| 17 | |||
| 18 | std::string GetPortName() const override { | ||
| 19 | return "cam:u"; | ||
| 20 | } | ||
| 21 | }; | ||
| 22 | |||
| 23 | } // 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 @@ | |||
| 1 | // Copyright 2015 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include "common/log.h" | ||
| 6 | #include "core/hle/hle.h" | ||
| 7 | #include "core/hle/service/ptm_play.h" | ||
| 8 | |||
| 9 | //////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| 10 | // Namespace PTM_PLAY | ||
| 11 | |||
| 12 | namespace PTM_PLAY { | ||
| 13 | |||
| 14 | const Interface::FunctionInfo FunctionTable[] = { | ||
| 15 | { 0x08070082, nullptr, "GetPlayHistory" }, | ||
| 16 | { 0x08080000, nullptr, "GetPlayHistoryStart" }, | ||
| 17 | { 0x08090000, nullptr, "GetPlayHistoryLength" }, | ||
| 18 | { 0x080B0080, nullptr, "CalcPlayHistoryStart" }, | ||
| 19 | }; | ||
| 20 | |||
| 21 | //////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| 22 | // Interface class | ||
| 23 | |||
| 24 | Interface::Interface() { | ||
| 25 | Register(FunctionTable, ARRAY_SIZE(FunctionTable)); | ||
| 26 | } | ||
| 27 | |||
| 28 | } // 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 @@ | |||
| 1 | // Copyright 2015 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include "core/hle/service/service.h" | ||
| 8 | |||
| 9 | //////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| 10 | // Namespace PTM_PLAY | ||
| 11 | |||
| 12 | namespace PTM_PLAY { | ||
| 13 | |||
| 14 | class Interface : public Service::Interface { | ||
| 15 | public: | ||
| 16 | Interface(); | ||
| 17 | |||
| 18 | std::string GetPortName() const override { | ||
| 19 | return "ptm:play"; | ||
| 20 | } | ||
| 21 | }; | ||
| 22 | |||
| 23 | } // 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 @@ | |||
| 14 | #include "core/hle/service/apt_s.h" | 14 | #include "core/hle/service/apt_s.h" |
| 15 | #include "core/hle/service/apt_u.h" | 15 | #include "core/hle/service/apt_u.h" |
| 16 | #include "core/hle/service/boss_u.h" | 16 | #include "core/hle/service/boss_u.h" |
| 17 | #include "core/hle/service/cam_u.h" | ||
| 17 | #include "core/hle/service/cecd_u.h" | 18 | #include "core/hle/service/cecd_u.h" |
| 18 | #include "core/hle/service/cfg/cfg_i.h" | 19 | #include "core/hle/service/cfg/cfg_i.h" |
| 19 | #include "core/hle/service/cfg/cfg_s.h" | 20 | #include "core/hle/service/cfg/cfg_s.h" |
| @@ -36,6 +37,7 @@ | |||
| 36 | #include "core/hle/service/nim_aoc.h" | 37 | #include "core/hle/service/nim_aoc.h" |
| 37 | #include "core/hle/service/nwm_uds.h" | 38 | #include "core/hle/service/nwm_uds.h" |
| 38 | #include "core/hle/service/pm_app.h" | 39 | #include "core/hle/service/pm_app.h" |
| 40 | #include "core/hle/service/ptm_play.h" | ||
| 39 | #include "core/hle/service/ptm_u.h" | 41 | #include "core/hle/service/ptm_u.h" |
| 40 | #include "core/hle/service/ptm_sysm.h" | 42 | #include "core/hle/service/ptm_sysm.h" |
| 41 | #include "core/hle/service/soc_u.h" | 43 | #include "core/hle/service/soc_u.h" |
| @@ -92,6 +94,7 @@ void Init() { | |||
| 92 | g_manager->AddService(new APT_S::Interface); | 94 | g_manager->AddService(new APT_S::Interface); |
| 93 | g_manager->AddService(new APT_U::Interface); | 95 | g_manager->AddService(new APT_U::Interface); |
| 94 | g_manager->AddService(new BOSS_U::Interface); | 96 | g_manager->AddService(new BOSS_U::Interface); |
| 97 | g_manager->AddService(new CAM_U::Interface); | ||
| 95 | g_manager->AddService(new CECD_U::Interface); | 98 | g_manager->AddService(new CECD_U::Interface); |
| 96 | g_manager->AddService(new CFG_I::Interface); | 99 | g_manager->AddService(new CFG_I::Interface); |
| 97 | g_manager->AddService(new CFG_S::Interface); | 100 | g_manager->AddService(new CFG_S::Interface); |
| @@ -114,6 +117,7 @@ void Init() { | |||
| 114 | g_manager->AddService(new NIM_AOC::Interface); | 117 | g_manager->AddService(new NIM_AOC::Interface); |
| 115 | g_manager->AddService(new NWM_UDS::Interface); | 118 | g_manager->AddService(new NWM_UDS::Interface); |
| 116 | g_manager->AddService(new PM_APP::Interface); | 119 | g_manager->AddService(new PM_APP::Interface); |
| 120 | g_manager->AddService(new PTM_PLAY::Interface); | ||
| 117 | g_manager->AddService(new PTM_U::Interface); | 121 | g_manager->AddService(new PTM_U::Interface); |
| 118 | g_manager->AddService(new PTM_SYSM::Interface); | 122 | g_manager->AddService(new PTM_SYSM::Interface); |
| 119 | g_manager->AddService(new SOC_U::Interface); | 123 | g_manager->AddService(new SOC_U::Interface); |