From eafaa5511d5aaafebd595fe12f7400aad475a452 Mon Sep 17 00:00:00 2001 From: Liam Date: Sun, 11 Feb 2024 19:41:53 -0500 Subject: [PATCH] am: move IDebugFunctions --- src/core/CMakeLists.txt | 4 ++-- src/core/hle/service/am/service/application_proxy.cpp | 2 +- src/core/hle/service/am/{ => service}/debug_functions.cpp | 3 +-- src/core/hle/service/am/{ => service}/debug_functions.h | 0 src/core/hle/service/am/service/library_applet_proxy.cpp | 2 +- src/core/hle/service/am/service/system_applet_proxy.cpp | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) rename src/core/hle/service/am/{ => service}/debug_functions.cpp (95%) rename src/core/hle/service/am/{ => service}/debug_functions.h (100%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 781be7c105..ad9831979d 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -425,8 +425,6 @@ add_library(core STATIC hle/service/am/applet_message_queue.h hle/service/am/application_creator.cpp hle/service/am/application_creator.h - hle/service/am/debug_functions.cpp - hle/service/am/debug_functions.h hle/service/am/display_controller.cpp hle/service/am/display_controller.h hle/service/am/global_state_controller.cpp @@ -471,6 +469,8 @@ add_library(core STATIC hle/service/am/service/audio_controller.h hle/service/am/service/common_state_getter.cpp hle/service/am/service/common_state_getter.h + hle/service/am/service/debug_functions.cpp + hle/service/am/service/debug_functions.h hle/service/am/service/library_applet_proxy.cpp hle/service/am/service/library_applet_proxy.h hle/service/am/service/system_applet_proxy.cpp diff --git a/src/core/hle/service/am/service/application_proxy.cpp b/src/core/hle/service/am/service/application_proxy.cpp index 2d46299e01..6cd6df2d00 100644 --- a/src/core/hle/service/am/service/application_proxy.cpp +++ b/src/core/hle/service/am/service/application_proxy.cpp @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/am/debug_functions.h" #include "core/hle/service/am/display_controller.h" #include "core/hle/service/am/library_applet_creator.h" #include "core/hle/service/am/library_applet_self_accessor.h" @@ -12,6 +11,7 @@ #include "core/hle/service/am/service/application_proxy.h" #include "core/hle/service/am/service/audio_controller.h" #include "core/hle/service/am/service/common_state_getter.h" +#include "core/hle/service/am/service/debug_functions.h" #include "core/hle/service/am/window_controller.h" #include "core/hle/service/cmif_serialization.h" diff --git a/src/core/hle/service/am/debug_functions.cpp b/src/core/hle/service/am/service/debug_functions.cpp similarity index 95% rename from src/core/hle/service/am/debug_functions.cpp rename to src/core/hle/service/am/service/debug_functions.cpp index f80b970f2d..fcac4776db 100644 --- a/src/core/hle/service/am/debug_functions.cpp +++ b/src/core/hle/service/am/service/debug_functions.cpp @@ -1,8 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/am/debug_functions.h" -#include "core/hle/service/ipc_helpers.h" +#include "core/hle/service/am/service/debug_functions.h" namespace Service::AM { diff --git a/src/core/hle/service/am/debug_functions.h b/src/core/hle/service/am/service/debug_functions.h similarity index 100% rename from src/core/hle/service/am/debug_functions.h rename to src/core/hle/service/am/service/debug_functions.h diff --git a/src/core/hle/service/am/service/library_applet_proxy.cpp b/src/core/hle/service/am/service/library_applet_proxy.cpp index 28886b0c35..d609871fb5 100644 --- a/src/core/hle/service/am/service/library_applet_proxy.cpp +++ b/src/core/hle/service/am/service/library_applet_proxy.cpp @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/am/debug_functions.h" #include "core/hle/service/am/display_controller.h" #include "core/hle/service/am/global_state_controller.h" #include "core/hle/service/am/home_menu_functions.h" @@ -12,6 +11,7 @@ #include "core/hle/service/am/service/applet_common_functions.h" #include "core/hle/service/am/service/audio_controller.h" #include "core/hle/service/am/service/common_state_getter.h" +#include "core/hle/service/am/service/debug_functions.h" #include "core/hle/service/am/service/library_applet_proxy.h" #include "core/hle/service/am/window_controller.h" #include "core/hle/service/cmif_serialization.h" diff --git a/src/core/hle/service/am/service/system_applet_proxy.cpp b/src/core/hle/service/am/service/system_applet_proxy.cpp index ea23bef94a..d4ebe3ae0e 100644 --- a/src/core/hle/service/am/service/system_applet_proxy.cpp +++ b/src/core/hle/service/am/service/system_applet_proxy.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hle/service/am/application_creator.h" -#include "core/hle/service/am/debug_functions.h" #include "core/hle/service/am/display_controller.h" #include "core/hle/service/am/global_state_controller.h" #include "core/hle/service/am/home_menu_functions.h" @@ -13,6 +12,7 @@ #include "core/hle/service/am/service/applet_common_functions.h" #include "core/hle/service/am/service/audio_controller.h" #include "core/hle/service/am/service/common_state_getter.h" +#include "core/hle/service/am/service/debug_functions.h" #include "core/hle/service/am/service/system_applet_proxy.h" #include "core/hle/service/am/window_controller.h" #include "core/hle/service/cmif_serialization.h"