From 87f5aae7dda9867d391ee5e43954ca7305884e41 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Mon, 31 Jul 2023 02:33:48 +0200 Subject: [PATCH] service: Move all services to folders Is more consistent and allows for an easier overview of all available services. --- src/core/CMakeLists.txt | 24 +++++++++++----------- src/core/core.cpp | 2 +- src/core/hle/service/ac/ac.cpp | 2 +- src/core/hle/service/{ => err}/err_f.cpp | 2 +- src/core/hle/service/{ => err}/err_f.h | 0 src/core/hle/service/{ => http}/http_c.cpp | 4 ++-- src/core/hle/service/{ => http}/http_c.h | 0 src/core/hle/service/{ => mic}/mic_u.cpp | 2 +- src/core/hle/service/{ => mic}/mic_u.h | 0 src/core/hle/service/{ => soc}/soc_u.cpp | 0 src/core/hle/service/{ => soc}/soc_u.h | 0 src/core/hle/service/{ => ssl}/ssl_c.cpp | 2 +- src/core/hle/service/{ => ssl}/ssl_c.h | 0 src/core/hle/service/{ => y2r}/y2r_u.cpp | 2 +- src/core/hle/service/{ => y2r}/y2r_u.h | 0 src/core/hw/y2r.cpp | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) rename src/core/hle/service/{ => err}/err_f.cpp (99%) rename src/core/hle/service/{ => err}/err_f.h (100%) rename src/core/hle/service/{ => http}/http_c.cpp (99%) rename src/core/hle/service/{ => http}/http_c.h (100%) rename src/core/hle/service/{ => mic}/mic_u.cpp (99%) rename src/core/hle/service/{ => mic}/mic_u.h (100%) rename src/core/hle/service/{ => soc}/soc_u.cpp (100%) rename src/core/hle/service/{ => soc}/soc_u.h (100%) rename src/core/hle/service/{ => ssl}/ssl_c.cpp (98%) rename src/core/hle/service/{ => ssl}/ssl_c.h (100%) rename src/core/hle/service/{ => y2r}/y2r_u.cpp (99%) rename src/core/hle/service/{ => y2r}/y2r_u.h (100%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 186f50fe3c..7257e5a3d1 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -277,8 +277,8 @@ add_library(citra_core STATIC hle/service/dlp/dlp_srvr.h hle/service/dsp/dsp_dsp.cpp hle/service/dsp/dsp_dsp.h - hle/service/err_f.cpp - hle/service/err_f.h + hle/service/err/err_f.cpp + hle/service/err/err_f.h hle/service/frd/frd.cpp hle/service/frd/frd.h hle/service/frd/frd_a.cpp @@ -305,8 +305,8 @@ add_library(citra_core STATIC hle/service/hid/hid_spvr.h hle/service/hid/hid_user.cpp hle/service/hid/hid_user.h - hle/service/http_c.cpp - hle/service/http_c.h + hle/service/http/http_c.cpp + hle/service/http/http_c.h hle/service/ir/extra_hid.cpp hle/service/ir/extra_hid.h hle/service/ir/ir.cpp @@ -321,8 +321,8 @@ add_library(citra_core STATIC hle/service/ldr_ro/cro_helper.h hle/service/ldr_ro/ldr_ro.cpp hle/service/ldr_ro/ldr_ro.h - hle/service/mic_u.cpp - hle/service/mic_u.h + hle/service/mic/mic_u.cpp + hle/service/mic/mic_u.h hle/service/mvd/mvd.cpp hle/service/mvd/mvd.h hle/service/mvd/mvd_std.cpp @@ -419,12 +419,12 @@ add_library(citra_core STATIC hle/service/sm/sm.h hle/service/sm/srv.cpp hle/service/sm/srv.h - hle/service/soc_u.cpp - hle/service/soc_u.h - hle/service/ssl_c.cpp - hle/service/ssl_c.h - hle/service/y2r_u.cpp - hle/service/y2r_u.h + hle/service/soc/soc_u.cpp + hle/service/soc/soc_u.h + hle/service/ssl/ssl_c.cpp + hle/service/ssl/ssl_c.h + hle/service/y2r/y2r_u.cpp + hle/service/y2r/y2r_u.h hw/aes/arithmetic128.cpp hw/aes/arithmetic128.h hw/aes/ccm.cpp diff --git a/src/core/core.cpp b/src/core/core.cpp index 019c55f20b..098c3625bb 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -38,7 +38,7 @@ #include "core/hle/service/hid/hid.h" #include "core/hle/service/ir/ir_rst.h" #include "core/hle/service/ir/ir_user.h" -#include "core/hle/service/mic_u.h" +#include "core/hle/service/mic/mic_u.h" #include "core/hle/service/plgldr/plgldr.h" #include "core/hle/service/service.h" #include "core/hle/service/sm/sm.h" diff --git a/src/core/hle/service/ac/ac.cpp b/src/core/hle/service/ac/ac.cpp index 3293eb6118..c1a61126bf 100644 --- a/src/core/hle/service/ac/ac.cpp +++ b/src/core/hle/service/ac/ac.cpp @@ -16,7 +16,7 @@ #include "core/hle/service/ac/ac.h" #include "core/hle/service/ac/ac_i.h" #include "core/hle/service/ac/ac_u.h" -#include "core/hle/service/soc_u.h" +#include "core/hle/service/soc/soc_u.h" #include "core/memory.h" namespace Service::AC { diff --git a/src/core/hle/service/err_f.cpp b/src/core/hle/service/err/err_f.cpp similarity index 99% rename from src/core/hle/service/err_f.cpp rename to src/core/hle/service/err/err_f.cpp index 986ad84153..896306cf13 100644 --- a/src/core/hle/service/err_f.cpp +++ b/src/core/hle/service/err/err_f.cpp @@ -14,7 +14,7 @@ #include "core/hle/ipc.h" #include "core/hle/ipc_helpers.h" #include "core/hle/result.h" -#include "core/hle/service/err_f.h" +#include "core/hle/service/err/err_f.h" #undef exception_info // We use 'exception_info' as a plain identifier, but MSVC defines this in one // of its many headers. diff --git a/src/core/hle/service/err_f.h b/src/core/hle/service/err/err_f.h similarity index 100% rename from src/core/hle/service/err_f.h rename to src/core/hle/service/err/err_f.h diff --git a/src/core/hle/service/http_c.cpp b/src/core/hle/service/http/http_c.cpp similarity index 99% rename from src/core/hle/service/http_c.cpp rename to src/core/hle/service/http/http_c.cpp index 17c1e1a2a0..521f09ef12 100644 --- a/src/core/hle/service/http_c.cpp +++ b/src/core/hle/service/http/http_c.cpp @@ -15,7 +15,7 @@ #include "core/hle/kernel/ipc.h" #include "core/hle/romfs.h" #include "core/hle/service/fs/archive.h" -#include "core/hle/service/http_c.h" +#include "core/hle/service/http/http_c.h" #include "core/hw/aes/key.h" SERIALIZE_EXPORT_IMPL(Service::HTTP::HTTP_C) @@ -1024,7 +1024,7 @@ void HTTP_C::GetDownloadSizeState(Kernel::HLERequestContext& ctx) { // length if the download is complete and 0 otherwise. u32 content_length = 0; const bool is_complete = itr->second.request_future.wait_for(std::chrono::milliseconds(0)) == - std::future_status::ready; + std::future_status::ready; if (is_complete) { const auto& headers = itr->second.response.headers; const auto& it = headers.find("Content-Length"); diff --git a/src/core/hle/service/http_c.h b/src/core/hle/service/http/http_c.h similarity index 100% rename from src/core/hle/service/http_c.h rename to src/core/hle/service/http/http_c.h diff --git a/src/core/hle/service/mic_u.cpp b/src/core/hle/service/mic/mic_u.cpp similarity index 99% rename from src/core/hle/service/mic_u.cpp rename to src/core/hle/service/mic/mic_u.cpp index 95c12a9f96..bca6177c0e 100644 --- a/src/core/hle/service/mic_u.cpp +++ b/src/core/hle/service/mic/mic_u.cpp @@ -16,7 +16,7 @@ #include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/shared_memory.h" -#include "core/hle/service/mic_u.h" +#include "core/hle/service/mic/mic_u.h" SERVICE_CONSTRUCT_IMPL(Service::MIC::MIC_U) SERIALIZE_EXPORT_IMPL(Service::MIC::MIC_U) diff --git a/src/core/hle/service/mic_u.h b/src/core/hle/service/mic/mic_u.h similarity index 100% rename from src/core/hle/service/mic_u.h rename to src/core/hle/service/mic/mic_u.h diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc/soc_u.cpp similarity index 100% rename from src/core/hle/service/soc_u.cpp rename to src/core/hle/service/soc/soc_u.cpp diff --git a/src/core/hle/service/soc_u.h b/src/core/hle/service/soc/soc_u.h similarity index 100% rename from src/core/hle/service/soc_u.h rename to src/core/hle/service/soc/soc_u.h diff --git a/src/core/hle/service/ssl_c.cpp b/src/core/hle/service/ssl/ssl_c.cpp similarity index 98% rename from src/core/hle/service/ssl_c.cpp rename to src/core/hle/service/ssl/ssl_c.cpp index 4eb41da173..df95a72aae 100644 --- a/src/core/hle/service/ssl_c.cpp +++ b/src/core/hle/service/ssl/ssl_c.cpp @@ -7,7 +7,7 @@ #include "core/core.h" #include "core/hle/ipc.h" #include "core/hle/ipc_helpers.h" -#include "core/hle/service/ssl_c.h" +#include "core/hle/service/ssl/ssl_c.h" SERIALIZE_EXPORT_IMPL(Service::SSL::SSL_C) namespace Service::SSL { diff --git a/src/core/hle/service/ssl_c.h b/src/core/hle/service/ssl/ssl_c.h similarity index 100% rename from src/core/hle/service/ssl_c.h rename to src/core/hle/service/ssl/ssl_c.h diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r/y2r_u.cpp similarity index 99% rename from src/core/hle/service/y2r_u.cpp rename to src/core/hle/service/y2r/y2r_u.cpp index 1cdab3ff52..f965cd2ea5 100644 --- a/src/core/hle/service/y2r_u.cpp +++ b/src/core/hle/service/y2r/y2r_u.cpp @@ -11,7 +11,7 @@ #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/event.h" #include "core/hle/kernel/process.h" -#include "core/hle/service/y2r_u.h" +#include "core/hle/service/y2r/y2r_u.h" #include "core/hw/y2r.h" SERVICE_CONSTRUCT_IMPL(Service::Y2R::Y2R_U) diff --git a/src/core/hle/service/y2r_u.h b/src/core/hle/service/y2r/y2r_u.h similarity index 100% rename from src/core/hle/service/y2r_u.h rename to src/core/hle/service/y2r/y2r_u.h diff --git a/src/core/hw/y2r.cpp b/src/core/hw/y2r.cpp index d6f7023f7c..804bb31716 100644 --- a/src/core/hw/y2r.cpp +++ b/src/core/hw/y2r.cpp @@ -12,7 +12,7 @@ #include "common/microprofileui.h" #include "common/vector_math.h" #include "core/core.h" -#include "core/hle/service/y2r_u.h" +#include "core/hle/service/y2r/y2r_u.h" #include "core/hw/y2r.h" #include "core/memory.h"