From 5dea1faeddc519b7f93f4be23a4a774b44469764 Mon Sep 17 00:00:00 2001 From: mailwl Date: Tue, 13 Dec 2016 09:35:24 +0300 Subject: [PATCH] Service/ACT: move ACT services to folder --- src/core/CMakeLists.txt | 10 ++++++---- src/core/hle/service/act/act.cpp | 18 ++++++++++++++++++ src/core/hle/service/act/act.h | 14 ++++++++++++++ src/core/hle/service/{ => act}/act_a.cpp | 3 ++- src/core/hle/service/{ => act}/act_a.h | 0 src/core/hle/service/{ => act}/act_u.cpp | 3 ++- src/core/hle/service/{ => act}/act_u.h | 0 src/core/hle/service/service.cpp | 6 ++---- 8 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 src/core/hle/service/act/act.cpp create mode 100644 src/core/hle/service/act/act.h rename src/core/hle/service/{ => act}/act_a.cpp (90%) rename src/core/hle/service/{ => act}/act_a.h (100%) rename src/core/hle/service/{ => act}/act_u.cpp (88%) rename src/core/hle/service/{ => act}/act_u.h (100%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index e26677079e..266c9d8adc 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -52,8 +52,9 @@ set(SRCS hle/kernel/timer.cpp hle/kernel/vm_manager.cpp hle/service/ac_u.cpp - hle/service/act_a.cpp - hle/service/act_u.cpp + hle/service/act/act.cpp + hle/service/act/act_a.cpp + hle/service/act/act_u.cpp hle/service/am/am.cpp hle/service/am/am_app.cpp hle/service/am/am_net.cpp @@ -215,8 +216,9 @@ set(HEADERS hle/kernel/vm_manager.h hle/result.h hle/service/ac_u.h - hle/service/act_a.h - hle/service/act_u.h + hle/service/act/act.h + hle/service/act/act_a.h + hle/service/act/act_u.h hle/service/am/am.h hle/service/am/am_app.h hle/service/am/am_net.h diff --git a/src/core/hle/service/act/act.cpp b/src/core/hle/service/act/act.cpp new file mode 100644 index 0000000000..9600036c08 --- /dev/null +++ b/src/core/hle/service/act/act.cpp @@ -0,0 +1,18 @@ +// Copyright 2016 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "core/hle/service/act/act.h" +#include "core/hle/service/act/act_a.h" +#include "core/hle/service/act/act_u.h" + +namespace Service { +namespace ACT { + +void Init() { + AddService(new ACT_A); + AddService(new ACT_U); +} + +} // namespace ACT +} // namespace Service diff --git a/src/core/hle/service/act/act.h b/src/core/hle/service/act/act.h new file mode 100644 index 0000000000..3481532c05 --- /dev/null +++ b/src/core/hle/service/act/act.h @@ -0,0 +1,14 @@ +// Copyright 2016 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +namespace Service { +namespace ACT { + +/// Initialize AM service +void Init(); + +} // namespace ACT +} // namespace Service diff --git a/src/core/hle/service/act_a.cpp b/src/core/hle/service/act/act_a.cpp similarity index 90% rename from src/core/hle/service/act_a.cpp rename to src/core/hle/service/act/act_a.cpp index 9880aafff4..5c523368f8 100644 --- a/src/core/hle/service/act_a.cpp +++ b/src/core/hle/service/act/act_a.cpp @@ -2,7 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/hle/service/act_a.h" +#include "core/hle/service/act/act.h" +#include "core/hle/service/act/act_a.h" namespace Service { namespace ACT { diff --git a/src/core/hle/service/act_a.h b/src/core/hle/service/act/act_a.h similarity index 100% rename from src/core/hle/service/act_a.h rename to src/core/hle/service/act/act_a.h diff --git a/src/core/hle/service/act_u.cpp b/src/core/hle/service/act/act_u.cpp similarity index 88% rename from src/core/hle/service/act_u.cpp rename to src/core/hle/service/act/act_u.cpp index b4f69c57d1..cf98aa1d61 100644 --- a/src/core/hle/service/act_u.cpp +++ b/src/core/hle/service/act/act_u.cpp @@ -2,7 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/hle/service/act_u.h" +#include "core/hle/service/act/act.h" +#include "core/hle/service/act/act_u.h" namespace Service { namespace ACT { diff --git a/src/core/hle/service/act_u.h b/src/core/hle/service/act/act_u.h similarity index 100% rename from src/core/hle/service/act_u.h rename to src/core/hle/service/act/act_u.h diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index effecc0436..3e70e05ae4 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -5,8 +5,7 @@ #include "common/logging/log.h" #include "common/string_util.h" #include "core/hle/service/ac_u.h" -#include "core/hle/service/act_a.h" -#include "core/hle/service/act_u.h" +#include "core/hle/service/act/act.h" #include "core/hle/service/am/am.h" #include "core/hle/service/apt/apt.h" #include "core/hle/service/boss/boss.h" @@ -113,6 +112,7 @@ void Init() { AddNamedPort(new ERR::ERR_F); FS::ArchiveInit(); + ACT::Init(); AM::Init(); APT::Init(); BOSS::Init(); @@ -132,8 +132,6 @@ void Init() { QTM::Init(); AddService(new AC::AC_U); - AddService(new ACT::ACT_A); - AddService(new ACT::ACT_U); AddService(new CSND::CSND_SND); AddService(new DSP_DSP::Interface); AddService(new GSP::GSP_GPU);