diff options
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/sm/srv.cpp (renamed from src/core/hle/service/srv.cpp) | 6 | ||||
| -rw-r--r-- | src/core/hle/service/sm/srv.h (renamed from src/core/hle/service/srv.h) | 5 |
4 files changed, 10 insertions, 9 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 51ee80bc4..0e2aacde7 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -156,8 +156,8 @@ set(SRCS hle/service/qtm/qtm_sp.cpp hle/service/qtm/qtm_u.cpp hle/service/service.cpp + hle/service/sm/srv.cpp hle/service/soc_u.cpp - hle/service/srv.cpp hle/service/ssl_c.cpp hle/service/y2r_u.cpp hle/shared_page.cpp @@ -352,8 +352,8 @@ set(HEADERS hle/service/qtm/qtm_sp.h hle/service/qtm/qtm_u.h hle/service/service.h + hle/service/sm/srv.h hle/service/soc_u.h - hle/service/srv.h hle/service/ssl_c.h hle/service/y2r_u.h hle/shared_page.h diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 8f7c97d54..3a821871f 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -38,8 +38,8 @@ #include "core/hle/service/ptm/ptm.h" #include "core/hle/service/qtm/qtm.h" #include "core/hle/service/service.h" +#include "core/hle/service/sm/srv.h" #include "core/hle/service/soc_u.h" -#include "core/hle/service/srv.h" #include "core/hle/service/ssl_c.h" #include "core/hle/service/y2r_u.h" @@ -126,7 +126,7 @@ void AddService(Interface* interface_) { /// Initialize ServiceManager void Init() { - AddNamedPort(new SRV::SRV); + AddNamedPort(new SM::SRV); AddNamedPort(new ERR::ERR_F); FS::ArchiveInit(); diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/sm/srv.cpp index 130c9d25e..9d7a83597 100644 --- a/src/core/hle/service/srv.cpp +++ b/src/core/hle/service/sm/srv.cpp @@ -9,10 +9,10 @@ #include "core/hle/kernel/client_session.h" #include "core/hle/kernel/event.h" #include "core/hle/kernel/server_session.h" -#include "core/hle/service/srv.h" +#include "core/hle/service/sm/srv.h" namespace Service { -namespace SRV { +namespace SM { static Kernel::SharedPtr<Kernel::Event> event_handle; @@ -184,5 +184,5 @@ SRV::~SRV() { event_handle = nullptr; } -} // namespace SRV +} // namespace SM } // namespace Service diff --git a/src/core/hle/service/srv.h b/src/core/hle/service/sm/srv.h index d3a9de879..4196ca1e2 100644 --- a/src/core/hle/service/srv.h +++ b/src/core/hle/service/sm/srv.h @@ -4,10 +4,11 @@ #pragma once +#include <string> #include "core/hle/service/service.h" namespace Service { -namespace SRV { +namespace SM { /// Interface to "srv:" service class SRV final : public Interface { @@ -20,5 +21,5 @@ public: } }; -} // namespace SRV +} // namespace SM } // namespace Service |