From 9572fb2ce3a9217345f3ed12e7411c4cb19fccc0 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sat, 22 Feb 2020 19:54:50 -0800 Subject: [PATCH] vapours: cleanup svc includes --- .../{ => impl}/svc_codegen_impl_code_generator.hpp | 2 +- .../codegen/{ => impl}/svc_codegen_impl_common.hpp | 0 .../svc_codegen_impl_kernel_svc_wrapper.hpp | 12 ++++++------ .../codegen/{ => impl}/svc_codegen_impl_layout.hpp | 4 ++-- .../svc_codegen_impl_layout_conversion.hpp | 8 ++++---- .../{ => impl}/svc_codegen_impl_meta_code.hpp | 2 +- .../{ => impl}/svc_codegen_impl_parameter.hpp | 2 +- .../svc/codegen/svc_codegen_kernel_svc_wrapper.hpp | 2 +- .../libvapours/include/vapours/svc/svc_codegen.hpp | 8 ++++---- .../include/vapours/svc/svc_definitions.hpp | 4 ++-- .../include/vapours/svc/svc_select_device_name.hpp | 4 ++-- .../vapours/svc/svc_select_hardware_constants.hpp | 4 ++-- .../libvapours/include/vapours/svc/svc_types.hpp | 14 +++++++------- .../include/vapours/svc/svc_types_base.hpp | 2 +- .../include/vapours/svc/svc_types_common.hpp | 5 ++--- .../include/vapours/svc/svc_types_dd.hpp | 6 +++--- .../include/vapours/svc/svc_types_dmnt.hpp | 2 +- .../include/vapours/svc/svc_types_priv.hpp | 2 +- 18 files changed, 41 insertions(+), 42 deletions(-) rename libraries/libvapours/include/vapours/svc/codegen/{ => impl}/svc_codegen_impl_code_generator.hpp (99%) rename libraries/libvapours/include/vapours/svc/codegen/{ => impl}/svc_codegen_impl_common.hpp (100%) rename libraries/libvapours/include/vapours/svc/codegen/{ => impl}/svc_codegen_impl_kernel_svc_wrapper.hpp (98%) rename libraries/libvapours/include/vapours/svc/codegen/{ => impl}/svc_codegen_impl_layout.hpp (99%) rename libraries/libvapours/include/vapours/svc/codegen/{ => impl}/svc_codegen_impl_layout_conversion.hpp (99%) rename libraries/libvapours/include/vapours/svc/codegen/{ => impl}/svc_codegen_impl_meta_code.hpp (99%) rename libraries/libvapours/include/vapours/svc/codegen/{ => impl}/svc_codegen_impl_parameter.hpp (99%) diff --git a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_code_generator.hpp b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_code_generator.hpp similarity index 99% rename from libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_code_generator.hpp rename to libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_code_generator.hpp index e435c7569..3cf0b73d4 100644 --- a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_code_generator.hpp +++ b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_code_generator.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #pragma once -#include "svc_codegen_impl_common.hpp" +#include namespace ams::svc::codegen::impl { diff --git a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_common.hpp b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_common.hpp similarity index 100% rename from libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_common.hpp rename to libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_common.hpp diff --git a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_kernel_svc_wrapper.hpp b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_kernel_svc_wrapper.hpp similarity index 98% rename from libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_kernel_svc_wrapper.hpp rename to libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_kernel_svc_wrapper.hpp index 58d45246b..44f11b441 100644 --- a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_kernel_svc_wrapper.hpp +++ b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_kernel_svc_wrapper.hpp @@ -14,12 +14,12 @@ * along with this program. If not, see . */ #pragma once -#include "svc_codegen_impl_common.hpp" -#include "svc_codegen_impl_parameter.hpp" -#include "svc_codegen_impl_layout.hpp" -#include "svc_codegen_impl_meta_code.hpp" -#include "svc_codegen_impl_layout_conversion.hpp" -#include "svc_codegen_impl_code_generator.hpp" +#include +#include +#include +#include +#include +#include namespace ams::svc::codegen::impl { diff --git a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_layout.hpp b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout.hpp similarity index 99% rename from libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_layout.hpp rename to libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout.hpp index 54ef0e020..1f4eb0f0c 100644 --- a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_layout.hpp +++ b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout.hpp @@ -14,8 +14,8 @@ * along with this program. If not, see . */ #pragma once -#include "svc_codegen_impl_common.hpp" -#include "svc_codegen_impl_parameter.hpp" +#include +#include namespace ams::svc::codegen::impl { diff --git a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_layout_conversion.hpp b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout_conversion.hpp similarity index 99% rename from libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_layout_conversion.hpp rename to libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout_conversion.hpp index d4abc7a18..bd0190c50 100644 --- a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_layout_conversion.hpp +++ b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout_conversion.hpp @@ -14,10 +14,10 @@ * along with this program. If not, see . */ #pragma once -#include "svc_codegen_impl_common.hpp" -#include "svc_codegen_impl_parameter.hpp" -#include "svc_codegen_impl_layout.hpp" -#include "svc_codegen_impl_meta_code.hpp" +#include +#include +#include +#include namespace ams::svc::codegen::impl { diff --git a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_meta_code.hpp b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_meta_code.hpp similarity index 99% rename from libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_meta_code.hpp rename to libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_meta_code.hpp index e7544702b..4b1b5d27f 100644 --- a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_meta_code.hpp +++ b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_meta_code.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #pragma once -#include "svc_codegen_impl_common.hpp" +#include namespace ams::svc::codegen::impl { diff --git a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_parameter.hpp b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_parameter.hpp similarity index 99% rename from libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_parameter.hpp rename to libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_parameter.hpp index 3f5d74526..76825f3e4 100644 --- a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_impl_parameter.hpp +++ b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_parameter.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #pragma once -#include "svc_codegen_impl_common.hpp" +#include namespace ams::svc::codegen::impl { diff --git a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_kernel_svc_wrapper.hpp b/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_kernel_svc_wrapper.hpp index beaf8d318..bce731284 100644 --- a/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_kernel_svc_wrapper.hpp +++ b/libraries/libvapours/include/vapours/svc/codegen/svc_codegen_kernel_svc_wrapper.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #pragma once -#include "svc_codegen_impl_kernel_svc_wrapper.hpp" +#include namespace ams::svc::codegen { diff --git a/libraries/libvapours/include/vapours/svc/svc_codegen.hpp b/libraries/libvapours/include/vapours/svc/svc_codegen.hpp index 4095a22a3..c2807f79f 100644 --- a/libraries/libvapours/include/vapours/svc/svc_codegen.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_codegen.hpp @@ -16,8 +16,8 @@ #pragma once /* NOTE: This header must not be included by svc.hpp. */ -#include "svc_common.hpp" -#include "svc_types.hpp" -#include "svc_definitions.hpp" +#include +#include +#include -#include "codegen/svc_codegen_kernel_svc_wrapper.hpp" +#include diff --git a/libraries/libvapours/include/vapours/svc/svc_definitions.hpp b/libraries/libvapours/include/vapours/svc/svc_definitions.hpp index fa305f536..dee20ba88 100644 --- a/libraries/libvapours/include/vapours/svc/svc_definitions.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_definitions.hpp @@ -15,8 +15,8 @@ */ #pragma once -#include "svc_common.hpp" -#include "svc_types.hpp" +#include +#include #define AMS_SVC_KERN_INPUT_HANDLER(TYPE, NAME) TYPE NAME #define AMS_SVC_KERN_OUTPUT_HANDLER(TYPE, NAME) TYPE *NAME diff --git a/libraries/libvapours/include/vapours/svc/svc_select_device_name.hpp b/libraries/libvapours/include/vapours/svc/svc_select_device_name.hpp index 31e91b351..5435c6b93 100644 --- a/libraries/libvapours/include/vapours/svc/svc_select_device_name.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_select_device_name.hpp @@ -15,11 +15,11 @@ */ #pragma once -#include "svc_common.hpp" +#include #if defined(ATMOSPHERE_BOARD_NINTENDO_NX) - #include "board/nintendo/nx/svc_device_name.hpp" + #include namespace ams::svc { using namespace ams::svc::board::nintendo::nx; } diff --git a/libraries/libvapours/include/vapours/svc/svc_select_hardware_constants.hpp b/libraries/libvapours/include/vapours/svc/svc_select_hardware_constants.hpp index 5ab60ee5d..98d2a0a83 100644 --- a/libraries/libvapours/include/vapours/svc/svc_select_hardware_constants.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_select_hardware_constants.hpp @@ -15,11 +15,11 @@ */ #pragma once -#include "svc_common.hpp" +#include #if defined(ATMOSPHERE_BOARD_NINTENDO_NX) - #include "board/nintendo/nx/svc_hardware_constants.hpp" + #include namespace ams::svc { using namespace ams::svc::board::nintendo::nx; } diff --git a/libraries/libvapours/include/vapours/svc/svc_types.hpp b/libraries/libvapours/include/vapours/svc/svc_types.hpp index 078172c16..9b3397431 100644 --- a/libraries/libvapours/include/vapours/svc/svc_types.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_types.hpp @@ -15,10 +15,10 @@ */ #pragma once -#include "svc_common.hpp" -#include "svc_tick.hpp" -#include "svc_types_common.hpp" -#include "svc_types_base.hpp" -#include "svc_types_dd.hpp" -#include "svc_types_dmnt.hpp" -#include "svc_types_priv.hpp" +#include +#include +#include +#include +#include +#include +#include diff --git a/libraries/libvapours/include/vapours/svc/svc_types_base.hpp b/libraries/libvapours/include/vapours/svc/svc_types_base.hpp index b0b8ebdeb..e143bd936 100644 --- a/libraries/libvapours/include/vapours/svc/svc_types_base.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_types_base.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #pragma once -#include "svc_types_common.hpp" +#include namespace ams::svc { diff --git a/libraries/libvapours/include/vapours/svc/svc_types_common.hpp b/libraries/libvapours/include/vapours/svc/svc_types_common.hpp index e10c313de..14a4db6ce 100644 --- a/libraries/libvapours/include/vapours/svc/svc_types_common.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_types_common.hpp @@ -13,9 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include "svc_common.hpp" +#include namespace ams::kern::svc::impl { @@ -240,7 +239,7 @@ namespace ams::svc { static_assert(sizeof(ThreadContext) == 0x320); #else - #error "Unknown Architecture for ams::svc::ThreadContext" + #error >Unknown Architecture for ams::svc::ThreadContext> #endif enum ThreadSuspend : u32 { diff --git a/libraries/libvapours/include/vapours/svc/svc_types_dd.hpp b/libraries/libvapours/include/vapours/svc/svc_types_dd.hpp index 2a2529496..e6b76979f 100644 --- a/libraries/libvapours/include/vapours/svc/svc_types_dd.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_types_dd.hpp @@ -14,9 +14,9 @@ * along with this program. If not, see . */ #pragma once -#include "svc_types_common.hpp" -#include "svc_select_hardware_constants.hpp" -#include "svc_select_device_name.hpp" +#include +#include +#include namespace ams::svc { diff --git a/libraries/libvapours/include/vapours/svc/svc_types_dmnt.hpp b/libraries/libvapours/include/vapours/svc/svc_types_dmnt.hpp index 057bd6e64..da6145392 100644 --- a/libraries/libvapours/include/vapours/svc/svc_types_dmnt.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_types_dmnt.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #pragma once -#include "svc_types_common.hpp" +#include namespace ams::svc { diff --git a/libraries/libvapours/include/vapours/svc/svc_types_priv.hpp b/libraries/libvapours/include/vapours/svc/svc_types_priv.hpp index af431861e..f6da8637b 100644 --- a/libraries/libvapours/include/vapours/svc/svc_types_priv.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_types_priv.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #pragma once -#include "svc_types_common.hpp" +#include namespace ams::svc {