diff --git a/common/include/atmosphere/version.h b/common/include/atmosphere/version.h index c47cb778a..c61e87ec9 100644 --- a/common/include/atmosphere/version.h +++ b/common/include/atmosphere/version.h @@ -23,6 +23,6 @@ #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MAJOR 9 #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MINOR 0 -#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MICRO 0 +#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MICRO 1 #endif \ No newline at end of file diff --git a/stratosphere/boot/source/boot_battery_driver.cpp b/stratosphere/boot/source/boot_battery_driver.cpp index 6c88101d2..5404e581f 100644 --- a/stratosphere/boot/source/boot_battery_driver.cpp +++ b/stratosphere/boot/source/boot_battery_driver.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "boot_battery_driver.hpp" #include "boot_calibration.hpp" #include "boot_i2c_utils.hpp" diff --git a/stratosphere/boot/source/boot_battery_driver.hpp b/stratosphere/boot/source/boot_battery_driver.hpp index 58e890234..e16b37f60 100644 --- a/stratosphere/boot/source/boot_battery_driver.hpp +++ b/stratosphere/boot/source/boot_battery_driver.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "i2c/driver/i2c_api.hpp" namespace ams::boot { diff --git a/stratosphere/boot/source/boot_battery_icons.cpp b/stratosphere/boot/source/boot_battery_icons.cpp index d4cc6d5ae..64a9068e0 100644 --- a/stratosphere/boot/source/boot_battery_icons.cpp +++ b/stratosphere/boot/source/boot_battery_icons.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "boot_battery_icons.hpp" #include "boot_display.hpp" diff --git a/stratosphere/boot/source/boot_battery_icons.hpp b/stratosphere/boot/source/boot_battery_icons.hpp index ca5254bbe..12e23fed4 100644 --- a/stratosphere/boot/source/boot_battery_icons.hpp +++ b/stratosphere/boot/source/boot_battery_icons.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_boot_reason.cpp b/stratosphere/boot/source/boot_boot_reason.cpp index 3aac96e67..41ac67dce 100644 --- a/stratosphere/boot/source/boot_boot_reason.cpp +++ b/stratosphere/boot/source/boot_boot_reason.cpp @@ -13,9 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include - #include "boot_boot_reason.hpp" #include "boot_pmic_driver.hpp" #include "boot_rtc_driver.hpp" diff --git a/stratosphere/boot/source/boot_boot_reason.hpp b/stratosphere/boot/source/boot_boot_reason.hpp index 476eb14c6..016dac64f 100644 --- a/stratosphere/boot/source/boot_boot_reason.hpp +++ b/stratosphere/boot/source/boot_boot_reason.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_bq24193_charger.hpp b/stratosphere/boot/source/boot_bq24193_charger.hpp index c5fd7ba70..f20913449 100644 --- a/stratosphere/boot/source/boot_bq24193_charger.hpp +++ b/stratosphere/boot/source/boot_bq24193_charger.hpp @@ -13,6 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#pragma once +#include namespace ams::boot::bq24193 { diff --git a/stratosphere/boot/source/boot_calibration.cpp b/stratosphere/boot/source/boot_calibration.cpp index 839001e60..b6e1068c4 100644 --- a/stratosphere/boot/source/boot_calibration.cpp +++ b/stratosphere/boot/source/boot_calibration.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "boot_calibration.hpp" namespace ams::boot { diff --git a/stratosphere/boot/source/boot_calibration.hpp b/stratosphere/boot/source/boot_calibration.hpp index 0b53fd035..21805c189 100644 --- a/stratosphere/boot/source/boot_calibration.hpp +++ b/stratosphere/boot/source/boot_calibration.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_change_voltage.cpp b/stratosphere/boot/source/boot_change_voltage.cpp index 553c2344b..f7245e5f4 100644 --- a/stratosphere/boot/source/boot_change_voltage.cpp +++ b/stratosphere/boot/source/boot_change_voltage.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "boot_change_voltage.hpp" #include "boot_pmc_wrapper.hpp" diff --git a/stratosphere/boot/source/boot_change_voltage.hpp b/stratosphere/boot/source/boot_change_voltage.hpp index c5c6a1f7a..dad0bdef8 100644 --- a/stratosphere/boot/source/boot_change_voltage.hpp +++ b/stratosphere/boot/source/boot_change_voltage.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_charger_driver.cpp b/stratosphere/boot/source/boot_charger_driver.cpp index 402fe0aa0..26cd42519 100644 --- a/stratosphere/boot/source/boot_charger_driver.cpp +++ b/stratosphere/boot/source/boot_charger_driver.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "boot_charger_driver.hpp" namespace ams::boot { diff --git a/stratosphere/boot/source/boot_charger_driver.hpp b/stratosphere/boot/source/boot_charger_driver.hpp index d770ce0e9..a6cf824ce 100644 --- a/stratosphere/boot/source/boot_charger_driver.hpp +++ b/stratosphere/boot/source/boot_charger_driver.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "boot_bq24193_charger.hpp" #include "boot_i2c_utils.hpp" diff --git a/stratosphere/boot/source/boot_check_battery.cpp b/stratosphere/boot/source/boot_check_battery.cpp index e47c37a6d..12691dfe4 100644 --- a/stratosphere/boot/source/boot_check_battery.cpp +++ b/stratosphere/boot/source/boot_check_battery.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "boot_battery_driver.hpp" #include "boot_battery_icons.hpp" #include "boot_boot_reason.hpp" diff --git a/stratosphere/boot/source/boot_check_battery.hpp b/stratosphere/boot/source/boot_check_battery.hpp index 63be38e69..32cc5da2b 100644 --- a/stratosphere/boot/source/boot_check_battery.hpp +++ b/stratosphere/boot/source/boot_check_battery.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_check_clock.cpp b/stratosphere/boot/source/boot_check_clock.cpp index f5f536576..b80796293 100644 --- a/stratosphere/boot/source/boot_check_clock.cpp +++ b/stratosphere/boot/source/boot_check_clock.cpp @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include "boot_check_clock.hpp" #include "boot_power_utils.hpp" diff --git a/stratosphere/boot/source/boot_check_clock.hpp b/stratosphere/boot/source/boot_check_clock.hpp index 5fea378d8..fe3516a2f 100644 --- a/stratosphere/boot/source/boot_check_clock.hpp +++ b/stratosphere/boot/source/boot_check_clock.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_clock_initial_configuration.cpp b/stratosphere/boot/source/boot_clock_initial_configuration.cpp index 043e4f207..d171b4593 100644 --- a/stratosphere/boot/source/boot_clock_initial_configuration.cpp +++ b/stratosphere/boot/source/boot_clock_initial_configuration.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "boot_clock_initial_configuration.hpp" #include "boot_pmc_wrapper.hpp" #include "boot_registers_pmc.hpp" diff --git a/stratosphere/boot/source/boot_clock_initial_configuration.hpp b/stratosphere/boot/source/boot_clock_initial_configuration.hpp index 660d6c1e7..a1f87ac67 100644 --- a/stratosphere/boot/source/boot_clock_initial_configuration.hpp +++ b/stratosphere/boot/source/boot_clock_initial_configuration.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_display.cpp b/stratosphere/boot/source/boot_display.cpp index 8418f3ae6..8b3f4728f 100644 --- a/stratosphere/boot/source/boot_display.cpp +++ b/stratosphere/boot/source/boot_display.cpp @@ -13,11 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - - -#include -#include - #include "boot_display.hpp" #include "boot_i2c_utils.hpp" #include "boot_pmc_wrapper.hpp" diff --git a/stratosphere/boot/source/boot_display.hpp b/stratosphere/boot/source/boot_display.hpp index a01450abc..6da8bfabe 100644 --- a/stratosphere/boot/source/boot_display.hpp +++ b/stratosphere/boot/source/boot_display.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_fan_enable.cpp b/stratosphere/boot/source/boot_fan_enable.cpp index 0fd2b38df..f1a9613b9 100644 --- a/stratosphere/boot/source/boot_fan_enable.cpp +++ b/stratosphere/boot/source/boot_fan_enable.cpp @@ -13,9 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include - #include "boot_fan_enable.hpp" #include "gpio/gpio_utils.hpp" diff --git a/stratosphere/boot/source/boot_fan_enable.hpp b/stratosphere/boot/source/boot_fan_enable.hpp index 05dc983f5..1610c8c6a 100644 --- a/stratosphere/boot/source/boot_fan_enable.hpp +++ b/stratosphere/boot/source/boot_fan_enable.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_i2c_utils.cpp b/stratosphere/boot/source/boot_i2c_utils.cpp index a7adaee0b..e395f86b6 100644 --- a/stratosphere/boot/source/boot_i2c_utils.cpp +++ b/stratosphere/boot/source/boot_i2c_utils.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "boot_i2c_utils.hpp" namespace ams::boot { diff --git a/stratosphere/boot/source/boot_i2c_utils.hpp b/stratosphere/boot/source/boot_i2c_utils.hpp index 6f617e9b7..12f2cf6ac 100644 --- a/stratosphere/boot/source/boot_i2c_utils.hpp +++ b/stratosphere/boot/source/boot_i2c_utils.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include #include "i2c/driver/i2c_api.hpp" diff --git a/stratosphere/boot/source/boot_main.cpp b/stratosphere/boot/source/boot_main.cpp index 125b7cd38..4d0505b0e 100644 --- a/stratosphere/boot/source/boot_main.cpp +++ b/stratosphere/boot/source/boot_main.cpp @@ -13,17 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include - -#include -#include -#include -#include - #include "boot_boot_reason.hpp" #include "boot_change_voltage.hpp" #include "boot_check_battery.hpp" diff --git a/stratosphere/boot/source/boot_pcv.cpp b/stratosphere/boot/source/boot_pcv.cpp index fa9380a2c..50a912ab8 100644 --- a/stratosphere/boot/source/boot_pcv.cpp +++ b/stratosphere/boot/source/boot_pcv.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "i2c/i2c_types.hpp" #include "i2c/driver/impl/i2c_pcv.hpp" #include "i2c/driver/impl/i2c_registers.hpp" diff --git a/stratosphere/boot/source/boot_pmc_wrapper.cpp b/stratosphere/boot/source/boot_pmc_wrapper.cpp index 4b3058d69..2f1745ae9 100644 --- a/stratosphere/boot/source/boot_pmc_wrapper.cpp +++ b/stratosphere/boot/source/boot_pmc_wrapper.cpp @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include #include "boot_pmc_wrapper.hpp" namespace ams::boot { diff --git a/stratosphere/boot/source/boot_pmc_wrapper.hpp b/stratosphere/boot/source/boot_pmc_wrapper.hpp index 8d25622a7..5a5953dde 100644 --- a/stratosphere/boot/source/boot_pmc_wrapper.hpp +++ b/stratosphere/boot/source/boot_pmc_wrapper.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_pmic_driver.cpp b/stratosphere/boot/source/boot_pmic_driver.cpp index afa098dc0..bf1411198 100644 --- a/stratosphere/boot/source/boot_pmic_driver.cpp +++ b/stratosphere/boot/source/boot_pmic_driver.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "boot_i2c_utils.hpp" #include "boot_pmic_driver.hpp" diff --git a/stratosphere/boot/source/boot_pmic_driver.hpp b/stratosphere/boot/source/boot_pmic_driver.hpp index 8ff07e8b9..06d761020 100644 --- a/stratosphere/boot/source/boot_pmic_driver.hpp +++ b/stratosphere/boot/source/boot_pmic_driver.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "boot_battery_driver.hpp" namespace ams::boot { diff --git a/stratosphere/boot/source/boot_power_utils.cpp b/stratosphere/boot/source/boot_power_utils.cpp index dfa9074cc..7fd38c3ee 100644 --- a/stratosphere/boot/source/boot_power_utils.cpp +++ b/stratosphere/boot/source/boot_power_utils.cpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - +#pragma once #include "boot_power_utils.hpp" #include "fusee-primary_bin.h" diff --git a/stratosphere/boot/source/boot_power_utils.hpp b/stratosphere/boot/source/boot_power_utils.hpp index 31a59b80f..a53ea3a93 100644 --- a/stratosphere/boot/source/boot_power_utils.hpp +++ b/stratosphere/boot/source/boot_power_utils.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_registers_clkrst.hpp b/stratosphere/boot/source/boot_registers_clkrst.hpp index daebdc753..718575752 100644 --- a/stratosphere/boot/source/boot_registers_clkrst.hpp +++ b/stratosphere/boot/source/boot_registers_clkrst.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 +#include static constexpr size_t CLK_RST_CONTROLLER_RST_SOURCE = 0x0; static constexpr size_t CLK_RST_CONTROLLER_RST_DEVICES_L = 0x4; diff --git a/stratosphere/boot/source/boot_registers_di.hpp b/stratosphere/boot/source/boot_registers_di.hpp index 3b5a13b95..aa8dd1d49 100644 --- a/stratosphere/boot/source/boot_registers_di.hpp +++ b/stratosphere/boot/source/boot_registers_di.hpp @@ -15,9 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include +#include #define DC_CMD_GENERAL_INCR_SYNCPT 0x00 diff --git a/stratosphere/boot/source/boot_registers_gpio.hpp b/stratosphere/boot/source/boot_registers_gpio.hpp index c9ce3830f..594d86afd 100644 --- a/stratosphere/boot/source/boot_registers_gpio.hpp +++ b/stratosphere/boot/source/boot_registers_gpio.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 +#include static constexpr size_t GPIO_PORT3_CNF_0 = 0x200; static constexpr size_t GPIO_PORT3_OE_0 = 0x210; diff --git a/stratosphere/boot/source/boot_registers_pinmux.hpp b/stratosphere/boot/source/boot_registers_pinmux.hpp index 322195ca7..df83cf22b 100644 --- a/stratosphere/boot/source/boot_registers_pinmux.hpp +++ b/stratosphere/boot/source/boot_registers_pinmux.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 +#include static constexpr size_t APB_MISC_GP_SDMMC1_CLK_LPBK_CONTROL = 0x8D4; static constexpr size_t APB_MISC_GP_SDMMC3_CLK_LPBK_CONTROL = 0x8D8; diff --git a/stratosphere/boot/source/boot_registers_pmc.hpp b/stratosphere/boot/source/boot_registers_pmc.hpp index e95acc1c1..86ab915e5 100644 --- a/stratosphere/boot/source/boot_registers_pmc.hpp +++ b/stratosphere/boot/source/boot_registers_pmc.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 +#include static constexpr uintptr_t PmcBase = 0x7000E400ul; diff --git a/stratosphere/boot/source/boot_repair_boot_images.cpp b/stratosphere/boot/source/boot_repair_boot_images.cpp index 5323910e3..95bf67ff5 100644 --- a/stratosphere/boot/source/boot_repair_boot_images.cpp +++ b/stratosphere/boot/source/boot_repair_boot_images.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "boot_power_utils.hpp" #include "boot_repair_boot_images.hpp" diff --git a/stratosphere/boot/source/boot_repair_boot_images.hpp b/stratosphere/boot/source/boot_repair_boot_images.hpp index 7b53ed2e6..3a973e175 100644 --- a/stratosphere/boot/source/boot_repair_boot_images.hpp +++ b/stratosphere/boot/source/boot_repair_boot_images.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_rtc_driver.cpp b/stratosphere/boot/source/boot_rtc_driver.cpp index 932a70184..d5c4bd2df 100644 --- a/stratosphere/boot/source/boot_rtc_driver.cpp +++ b/stratosphere/boot/source/boot_rtc_driver.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "boot_rtc_driver.hpp" namespace ams::boot { diff --git a/stratosphere/boot/source/boot_rtc_driver.hpp b/stratosphere/boot/source/boot_rtc_driver.hpp index 740a49e10..1a9bb453a 100644 --- a/stratosphere/boot/source/boot_rtc_driver.hpp +++ b/stratosphere/boot/source/boot_rtc_driver.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "boot_i2c_utils.hpp" namespace ams::boot { diff --git a/stratosphere/boot/source/boot_splash_screen.cpp b/stratosphere/boot/source/boot_splash_screen.cpp index 786b74da8..4710f0e09 100644 --- a/stratosphere/boot/source/boot_splash_screen.cpp +++ b/stratosphere/boot/source/boot_splash_screen.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "boot_boot_reason.hpp" #include "boot_display.hpp" #include "boot_splash_screen.hpp" diff --git a/stratosphere/boot/source/boot_splash_screen.hpp b/stratosphere/boot/source/boot_splash_screen.hpp index a357141dc..aae537987 100644 --- a/stratosphere/boot/source/boot_splash_screen.hpp +++ b/stratosphere/boot/source/boot_splash_screen.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/boot_wake_pins.cpp b/stratosphere/boot/source/boot_wake_pins.cpp index f4cebbd8e..952536705 100644 --- a/stratosphere/boot/source/boot_wake_pins.cpp +++ b/stratosphere/boot/source/boot_wake_pins.cpp @@ -13,9 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include - #include "boot_pmc_wrapper.hpp" #include "boot_wake_pins.hpp" diff --git a/stratosphere/boot/source/boot_wake_pins.hpp b/stratosphere/boot/source/boot_wake_pins.hpp index 92e7b72f1..e771b5109 100644 --- a/stratosphere/boot/source/boot_wake_pins.hpp +++ b/stratosphere/boot/source/boot_wake_pins.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::boot { diff --git a/stratosphere/boot/source/i2c/driver/i2c_api.cpp b/stratosphere/boot/source/i2c/driver/i2c_api.cpp index 74b732169..2261a62d9 100644 --- a/stratosphere/boot/source/i2c/driver/i2c_api.cpp +++ b/stratosphere/boot/source/i2c/driver/i2c_api.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "i2c_api.hpp" #include "impl/i2c_resource_manager.hpp" diff --git a/stratosphere/boot/source/i2c/driver/i2c_api.hpp b/stratosphere/boot/source/i2c/driver/i2c_api.hpp index 2b8e1dd02..1449f7257 100644 --- a/stratosphere/boot/source/i2c/driver/i2c_api.hpp +++ b/stratosphere/boot/source/i2c/driver/i2c_api.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "../i2c_types.hpp" #include "../i2c_command_list.hpp" diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp b/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp index 2b590abbf..6bf8e94fb 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "i2c_pcv.hpp" #include "i2c_bus_accessor.hpp" diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.hpp b/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.hpp index 3595867d5..8a23a7424 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.hpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_bus_accessor.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "i2c_driver_types.hpp" #include "i2c_registers.hpp" diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_device_config.cpp b/stratosphere/boot/source/i2c/driver/impl/i2c_device_config.cpp index 584a00c0a..8759c40db 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_device_config.cpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_device_config.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "i2c_driver_types.hpp" namespace ams::i2c::driver::impl { diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_driver_types.hpp b/stratosphere/boot/source/i2c/driver/impl/i2c_driver_types.hpp index c80695fba..12441af57 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_driver_types.hpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_driver_types.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "../../i2c_types.hpp" namespace ams::i2c::driver::impl { diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_pcv.hpp b/stratosphere/boot/source/i2c/driver/impl/i2c_pcv.hpp index fc0db11c1..8143afcaa 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_pcv.hpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_pcv.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include /* This forward declares the functionality from pcv that i2c::driver uses. */ diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_registers.hpp b/stratosphere/boot/source/i2c/driver/impl/i2c_registers.hpp index 255e48ba7..c699cd955 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_registers.hpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_registers.hpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include - #include "i2c_driver_types.hpp" namespace ams::i2c::driver::impl { diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.cpp b/stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.cpp index 03648925b..70f7ca7f8 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.cpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "i2c_pcv.hpp" #include "i2c_resource_manager.hpp" diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.hpp b/stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.hpp index ba8110098..a41976674 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.hpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_resource_manager.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "../i2c_api.hpp" #include "i2c_driver_types.hpp" #include "i2c_bus_accessor.hpp" diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_session.cpp b/stratosphere/boot/source/i2c/driver/impl/i2c_session.cpp index f0e194131..1ef4a4aff 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_session.cpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_session.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "i2c_session.hpp" namespace ams::i2c::driver::impl { diff --git a/stratosphere/boot/source/i2c/driver/impl/i2c_session.hpp b/stratosphere/boot/source/i2c/driver/impl/i2c_session.hpp index 49e58ad8e..9ba64c92f 100644 --- a/stratosphere/boot/source/i2c/driver/impl/i2c_session.hpp +++ b/stratosphere/boot/source/i2c/driver/impl/i2c_session.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "i2c_driver_types.hpp" #include "i2c_bus_accessor.hpp" diff --git a/stratosphere/boot/source/i2c/i2c_command_list.cpp b/stratosphere/boot/source/i2c/i2c_command_list.cpp index 16a874c8a..044ec79da 100644 --- a/stratosphere/boot/source/i2c/i2c_command_list.cpp +++ b/stratosphere/boot/source/i2c/i2c_command_list.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "i2c_types.hpp" #include "i2c_command_list.hpp" diff --git a/stratosphere/boot/source/i2c/i2c_command_list.hpp b/stratosphere/boot/source/i2c/i2c_command_list.hpp index de1c475cf..687220682 100644 --- a/stratosphere/boot/source/i2c/i2c_command_list.hpp +++ b/stratosphere/boot/source/i2c/i2c_command_list.hpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include - #include "i2c_types.hpp" namespace ams::i2c { diff --git a/stratosphere/boot/source/i2c/i2c_types.hpp b/stratosphere/boot/source/i2c/i2c_types.hpp index a64f8b470..d03c3f822 100644 --- a/stratosphere/boot/source/i2c/i2c_types.hpp +++ b/stratosphere/boot/source/i2c/i2c_types.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::i2c { diff --git a/stratosphere/boot/source/pinmux/pinmux_initial_configuration.cpp b/stratosphere/boot/source/pinmux/pinmux_initial_configuration.cpp index 13a1550e4..462e69fe7 100644 --- a/stratosphere/boot/source/pinmux/pinmux_initial_configuration.cpp +++ b/stratosphere/boot/source/pinmux/pinmux_initial_configuration.cpp @@ -13,9 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include - #include "pinmux_initial_configuration.hpp" #include "pinmux_utils.hpp" diff --git a/stratosphere/boot/source/pinmux/pinmux_initial_configuration.hpp b/stratosphere/boot/source/pinmux/pinmux_initial_configuration.hpp index 814d02f91..239f5bdeb 100644 --- a/stratosphere/boot/source/pinmux/pinmux_initial_configuration.hpp +++ b/stratosphere/boot/source/pinmux/pinmux_initial_configuration.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::pinmux { diff --git a/stratosphere/boot/source/pinmux/pinmux_utils.cpp b/stratosphere/boot/source/pinmux/pinmux_utils.cpp index d140bf5e3..39404df6e 100644 --- a/stratosphere/boot/source/pinmux/pinmux_utils.cpp +++ b/stratosphere/boot/source/pinmux/pinmux_utils.cpp @@ -13,9 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include - #include "pinmux_utils.hpp" namespace ams::pinmux { diff --git a/stratosphere/boot/source/pinmux/pinmux_utils.hpp b/stratosphere/boot/source/pinmux/pinmux_utils.hpp index 9f0eac9b0..6e12d4f46 100644 --- a/stratosphere/boot/source/pinmux/pinmux_utils.hpp +++ b/stratosphere/boot/source/pinmux/pinmux_utils.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::pinmux { diff --git a/stratosphere/boot2/source/boot2_main.cpp b/stratosphere/boot2/source/boot2_main.cpp index f4b6748f1..481aca82d 100644 --- a/stratosphere/boot2/source/boot2_main.cpp +++ b/stratosphere/boot2/source/boot2_main.cpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include #include -#include extern "C" { extern u32 __start__; diff --git a/stratosphere/creport/source/creport_crash_report.cpp b/stratosphere/creport/source/creport_crash_report.cpp index e65f61ff8..0314ecb2b 100644 --- a/stratosphere/creport/source/creport_crash_report.cpp +++ b/stratosphere/creport/source/creport_crash_report.cpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - - #include #include - #include "creport_crash_report.hpp" #include "creport_utils.hpp" diff --git a/stratosphere/creport/source/creport_crash_report.hpp b/stratosphere/creport/source/creport_crash_report.hpp index 42ad93209..03f13bc0d 100644 --- a/stratosphere/creport/source/creport_crash_report.hpp +++ b/stratosphere/creport/source/creport_crash_report.hpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include - #include "creport_threads.hpp" #include "creport_modules.hpp" diff --git a/stratosphere/creport/source/creport_main.cpp b/stratosphere/creport/source/creport_main.cpp index 7f902acd7..1f87dfcba 100644 --- a/stratosphere/creport/source/creport_main.cpp +++ b/stratosphere/creport/source/creport_main.cpp @@ -13,14 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include - -#include -#include #include "creport_crash_report.hpp" #include "creport_utils.hpp" diff --git a/stratosphere/creport/source/creport_modules.cpp b/stratosphere/creport/source/creport_modules.cpp index 3e3665fcf..6997c862d 100644 --- a/stratosphere/creport/source/creport_modules.cpp +++ b/stratosphere/creport/source/creport_modules.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "creport_modules.hpp" #include "creport_utils.hpp" diff --git a/stratosphere/creport/source/creport_modules.hpp b/stratosphere/creport/source/creport_modules.hpp index 9a6ff9f4f..e5c0fb15b 100644 --- a/stratosphere/creport/source/creport_modules.hpp +++ b/stratosphere/creport/source/creport_modules.hpp @@ -13,10 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include #include "creport_threads.hpp" namespace ams::creport { diff --git a/stratosphere/creport/source/creport_threads.cpp b/stratosphere/creport/source/creport_threads.cpp index 2570de53c..0fb39a660 100644 --- a/stratosphere/creport/source/creport_threads.cpp +++ b/stratosphere/creport/source/creport_threads.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "creport_threads.hpp" #include "creport_modules.hpp" diff --git a/stratosphere/creport/source/creport_threads.hpp b/stratosphere/creport/source/creport_threads.hpp index 91700905a..ae87f4e94 100644 --- a/stratosphere/creport/source/creport_threads.hpp +++ b/stratosphere/creport/source/creport_threads.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::creport { diff --git a/stratosphere/creport/source/creport_utils.cpp b/stratosphere/creport/source/creport_utils.cpp index ed0ea682b..ad5191fad 100644 --- a/stratosphere/creport/source/creport_utils.cpp +++ b/stratosphere/creport/source/creport_utils.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "creport_utils.hpp" namespace ams::creport { diff --git a/stratosphere/creport/source/creport_utils.hpp b/stratosphere/creport/source/creport_utils.hpp index b67597208..512bae3c2 100644 --- a/stratosphere/creport/source/creport_utils.hpp +++ b/stratosphere/creport/source/creport_utils.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::creport { diff --git a/stratosphere/dmnt/source/cheat/dmnt_cheat_service.cpp b/stratosphere/dmnt/source/cheat/dmnt_cheat_service.cpp index 2de80e3e0..c51033c98 100644 --- a/stratosphere/dmnt/source/cheat/dmnt_cheat_service.cpp +++ b/stratosphere/dmnt/source/cheat/dmnt_cheat_service.cpp @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include "dmnt_cheat_service.hpp" #include "impl/dmnt_cheat_api.hpp" diff --git a/stratosphere/dmnt/source/cheat/dmnt_cheat_service.hpp b/stratosphere/dmnt/source/cheat/dmnt_cheat_service.hpp index 18f969d37..a453bfb01 100644 --- a/stratosphere/dmnt/source/cheat/dmnt_cheat_service.hpp +++ b/stratosphere/dmnt/source/cheat/dmnt_cheat_service.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::dmnt::cheat { diff --git a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.cpp b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.cpp index fc188cd8b..dea846226 100644 --- a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.cpp +++ b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.cpp @@ -13,12 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include "dmnt_cheat_api.hpp" #include "dmnt_cheat_vm.hpp" #include "dmnt_cheat_debug_events_manager.hpp" -#include namespace ams::dmnt::cheat::impl { diff --git a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.hpp b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.hpp index 1fdc447c0..bab10a8fa 100644 --- a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.hpp +++ b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_api.hpp @@ -13,10 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include -#include namespace ams::dmnt::cheat::impl { diff --git a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.cpp b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.cpp index 696794962..5c1d3b941 100644 --- a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.cpp +++ b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "dmnt_cheat_debug_events_manager.hpp" /* WORKAROUND: This design prevents a kernel deadlock from occurring on 6.0.0+ */ diff --git a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.hpp b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.hpp index 145dd23fc..b0f57d721 100644 --- a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.hpp +++ b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_debug_events_manager.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::dmnt::cheat::impl { diff --git a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.cpp b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.cpp index d718f6596..10be69997 100644 --- a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.cpp +++ b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include #include "dmnt_cheat_vm.hpp" #include "dmnt_cheat_api.hpp" diff --git a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.hpp b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.hpp index 2f4d24af5..0e4478383 100644 --- a/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.hpp +++ b/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::dmnt::cheat::impl { diff --git a/stratosphere/dmnt/source/dmnt_main.cpp b/stratosphere/dmnt/source/dmnt_main.cpp index 74f38bf1f..41e6c141d 100644 --- a/stratosphere/dmnt/source/dmnt_main.cpp +++ b/stratosphere/dmnt/source/dmnt_main.cpp @@ -13,16 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include - -#include -#include -#include - #include "dmnt_service.hpp" #include "cheat/dmnt_cheat_service.hpp" diff --git a/stratosphere/dmnt/source/dmnt_service.hpp b/stratosphere/dmnt/source/dmnt_service.hpp index b2ccf4c1d..62cc37587 100644 --- a/stratosphere/dmnt/source/dmnt_service.hpp +++ b/stratosphere/dmnt/source/dmnt_service.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::dmnt { diff --git a/stratosphere/dmnt/source/dmnt_service_debug.cpp b/stratosphere/dmnt/source/dmnt_service_debug.cpp index 73220a647..4066dfa20 100644 --- a/stratosphere/dmnt/source/dmnt_service_debug.cpp +++ b/stratosphere/dmnt/source/dmnt_service_debug.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "dmnt_service.hpp" namespace ams::dmnt { diff --git a/stratosphere/dmnt/source/dmnt_service_target_io.cpp b/stratosphere/dmnt/source/dmnt_service_target_io.cpp index 49fc41cf2..39eff9441 100644 --- a/stratosphere/dmnt/source/dmnt_service_target_io.cpp +++ b/stratosphere/dmnt/source/dmnt_service_target_io.cpp @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include "dmnt_service.hpp" namespace std { diff --git a/stratosphere/eclct.stub/source/eclct_stub.cpp b/stratosphere/eclct.stub/source/eclct_stub.cpp index e62b5a30b..31f4e2c18 100644 --- a/stratosphere/eclct.stub/source/eclct_stub.cpp +++ b/stratosphere/eclct.stub/source/eclct_stub.cpp @@ -13,14 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include - -#include -#include #include extern "C" { diff --git a/stratosphere/fatal/source/fatal_config.cpp b/stratosphere/fatal/source/fatal_config.cpp index a3247d552..4f7f84e87 100644 --- a/stratosphere/fatal/source/fatal_config.cpp +++ b/stratosphere/fatal/source/fatal_config.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "fatal_config.hpp" namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_config.hpp b/stratosphere/fatal/source/fatal_config.hpp index fa26459d1..2b0d2e8a3 100644 --- a/stratosphere/fatal/source/fatal_config.hpp +++ b/stratosphere/fatal/source/fatal_config.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_debug.cpp b/stratosphere/fatal/source/fatal_debug.cpp index bc68154d7..edf23d611 100644 --- a/stratosphere/fatal/source/fatal_debug.cpp +++ b/stratosphere/fatal/source/fatal_debug.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include "fatal_debug.hpp" #include "fatal_config.hpp" diff --git a/stratosphere/fatal/source/fatal_debug.hpp b/stratosphere/fatal/source/fatal_debug.hpp index 1642eac0b..85457a211 100644 --- a/stratosphere/fatal/source/fatal_debug.hpp +++ b/stratosphere/fatal/source/fatal_debug.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_event_manager.cpp b/stratosphere/fatal/source/fatal_event_manager.cpp index 90dcc6e30..18574f21e 100644 --- a/stratosphere/fatal/source/fatal_event_manager.cpp +++ b/stratosphere/fatal/source/fatal_event_manager.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "fatal_event_manager.hpp" namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_event_manager.hpp b/stratosphere/fatal/source/fatal_event_manager.hpp index d7d79f8fd..e93bec18f 100644 --- a/stratosphere/fatal/source/fatal_event_manager.hpp +++ b/stratosphere/fatal/source/fatal_event_manager.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_font.cpp b/stratosphere/fatal/source/fatal_font.cpp index 09feecb31..572e49c29 100644 --- a/stratosphere/fatal/source/fatal_font.cpp +++ b/stratosphere/fatal/source/fatal_font.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include #include FT_FREETYPE_H diff --git a/stratosphere/fatal/source/fatal_font.hpp b/stratosphere/fatal/source/fatal_font.hpp index 18c7f1368..43f3d4182 100644 --- a/stratosphere/fatal/source/fatal_font.hpp +++ b/stratosphere/fatal/source/fatal_font.hpp @@ -13,10 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include #include namespace ams::fatal::srv::font { diff --git a/stratosphere/fatal/source/fatal_main.cpp b/stratosphere/fatal/source/fatal_main.cpp index 1e6bb512d..feb669f0b 100644 --- a/stratosphere/fatal/source/fatal_main.cpp +++ b/stratosphere/fatal/source/fatal_main.cpp @@ -13,15 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - -#include -#include -#include - #include "fatal_service.hpp" #include "fatal_config.hpp" #include "fatal_repair.hpp" diff --git a/stratosphere/fatal/source/fatal_repair.cpp b/stratosphere/fatal/source/fatal_repair.cpp index 6fde8267b..da309cfd9 100644 --- a/stratosphere/fatal/source/fatal_repair.cpp +++ b/stratosphere/fatal/source/fatal_repair.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "fatal_repair.hpp" #include "fatal_service_for_self.hpp" diff --git a/stratosphere/fatal/source/fatal_repair.hpp b/stratosphere/fatal/source/fatal_repair.hpp index da72164c3..def54b6b5 100644 --- a/stratosphere/fatal/source/fatal_repair.hpp +++ b/stratosphere/fatal/source/fatal_repair.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_service.cpp b/stratosphere/fatal/source/fatal_service.cpp index 646a34cab..b706d96fe 100644 --- a/stratosphere/fatal/source/fatal_service.cpp +++ b/stratosphere/fatal/source/fatal_service.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "fatal_config.hpp" #include "fatal_debug.hpp" #include "fatal_service.hpp" diff --git a/stratosphere/fatal/source/fatal_service.hpp b/stratosphere/fatal/source/fatal_service.hpp index 70eabf2e6..52f28fce3 100644 --- a/stratosphere/fatal/source/fatal_service.hpp +++ b/stratosphere/fatal/source/fatal_service.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_service_for_self.hpp b/stratosphere/fatal/source/fatal_service_for_self.hpp index d1c4bef75..b80508bae 100644 --- a/stratosphere/fatal/source/fatal_service_for_self.hpp +++ b/stratosphere/fatal/source/fatal_service_for_self.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 +#include namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_task.cpp b/stratosphere/fatal/source/fatal_task.cpp index b8e77a7ea..e9b3bf0aa 100644 --- a/stratosphere/fatal/source/fatal_task.cpp +++ b/stratosphere/fatal/source/fatal_task.cpp @@ -13,9 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include - #include "fatal_task.hpp" #include "fatal_task_error_report.hpp" diff --git a/stratosphere/fatal/source/fatal_task.hpp b/stratosphere/fatal/source/fatal_task.hpp index 0ac774aa9..fa656f92a 100644 --- a/stratosphere/fatal/source/fatal_task.hpp +++ b/stratosphere/fatal/source/fatal_task.hpp @@ -13,10 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include #include "fatal_service.hpp" namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_task_clock.cpp b/stratosphere/fatal/source/fatal_task_clock.cpp index 418b2919b..51b85649c 100644 --- a/stratosphere/fatal/source/fatal_task_clock.cpp +++ b/stratosphere/fatal/source/fatal_task_clock.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "fatal_task_clock.hpp" namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_task_clock.hpp b/stratosphere/fatal/source/fatal_task_clock.hpp index e0445bcf5..1c94a7a31 100644 --- a/stratosphere/fatal/source/fatal_task_clock.hpp +++ b/stratosphere/fatal/source/fatal_task_clock.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include "fatal_task.hpp" diff --git a/stratosphere/fatal/source/fatal_task_error_report.cpp b/stratosphere/fatal/source/fatal_task_error_report.cpp index 7c3a2a1b8..753d04418 100644 --- a/stratosphere/fatal/source/fatal_task_error_report.cpp +++ b/stratosphere/fatal/source/fatal_task_error_report.cpp @@ -13,12 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include #include -#include - #include "fatal_config.hpp" #include "fatal_task_error_report.hpp" diff --git a/stratosphere/fatal/source/fatal_task_error_report.hpp b/stratosphere/fatal/source/fatal_task_error_report.hpp index 316134fc5..1c6ffb62c 100644 --- a/stratosphere/fatal/source/fatal_task_error_report.hpp +++ b/stratosphere/fatal/source/fatal_task_error_report.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include "fatal_task.hpp" diff --git a/stratosphere/fatal/source/fatal_task_power.cpp b/stratosphere/fatal/source/fatal_task_power.cpp index af6513b15..0006a7948 100644 --- a/stratosphere/fatal/source/fatal_task_power.cpp +++ b/stratosphere/fatal/source/fatal_task_power.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "fatal_config.hpp" #include "fatal_task_power.hpp" diff --git a/stratosphere/fatal/source/fatal_task_power.hpp b/stratosphere/fatal/source/fatal_task_power.hpp index 7d9f62a6e..5b9ff7b0e 100644 --- a/stratosphere/fatal/source/fatal_task_power.hpp +++ b/stratosphere/fatal/source/fatal_task_power.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include "fatal_task.hpp" diff --git a/stratosphere/fatal/source/fatal_task_screen.cpp b/stratosphere/fatal/source/fatal_task_screen.cpp index 7aece027e..7d1b098f4 100644 --- a/stratosphere/fatal/source/fatal_task_screen.cpp +++ b/stratosphere/fatal/source/fatal_task_screen.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "fatal_task_screen.hpp" #include "fatal_config.hpp" #include "fatal_font.hpp" diff --git a/stratosphere/fatal/source/fatal_task_screen.hpp b/stratosphere/fatal/source/fatal_task_screen.hpp index 8c96a42a5..245e344c4 100644 --- a/stratosphere/fatal/source/fatal_task_screen.hpp +++ b/stratosphere/fatal/source/fatal_task_screen.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include "fatal_task.hpp" diff --git a/stratosphere/fatal/source/fatal_task_sound.cpp b/stratosphere/fatal/source/fatal_task_sound.cpp index ab03c740b..88e9affab 100644 --- a/stratosphere/fatal/source/fatal_task_sound.cpp +++ b/stratosphere/fatal/source/fatal_task_sound.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "fatal_task_sound.hpp" namespace ams::fatal::srv { diff --git a/stratosphere/fatal/source/fatal_task_sound.hpp b/stratosphere/fatal/source/fatal_task_sound.hpp index 069bc800b..7dc540595 100644 --- a/stratosphere/fatal/source/fatal_task_sound.hpp +++ b/stratosphere/fatal/source/fatal_task_sound.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include "fatal_task.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/ipc.hpp b/stratosphere/libstratosphere/include/atmosphere/common.hpp similarity index 85% rename from stratosphere/libstratosphere/include/stratosphere/ipc.hpp rename to stratosphere/libstratosphere/include/atmosphere/common.hpp index 09cdf25fb..6a87be4fe 100644 --- a/stratosphere/libstratosphere/include/stratosphere/ipc.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/common.hpp @@ -15,8 +15,8 @@ */ #pragma once - -#include "ipc/ipc_service_object.hpp" -#include "ipc/ipc_serialization.hpp" - -#include "ipc/ipc_service_session.hpp" \ No newline at end of file +#include "common_includes.hpp" +#include "defines.hpp" +#include "util.hpp" +#include "results.hpp" +#include "svc.hpp" diff --git a/stratosphere/libstratosphere/include/atmosphere/common_includes.hpp b/stratosphere/libstratosphere/include/atmosphere/common_includes.hpp new file mode 100644 index 000000000..fec9205ca --- /dev/null +++ b/stratosphere/libstratosphere/include/atmosphere/common_includes.hpp @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2019 Atmosphère-NX + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +/* C headers. */ +#include +#include +#include +#include +#include +#include +#include +#include + +/* C++ headers. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Libnx. */ +#include + +/* Atmosphere meta. */ +#if __has_include() +#include +#endif diff --git a/stratosphere/libstratosphere/include/stratosphere/defines.hpp b/stratosphere/libstratosphere/include/atmosphere/defines.hpp similarity index 96% rename from stratosphere/libstratosphere/include/stratosphere/defines.hpp rename to stratosphere/libstratosphere/include/atmosphere/defines.hpp index d2dbd52d8..a20d4c765 100644 --- a/stratosphere/libstratosphere/include/stratosphere/defines.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/defines.hpp @@ -15,8 +15,7 @@ */ #pragma once -#include -#include +#include "common_includes.hpp" /* Any broadly useful language defines should go here. */ @@ -44,4 +43,4 @@ #define ANONYMOUS_VARIABLE(pref) CONCATENATE(pref, __COUNTER__) #else #define ANONYMOUS_VARIABLE(pref) CONCATENATE(pref, __LINE__) -#endif \ No newline at end of file +#endif diff --git a/stratosphere/libstratosphere/include/stratosphere/results.hpp b/stratosphere/libstratosphere/include/atmosphere/results.hpp similarity index 97% rename from stratosphere/libstratosphere/include/stratosphere/results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results.hpp index 595235bc6..992733d70 100644 --- a/stratosphere/libstratosphere/include/stratosphere/results.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/results.hpp @@ -15,6 +15,8 @@ */ #pragma once +#include "defines.hpp" +#include "util.hpp" /* Utilities. */ #include "results/results_common.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/results/cal_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/cal_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/cal_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/cal_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/creport_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/creport_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/creport_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/creport_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/debug_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/debug_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/debug_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/debug_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/dmnt_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/dmnt_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/dmnt_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/dmnt_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/err_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/err_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/err_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/err_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/exosphere_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/exosphere_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/exosphere_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/exosphere_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/fatal_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/fatal_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/fatal_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/fatal_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/fs_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/fs_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/fs_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/fs_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/hipc_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/hipc_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/hipc_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/hipc_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/i2c_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/i2c_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/i2c_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/i2c_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/kvdb_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/kvdb_results.hpp similarity index 95% rename from stratosphere/libstratosphere/include/stratosphere/results/kvdb_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/kvdb_results.hpp index 2c19921a9..052ced408 100644 --- a/stratosphere/libstratosphere/include/stratosphere/results/kvdb_results.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/results/kvdb_results.hpp @@ -21,7 +21,7 @@ namespace ams::kvdb { R_DEFINE_NAMESPACE_RESULT_MODULE(20); - R_DEFINE_ERROR_RESULT(KeyCapacityInsufficient, 1); + R_DEFINE_ERROR_RESULT(OutOfKeyResource, 1); R_DEFINE_ERROR_RESULT(KeyNotFound, 2); R_DEFINE_ERROR_RESULT(AllocationFailed, 4); R_DEFINE_ERROR_RESULT(InvalidKeyValue, 5); diff --git a/stratosphere/libstratosphere/include/stratosphere/results/loader_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/loader_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/loader_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/loader_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/lr_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/lr_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/lr_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/lr_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/ncm_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/ncm_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/ncm_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/ncm_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/os_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/os_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/os_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/os_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/pm_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/pm_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/pm_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/pm_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/results_common.hpp b/stratosphere/libstratosphere/include/atmosphere/results/results_common.hpp similarity index 99% rename from stratosphere/libstratosphere/include/stratosphere/results/results_common.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/results_common.hpp index a52a99086..b0b50d433 100644 --- a/stratosphere/libstratosphere/include/stratosphere/results/results_common.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/results/results_common.hpp @@ -15,8 +15,6 @@ */ #pragma once -#include -#include #include "../defines.hpp" namespace ams { diff --git a/stratosphere/libstratosphere/include/stratosphere/results/ro_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/ro_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/ro_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/ro_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/settings_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/settings_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/settings_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/settings_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/sf_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/sf_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/sf_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/sf_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/sm_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/sm_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/sm_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/sm_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/spl_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/spl_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/spl_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/spl_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/svc_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/svc_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/svc_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/svc_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/updater_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/updater_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/updater_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/updater_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/results/vi_results.hpp b/stratosphere/libstratosphere/include/atmosphere/results/vi_results.hpp similarity index 100% rename from stratosphere/libstratosphere/include/stratosphere/results/vi_results.hpp rename to stratosphere/libstratosphere/include/atmosphere/results/vi_results.hpp diff --git a/stratosphere/libstratosphere/include/stratosphere/svc.hpp b/stratosphere/libstratosphere/include/atmosphere/svc.hpp similarity index 93% rename from stratosphere/libstratosphere/include/stratosphere/svc.hpp rename to stratosphere/libstratosphere/include/atmosphere/svc.hpp index dad85159e..fce887145 100644 --- a/stratosphere/libstratosphere/include/stratosphere/svc.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/svc.hpp @@ -15,6 +15,7 @@ */ #pragma once -#include +#include "defines.hpp" +#include "results.hpp" #include "svc/svc_types.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/svc/svc_types.hpp b/stratosphere/libstratosphere/include/atmosphere/svc/svc_types.hpp similarity index 99% rename from stratosphere/libstratosphere/include/stratosphere/svc/svc_types.hpp rename to stratosphere/libstratosphere/include/atmosphere/svc/svc_types.hpp index 275cbe08d..cc4bb4462 100644 --- a/stratosphere/libstratosphere/include/stratosphere/svc/svc_types.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/svc/svc_types.hpp @@ -15,9 +15,6 @@ */ #pragma once -#include -#include -#include "../defines.hpp" #include "../results.hpp" namespace ams::svc { diff --git a/stratosphere/libstratosphere/include/stratosphere/util.hpp b/stratosphere/libstratosphere/include/atmosphere/util.hpp similarity index 97% rename from stratosphere/libstratosphere/include/stratosphere/util.hpp rename to stratosphere/libstratosphere/include/atmosphere/util.hpp index a8b21abed..c05836218 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util.hpp @@ -15,7 +15,7 @@ */ #pragma once -#include +#include "defines.hpp" #include "util/util_alignment.hpp" #include "util/util_size.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_alignment.hpp b/stratosphere/libstratosphere/include/atmosphere/util/util_alignment.hpp similarity index 98% rename from stratosphere/libstratosphere/include/stratosphere/util/util_alignment.hpp rename to stratosphere/libstratosphere/include/atmosphere/util/util_alignment.hpp index 7ef5c053b..36f28e717 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util/util_alignment.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util/util_alignment.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include #include "../defines.hpp" -#include namespace ams::util { diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_compression.hpp b/stratosphere/libstratosphere/include/atmosphere/util/util_compression.hpp similarity index 97% rename from stratosphere/libstratosphere/include/stratosphere/util/util_compression.hpp rename to stratosphere/libstratosphere/include/atmosphere/util/util_compression.hpp index 644cfef5e..3f310ae81 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util/util_compression.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util/util_compression.hpp @@ -15,7 +15,7 @@ */ #pragma once -#include +#include "../defines.hpp" namespace ams::util { diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_ini.hpp b/stratosphere/libstratosphere/include/atmosphere/util/util_ini.hpp similarity index 96% rename from stratosphere/libstratosphere/include/stratosphere/util/util_ini.hpp rename to stratosphere/libstratosphere/include/atmosphere/util/util_ini.hpp index ba398cfcd..7815820bd 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util/util_ini.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util/util_ini.hpp @@ -15,8 +15,7 @@ */ #pragma once -#include -#include +#include "../defines.hpp" namespace ams::util::ini { diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_intrusive_list.hpp b/stratosphere/libstratosphere/include/atmosphere/util/util_intrusive_list.hpp similarity index 99% rename from stratosphere/libstratosphere/include/stratosphere/util/util_intrusive_list.hpp rename to stratosphere/libstratosphere/include/atmosphere/util/util_intrusive_list.hpp index 36f643170..df7489601 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util/util_intrusive_list.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util/util_intrusive_list.hpp @@ -15,10 +15,6 @@ */ #pragma once -#include -#include -#include "../defines.hpp" - #include "util_parent_of_member.hpp" namespace ams::util { diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_intrusive_red_black_tree.hpp b/stratosphere/libstratosphere/include/atmosphere/util/util_intrusive_red_black_tree.hpp similarity index 99% rename from stratosphere/libstratosphere/include/stratosphere/util/util_intrusive_red_black_tree.hpp rename to stratosphere/libstratosphere/include/atmosphere/util/util_intrusive_red_black_tree.hpp index b1769f185..088286dd5 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util/util_intrusive_red_black_tree.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util/util_intrusive_red_black_tree.hpp @@ -16,10 +16,6 @@ #pragma once #include -#include -#include -#include "../defines.hpp" - #include "util_parent_of_member.hpp" namespace ams::util { diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_parent_of_member.hpp b/stratosphere/libstratosphere/include/atmosphere/util/util_parent_of_member.hpp similarity index 99% rename from stratosphere/libstratosphere/include/stratosphere/util/util_parent_of_member.hpp rename to stratosphere/libstratosphere/include/atmosphere/util/util_parent_of_member.hpp index 55efae08e..4402e927b 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util/util_parent_of_member.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util/util_parent_of_member.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include #include "../defines.hpp" namespace ams::util { diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_scope_guard.hpp b/stratosphere/libstratosphere/include/atmosphere/util/util_scope_guard.hpp similarity index 98% rename from stratosphere/libstratosphere/include/stratosphere/util/util_scope_guard.hpp rename to stratosphere/libstratosphere/include/atmosphere/util/util_scope_guard.hpp index 462f797e4..a48d825e8 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util/util_scope_guard.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util/util_scope_guard.hpp @@ -16,7 +16,6 @@ /* Scope guard logic lovingly taken from Andrei Alexandrescu's "Systemic Error Handling in C++" */ #pragma once -#include #include "../defines.hpp" namespace ams::util { diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_size.hpp b/stratosphere/libstratosphere/include/atmosphere/util/util_size.hpp similarity index 97% rename from stratosphere/libstratosphere/include/stratosphere/util/util_size.hpp rename to stratosphere/libstratosphere/include/atmosphere/util/util_size.hpp index 78e9cbe49..c4db1a3bd 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util/util_size.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util/util_size.hpp @@ -15,7 +15,7 @@ */ #pragma once -#include +#include "../defines.hpp" namespace ams::util { diff --git a/stratosphere/libstratosphere/include/stratosphere/util/util_typed_storage.hpp b/stratosphere/libstratosphere/include/atmosphere/util/util_typed_storage.hpp similarity index 97% rename from stratosphere/libstratosphere/include/stratosphere/util/util_typed_storage.hpp rename to stratosphere/libstratosphere/include/atmosphere/util/util_typed_storage.hpp index 9b3960dd9..ffcd564a7 100644 --- a/stratosphere/libstratosphere/include/stratosphere/util/util_typed_storage.hpp +++ b/stratosphere/libstratosphere/include/atmosphere/util/util_typed_storage.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include #include "../defines.hpp" -#include namespace ams::util { diff --git a/stratosphere/libstratosphere/include/stratosphere.hpp b/stratosphere/libstratosphere/include/stratosphere.hpp index 58e7ffe74..fdbeea825 100644 --- a/stratosphere/libstratosphere/include/stratosphere.hpp +++ b/stratosphere/libstratosphere/include/stratosphere.hpp @@ -16,19 +16,34 @@ #pragma once -#include "stratosphere/defines.hpp" -#include "stratosphere/results.hpp" +/* Pulls in util, svc. */ +#include "atmosphere/common.hpp" -#include "stratosphere/util.hpp" -#include "stratosphere/svc.hpp" +/* Critical modules with no dependencies. */ #include "stratosphere/ams.hpp" #include "stratosphere/os.hpp" #include "stratosphere/dd.hpp" + +/* Lots of things depend on NCM, for Title IDs. */ +#include "stratosphere/ncm.hpp" + +/* At this point, just include the rest alphabetically. */ +/* TODO: Figure out optimal order. */ +#include "stratosphere/boot2.hpp" #include "stratosphere/cfg.hpp" +#include "stratosphere/dmnt.hpp" #include "stratosphere/fatal.hpp" #include "stratosphere/hid.hpp" -#include "stratosphere/ncm.hpp" +#include "stratosphere/hos.hpp" +#include "stratosphere/kvdb.hpp" +#include "stratosphere/ldr.hpp" +#include "stratosphere/map.hpp" +#include "stratosphere/patcher.hpp" #include "stratosphere/pm.hpp" +#include "stratosphere/reg.hpp" #include "stratosphere/rnd.hpp" -#include "stratosphere/sm.hpp" +#include "stratosphere/ro.hpp" #include "stratosphere/sf.hpp" +#include "stratosphere/sm.hpp" +#include "stratosphere/spl.hpp" +#include "stratosphere/updater.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/ams/ams_types.hpp b/stratosphere/libstratosphere/include/stratosphere/ams/ams_types.hpp index 661d940ac..dc24b936b 100644 --- a/stratosphere/libstratosphere/include/stratosphere/ams/ams_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/ams/ams_types.hpp @@ -15,8 +15,7 @@ */ #pragma once -#include "../defines.hpp" -#include "../results.hpp" +#include #include "../sf/sf_buffer_tags.hpp" #include "../hos.hpp" @@ -36,6 +35,26 @@ namespace ams::exosphere { TargetFirmware_900 = 11, }; +#ifdef ATMOSPHERE_H +/* #ifdef __has_include() */ + +#define AMS_VALIDATE_TARGET_FIRMWARE_ENUM(n) static_assert(TargetFirmware_##n == ATMOSPHERE_TARGET_FIRMWARE_##n) + + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(100); + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(200); + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(300); + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(400); + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(500); + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(620); + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(700); + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(800); + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(810); + AMS_VALIDATE_TARGET_FIRMWARE_ENUM(900); + +#undef AMS_VALIDATE_TARGET_FIRMWARE_ENUM + +#endif + constexpr inline u32 GetVersion(u32 major, u32 minor, u32 micro) { return (major << 16) | (minor << 8) | (micro); } diff --git a/stratosphere/libstratosphere/include/stratosphere/boot2.hpp b/stratosphere/libstratosphere/include/stratosphere/boot2.hpp index 55b3fc3be..f75afe4b1 100644 --- a/stratosphere/libstratosphere/include/stratosphere/boot2.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/boot2.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "boot2/boot2_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/boot2/boot2_api.hpp b/stratosphere/libstratosphere/include/stratosphere/boot2/boot2_api.hpp index 468d8cdf3..f23925864 100644 --- a/stratosphere/libstratosphere/include/stratosphere/boot2/boot2_api.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/boot2/boot2_api.hpp @@ -15,8 +15,7 @@ */ #pragma once -#include -#include +#include namespace ams::boot2 { diff --git a/stratosphere/libstratosphere/include/stratosphere/cfg.hpp b/stratosphere/libstratosphere/include/stratosphere/cfg.hpp index e78dd8a17..6c9f85bfe 100644 --- a/stratosphere/libstratosphere/include/stratosphere/cfg.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/cfg.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "cfg/cfg_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/cfg/cfg_api.hpp b/stratosphere/libstratosphere/include/stratosphere/cfg/cfg_api.hpp index 292f18b04..68e197402 100644 --- a/stratosphere/libstratosphere/include/stratosphere/cfg/cfg_api.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/cfg/cfg_api.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include #include "../os/os_common_types.hpp" #include "../ncm/ncm_types.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/dd.hpp b/stratosphere/libstratosphere/include/stratosphere/dd.hpp index a4ba4aac0..8d8c9bbe3 100644 --- a/stratosphere/libstratosphere/include/stratosphere/dd.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/dd.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "dd/dd_io_mappings.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/dd/dd_io_mappings.hpp b/stratosphere/libstratosphere/include/stratosphere/dd/dd_io_mappings.hpp index c0d913f0a..4105751db 100644 --- a/stratosphere/libstratosphere/include/stratosphere/dd/dd_io_mappings.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/dd/dd_io_mappings.hpp @@ -15,8 +15,7 @@ */ #pragma once -#include -#include "../defines.hpp" +#include namespace ams::dd { diff --git a/stratosphere/libstratosphere/include/stratosphere/dmnt.hpp b/stratosphere/libstratosphere/include/stratosphere/dmnt.hpp index 625399596..a0d421b4b 100644 --- a/stratosphere/libstratosphere/include/stratosphere/dmnt.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/dmnt.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "dmnt/dmnt_cheat_types.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/dmnt/dmnt_cheat_types.hpp b/stratosphere/libstratosphere/include/stratosphere/dmnt/dmnt_cheat_types.hpp index 3c5ed2dab..1231cb5ed 100644 --- a/stratosphere/libstratosphere/include/stratosphere/dmnt/dmnt_cheat_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/dmnt/dmnt_cheat_types.hpp @@ -15,7 +15,6 @@ */ #pragma once - #include "../os/os_common_types.hpp" #include "../ncm/ncm_types.hpp" #include "../sf/sf_buffer_tags.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/fatal.hpp b/stratosphere/libstratosphere/include/stratosphere/fatal.hpp index d3fbb885f..de81dacf3 100644 --- a/stratosphere/libstratosphere/include/stratosphere/fatal.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/fatal.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "fatal/fatal_types.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/fatal/fatal_types.hpp b/stratosphere/libstratosphere/include/stratosphere/fatal/fatal_types.hpp index 69996d374..6dfb60f4f 100644 --- a/stratosphere/libstratosphere/include/stratosphere/fatal/fatal_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/fatal/fatal_types.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include -#include "../defines.hpp" -#include "../results.hpp" +#include #include "../ncm/ncm_types.hpp" #include "../sf/sf_buffer_tags.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/hid.hpp b/stratosphere/libstratosphere/include/stratosphere/hid.hpp index bea31e2c9..6f6c15244 100644 --- a/stratosphere/libstratosphere/include/stratosphere/hid.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/hid.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "hid/hid_api.hpp" \ No newline at end of file diff --git a/stratosphere/libstratosphere/include/stratosphere/hos/hos_types.hpp b/stratosphere/libstratosphere/include/stratosphere/hos/hos_types.hpp index 79b58a09a..0b8c60b48 100644 --- a/stratosphere/libstratosphere/include/stratosphere/hos/hos_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/hos/hos_types.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include -#include "../defines.hpp" -#include "../results.hpp" +#include namespace ams::hos { diff --git a/stratosphere/libstratosphere/include/stratosphere/kvdb.hpp b/stratosphere/libstratosphere/include/stratosphere/kvdb.hpp new file mode 100644 index 000000000..f600cdbe7 --- /dev/null +++ b/stratosphere/libstratosphere/include/stratosphere/kvdb.hpp @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2018-2019 Atmosphère-NX + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include "kvdb/kvdb_auto_buffer.hpp" +#include "kvdb/kvdb_bounded_string.hpp" +#include "kvdb/kvdb_archive.hpp" +#include "kvdb/kvdb_memory_key_value_store.hpp" +#include "kvdb/kvdb_file_key_value_store.hpp" +#include "kvdb/kvdb_file_key_value_cache.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_archive.hpp b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_archive.hpp index 5b7ab3e8b..b315de8cf 100644 --- a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_archive.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_archive.hpp @@ -15,10 +15,6 @@ */ #pragma once -#include -#include "../defines.hpp" -#include "../results.hpp" - #include "kvdb_auto_buffer.hpp" namespace ams::kvdb { diff --git a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_auto_buffer.hpp b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_auto_buffer.hpp index 3b315e54d..0950c9141 100644 --- a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_auto_buffer.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_auto_buffer.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include -#include "../defines.hpp" -#include "../results.hpp" +#include namespace ams::kvdb { diff --git a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_bounded_string.hpp b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_bounded_string.hpp index f9aac8d5c..16b4b4393 100644 --- a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_bounded_string.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_bounded_string.hpp @@ -15,11 +15,7 @@ */ #pragma once -#include -#include -#include -#include "../defines.hpp" -#include "../results.hpp" +#include namespace ams::kvdb { diff --git a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp index 4c7b5b356..d37c4710d 100644 --- a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include -#include #include "kvdb_bounded_string.hpp" #include "kvdb_file_key_value_store.hpp" @@ -45,16 +43,12 @@ namespace ams::kvdb { /* Open the file. */ FILE *fp = fopen(path, "r+b"); - if (fp == nullptr) { - return fsdevGetLastResult(); - } + R_UNLESS(fp != nullptr, fsdevGetLastResult()); ON_SCOPE_EXIT { fclose(fp); }; /* Write new header with zero entries to the file. */ LruHeader new_header = { .entry_count = 0, }; - if (fwrite(&new_header, sizeof(new_header), 1, fp) != 1) { - return fsdevGetLastResult(); - } + R_UNLESS(fwrite(&new_header, sizeof(new_header), 1, fp) == 1, fsdevGetLastResult()); return ResultSuccess(); } @@ -78,7 +72,7 @@ namespace ams::kvdb { Result Initialize(const char *path, void *buf, size_t size) { /* Only initialize once, and ensure we have sufficient memory. */ AMS_ASSERT(this->keys == nullptr); - SSS_ASSERT(size >= BufferSize); + AMS_ASSERT(size >= BufferSize); /* Setup member variables. */ this->keys = static_cast(buf); @@ -87,22 +81,16 @@ namespace ams::kvdb { /* Open file. */ FILE *fp = fopen(this->file_path, "rb"); - if (fp == nullptr) { - return fsdevGetLastResult(); - } + R_UNLESS(fp != nullptr, fsdevGetLastResult()); ON_SCOPE_EXIT { fclose(fp); }; /* Read header. */ - if (fread(&this->header, sizeof(this->header), 1, fp) != 1) { - return fsdevGetLastResult(); - } + R_UNLESS(fread(&this->header, sizeof(this->header), 1, fp) == 1, fsdevGetLastResult()); /* Read entries. */ const size_t count = this->GetCount(); if (count > 0) { - if (fread(this->keys, std::min(BufferSize, sizeof(Key) * count), 1, fp) != 1) { - return fsdevGetLastResult(); - } + R_UNLESS(fread(this->keys, std::min(BufferSize, sizeof(Key) * count), 1, fp) == 1, fsdevGetLastResult()); } return ResultSuccess(); @@ -111,20 +99,14 @@ namespace ams::kvdb { Result Save() { /* Open file. */ FILE *fp = fopen(this->file_path, "r+b"); - if (fp == nullptr) { - return fsdevGetLastResult(); - } + R_UNLESS(fp != nullptr, fsdevGetLastResult()); ON_SCOPE_EXIT { fclose(fp); }; /* Write header. */ - if (fwrite(&this->header, sizeof(this->header), 1, fp) != 1) { - return fsdevGetLastResult(); - } + R_UNLESS(fwrite(&this->header, sizeof(this->header), 1, fp) == 1, fsdevGetLastResult()); /* Write entries. */ - if (fwrite(this->keys, BufferSize, 1, fp) != 1) { - return fsdevGetLastResult(); - } + R_UNLESS(fwrite(this->keys, BufferSize, 1, fp) == 1, fsdevGetLastResult()); /* Flush. */ fflush(fp); @@ -228,21 +210,25 @@ namespace ams::kvdb { } static Result Exists(bool *out, const char *path, bool is_dir) { - /* Check if the path exists. */ - struct stat st; - if (stat(path, &st) != 0) { - R_TRY_CATCH(fsdevGetLastResult()) { - R_CATCH(ResultFsPathNotFound) { - /* If the path doesn't exist, nothing has gone wrong. */ - *out = false; - return ResultSuccess(); - } - } R_END_TRY_CATCH; - } + /* Set out to false initially. */ + *out = false; - /* Check that our entry type is correct. */ - if ((is_dir && !(S_ISDIR(st.st_mode))) || (!is_dir && !(S_ISREG(st.st_mode)))) { - return ResultKvdbInvalidFilesystemState; + /* Check that the path exists, and that our entry type is correct. */ + { + struct stat st; + + if (stat(path, &st) != 0) { + R_TRY_CATCH(fsdevGetLastResult()) { + /* If the path doesn't exist, nothing has gone wrong. */ + R_CONVERT(fs::ResultPathNotFound, ResultSuccess()); + } R_END_TRY_CATCH; + } + + if (is_dir) { + R_UNLESS((S_ISDIR(st.st_mode)), ResultInvalidFilesystemState()); + } else { + R_UNLESS((S_ISREG(st.st_mode)), ResultInvalidFilesystemState()); + } } *out = true; @@ -260,9 +246,7 @@ namespace ams::kvdb { static Result CreateNewCache(const char *dir) { /* Make a new key value store filesystem, and a new lru_list.dat. */ R_TRY(LeastRecentlyUsedList::CreateNewList(GetLeastRecentlyUsedListPath(dir))); - if (mkdir(GetFileKeyValueStorePath(dir), 0) != 0) { - return fsdevGetLastResult(); - } + R_UNLESS(mkdir(GetFileKeyValueStorePath(dir), 0) == 0, fsdevGetLastResult()); return ResultSuccess(); } @@ -274,14 +258,10 @@ namespace ams::kvdb { R_TRY(DirectoryExists(&has_kvs, GetFileKeyValueStorePath(dir))); /* If neither exists, CreateNewCache was never called. */ - if (!has_lru && !has_kvs) { - return ResultKvdbNotCreated; - } + R_UNLESS(has_lru || has_kvs, ResultNotCreated()); /* If one exists but not the other, we have an invalid state. */ - if (has_lru ^ has_kvs) { - return ResultKvdbInvalidFilesystemState; - } + R_UNLESS(has_lru && has_kvs, ResultInvalidFilesystemState()); return ResultSuccess(); } @@ -359,12 +339,12 @@ namespace ams::kvdb { while (true) { /* Try to set the key. */ R_TRY_CATCH(this->kvs.Set(key, value, value_size)) { - R_CATCH_RANGE(ResultFsNotEnoughFreeSpace) { + R_CATCH(fs::ResultNotEnoughFreeSpace) { /* If our entry is the only thing in the Lru list, remove it. */ if (this->lru_list.GetCount() == 1) { this->lru_list.Pop(); R_TRY(this->lru_list.Save()); - return R_TRY_CATCH_RESULT; + return fs::ResultNotEnoughFreeSpace(); } /* Otherwise, remove the oldest element from the cache and try again. */ diff --git a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_store.hpp b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_store.hpp index 83ce93be9..a53fca9f9 100644 --- a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_store.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_store.hpp @@ -13,12 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include #include "../os.hpp" - #include "kvdb_bounded_string.hpp" namespace ams::kvdb { diff --git a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_memory_key_value_store.hpp b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_memory_key_value_store.hpp index e18a9a8cf..8627f3451 100644 --- a/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_memory_key_value_store.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/kvdb/kvdb_memory_key_value_store.hpp @@ -15,12 +15,7 @@ */ #pragma once -#include -#include #include -#include "../defines.hpp" -#include "../results.hpp" -#include "../util.hpp" #include "kvdb_auto_buffer.hpp" #include "kvdb_archive.hpp" #include "kvdb_bounded_string.hpp" @@ -124,9 +119,7 @@ namespace ams::kvdb { Result Initialize(size_t capacity) { this->entries = reinterpret_cast(std::malloc(sizeof(Entry) * capacity)); - if (this->entries == nullptr) { - return ResultKvdbAllocationFailed; - } + R_UNLESS(this->entries != nullptr, ResultAllocationFailed()); this->capacity = capacity; return ResultSuccess(); } @@ -134,9 +127,8 @@ namespace ams::kvdb { Result Set(const Key &key, const void *value, size_t value_size) { /* Allocate new value. */ void *new_value = std::malloc(value_size); - if (new_value == nullptr) { - return ResultKvdbAllocationFailed; - } + R_UNLESS(new_value != nullptr, ResultAllocationFailed()); + auto value_guard = SCOPE_GUARD { std::free(new_value); }; std::memcpy(new_value, value, value_size); /* Find entry for key. */ @@ -146,23 +138,19 @@ namespace ams::kvdb { std::free(it->GetValuePointer()); } else { /* We need to add a new entry. Check we have room, move future keys forward. */ - if (this->count >= this->capacity) { - std::free(new_value); - return ResultKvdbKeyCapacityInsufficient; - } + R_UNLESS(this->count < this->capacity, ResultOutOfKeyResource()); std::memmove(it + 1, it, sizeof(*it) * (this->end() - it)); this->count++; } /* Save the new Entry in the map. */ + value_guard.Cancel(); *it = Entry(key, new_value, value_size); return ResultSuccess(); } Result AddUnsafe(const Key &key, void *value, size_t value_size) { - if (this->count >= this->capacity) { - return ResultKvdbKeyCapacityInsufficient; - } + R_UNLESS(this->count < this->capacity, ResultOutOfKeyResource()); this->entries[this->count++] = Entry(key, value, value_size); return ResultSuccess(); @@ -171,18 +159,13 @@ namespace ams::kvdb { Result Remove(const Key &key) { /* Find entry for key. */ Entry *it = this->find(key); + R_UNLESS(it != this->end(), ResultKeyNotFound()); - /* Check if the entry is valid. */ - if (it != this->end()) { - /* Free the value, move entries back. */ - std::free(it->GetValuePointer()); - std::memmove(it, it + 1, sizeof(*it) * (this->end() - (it + 1))); - this->count--; - return ResultSuccess(); - } - - /* If it's not, we didn't remove it. */ - return ResultKvdbKeyNotFound; + /* Free the value, move entries back. */ + std::free(it->GetValuePointer()); + std::memmove(it, it + 1, sizeof(*it) * (this->end() - (it + 1))); + this->count--; + return ResultSuccess(); } Entry *begin() { @@ -281,9 +264,8 @@ namespace ams::kvdb { /* Ensure that the passed path is a directory. */ { struct stat st; - if (stat(dir, &st) != 0 || !(S_ISDIR(st.st_mode))) { - return ResultFsPathNotFound; - } + R_UNLESS(stat(dir, &st) == 0, fs::ResultPathNotFound()); + R_UNLESS((S_ISDIR(st.st_mode)), fs::ResultPathNotFound()); } /* Set paths. */ @@ -322,9 +304,7 @@ namespace ams::kvdb { /* This is because no archive file = no entries, so we're in the right state. */ AutoBuffer buffer; R_TRY_CATCH(this->ReadArchiveFile(&buffer)) { - R_CATCH(ResultFsPathNotFound) { - return ResultSuccess(); - } + R_CONVERT(fs::ResultPathNotFound, ResultSuccess()); } R_END_TRY_CATCH; /* Parse entries from the buffer. */ @@ -341,9 +321,7 @@ namespace ams::kvdb { /* Allocate memory for value. */ void *new_value = std::malloc(value_size); - if (new_value == nullptr) { - return ResultKvdbAllocationFailed; - } + R_UNLESS(new_value != nullptr, ResultAllocationFailed()); auto value_guard = SCOPE_GUARD { std::free(new_value); }; /* Read key and value. */ @@ -399,9 +377,7 @@ namespace ams::kvdb { Result Get(size_t *out_size, void *out_value, size_t max_out_size, const Key &key) { /* Find entry. */ auto it = this->find(key); - if (it == this->end()) { - return ResultKvdbKeyNotFound; - } + R_UNLESS(it != this->end(), ResultKeyNotFound()); size_t size = std::min(max_out_size, it->GetValueSize()); std::memcpy(out_value, it->GetValuePointer(), size); @@ -413,9 +389,7 @@ namespace ams::kvdb { Result GetValuePointer(Value **out_value, const Key &key) { /* Find entry. */ auto it = this->find(key); - if (it == this->end()) { - return ResultKvdbKeyNotFound; - } + R_UNLESS(it != this->end(), ResultKeyNotFound()); *out_value = it->template GetValuePointer(); return ResultSuccess(); @@ -425,9 +399,7 @@ namespace ams::kvdb { Result GetValuePointer(const Value **out_value, const Key &key) const { /* Find entry. */ auto it = this->find(key); - if (it == this->end()) { - return ResultKvdbKeyNotFound; - } + R_UNLESS(it != this->end(), ResultKeyNotFound()); *out_value = it->template GetValuePointer(); return ResultSuccess(); @@ -437,9 +409,7 @@ namespace ams::kvdb { Result GetValue(Value *out_value, const Key &key) const { /* Find entry. */ auto it = this->find(key); - if (it == this->end()) { - return ResultKvdbKeyNotFound; - } + R_UNLESS(it != this->end(), ResultKeyNotFound()); *out_value = it->template GetValue(); return ResultSuccess(); @@ -448,9 +418,7 @@ namespace ams::kvdb { Result GetValueSize(size_t *out_size, const Key &key) const { /* Find entry. */ auto it = this->find(key); - if (it == this->end()) { - return ResultKvdbKeyNotFound; - } + R_UNLESS(it != this->end(), ResultKeyNotFound()); *out_size = it->GetValueSize(); return ResultSuccess(); @@ -510,23 +478,17 @@ namespace ams::kvdb { /* Write data to the temporary archive. */ { FILE *f = fopen(this->temp_path, "r+b"); - if (f == nullptr) { - return fsdevGetLastResult(); - } + R_UNLESS(f != nullptr, fsdevGetLastResult()); ON_SCOPE_EXIT { fclose(f); }; - if (fwrite(buffer.Get(), buffer.GetSize(), 1, f) != 1) { - return fsdevGetLastResult(); - } + R_UNLESS(fwrite(buffer.Get(), buffer.GetSize(), 1, f) == 1, fsdevGetLastResult()); } /* Try to delete the saved archive, but allow deletion failure. */ std::remove(this->path.Get()); /* Rename the path. */ - if (std::rename(this->temp_path.Get(), this->path.Get()) != 0) { - return fsdevGetLastResult(); - } + R_UNLESS(std::rename(this->temp_path.Get(), this->path.Get()) == 0, fsdevGetLastResult()); return ResultSuccess(); } @@ -544,9 +506,7 @@ namespace ams::kvdb { Result ReadArchiveFile(AutoBuffer *dst) const { /* Open the file. */ FILE *f = fopen(this->path, "rb"); - if (f == nullptr) { - return fsdevGetLastResult(); - } + R_UNLESS(f != nullptr, fsdevGetLastResult()); ON_SCOPE_EXIT { fclose(f); }; /* Get the archive file size. */ @@ -556,9 +516,7 @@ namespace ams::kvdb { /* Make a new buffer, read the file. */ R_TRY(dst->Initialize(archive_size)); - if (fread(dst->Get(), archive_size, 1, f) != 1) { - return fsdevGetLastResult(); - } + R_UNLESS(fread(dst->Get(), archive_size, 1, f) == 1, fsdevGetLastResult()); return ResultSuccess(); } diff --git a/stratosphere/libstratosphere/include/stratosphere/ldr.hpp b/stratosphere/libstratosphere/include/stratosphere/ldr.hpp index fc56cb76f..5a4d6552f 100644 --- a/stratosphere/libstratosphere/include/stratosphere/ldr.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/ldr.hpp @@ -15,6 +15,6 @@ */ #pragma once -#include #include "ldr/ldr_types.hpp" +#include "ldr/ldr_pm_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/ldr/ldr_pm_api.hpp b/stratosphere/libstratosphere/include/stratosphere/ldr/ldr_pm_api.hpp index 87a194282..440513fdd 100644 --- a/stratosphere/libstratosphere/include/stratosphere/ldr/ldr_pm_api.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/ldr/ldr_pm_api.hpp @@ -15,7 +15,6 @@ */ #pragma once - #include "ldr_types.hpp" namespace ams::ldr::pm { diff --git a/stratosphere/libstratosphere/include/stratosphere/ldr/ldr_types.hpp b/stratosphere/libstratosphere/include/stratosphere/ldr/ldr_types.hpp index b0b25a5d4..3ab3c3ea4 100644 --- a/stratosphere/libstratosphere/include/stratosphere/ldr/ldr_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/ldr/ldr_types.hpp @@ -15,10 +15,7 @@ */ #pragma once - -#include -#include -#include "../svc/svc_types.hpp" +#include #include "../ncm/ncm_types.hpp" #include "../sf/sf_buffer_tags.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/map.hpp b/stratosphere/libstratosphere/include/stratosphere/map.hpp index 0d9d8ba9c..3b34b2346 100644 --- a/stratosphere/libstratosphere/include/stratosphere/map.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/map.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include #include "map/map_types.hpp" #include "map/map_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/map/map_api.hpp b/stratosphere/libstratosphere/include/stratosphere/map/map_api.hpp index 26aca5c21..89f04b507 100644 --- a/stratosphere/libstratosphere/include/stratosphere/map/map_api.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/map/map_api.hpp @@ -15,8 +15,6 @@ */ #pragma once -#include - #include "map_types.hpp" namespace ams::map { diff --git a/stratosphere/libstratosphere/include/stratosphere/map/map_types.hpp b/stratosphere/libstratosphere/include/stratosphere/map/map_types.hpp index ad33a9c43..41127e87c 100644 --- a/stratosphere/libstratosphere/include/stratosphere/map/map_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/map/map_types.hpp @@ -15,8 +15,7 @@ */ #pragma once -#include -#include "../results.hpp" +#include namespace ams::map { diff --git a/stratosphere/libstratosphere/include/stratosphere/ncm.hpp b/stratosphere/libstratosphere/include/stratosphere/ncm.hpp index ec0830def..8f2d1084a 100644 --- a/stratosphere/libstratosphere/include/stratosphere/ncm.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/ncm.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "ncm/ncm_types.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/os.hpp b/stratosphere/libstratosphere/include/stratosphere/os.hpp index 6d009ee05..04664b124 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include #include "os/os_common_types.hpp" #include "os/os_managed_handle.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_common_types.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_common_types.hpp index 0e581d933..f88c3ba1e 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_common_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_common_types.hpp @@ -14,9 +14,7 @@ * along with this program. If not, see . */ #pragma once -#include -#include "../results.hpp" -#include "../util.hpp" +#include namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_interrupt_event.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_interrupt_event.hpp index d11ab5296..ccfd97910 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_interrupt_event.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_interrupt_event.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include "os_common_types.hpp" #include "os_managed_handle.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_managed_handle.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_managed_handle.hpp index 3f127d119..72ecda111 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_managed_handle.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_managed_handle.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include -#include "../defines.hpp" -#include "../results.hpp" +#include "os_common_types.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_message_queue.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_message_queue.hpp index f7e925b03..5c24bf5ef 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_message_queue.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_message_queue.hpp @@ -15,8 +15,6 @@ */ #pragma once -#include -#include "os_common_types.hpp" #include "os_mutex.hpp" #include "os_condvar.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_mutex.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_mutex.hpp index d11dc7e0f..26ba66c2e 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_mutex.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_mutex.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include -#include -#include "../util.hpp" +#include "os_common_types.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_semaphore.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_semaphore.hpp index ae8c49ca7..7cda2c86e 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_semaphore.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_semaphore.hpp @@ -15,7 +15,7 @@ */ #pragma once -#include +#include "os_common_types.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_system_event.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_system_event.hpp index 564ee407f..290bfe52c 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_system_event.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_system_event.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include "os_common_types.hpp" #include "os_event.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_thread.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_thread.hpp index 0c5da0bea..d1b35d7c8 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_thread.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_thread.hpp @@ -15,7 +15,7 @@ */ #pragma once -#include +#include "os_common_types.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_timeout_helper.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_timeout_helper.hpp index f91398a29..650a3e3ef 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_timeout_helper.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_timeout_helper.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #pragma once -#include +#include "os_common_types.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_waitable_holder.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_waitable_holder.hpp index dccbb6dba..ea3216b46 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_waitable_holder.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_waitable_holder.hpp @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #pragma once -#include "../util.hpp" #include "os_common_types.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/os/os_waitable_manager.hpp b/stratosphere/libstratosphere/include/stratosphere/os/os_waitable_manager.hpp index b2b2fba8e..90e912e14 100644 --- a/stratosphere/libstratosphere/include/stratosphere/os/os_waitable_manager.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/os/os_waitable_manager.hpp @@ -14,8 +14,6 @@ * along with this program. If not, see . */ #pragma once -#include "../util.hpp" -#include "os_common_types.hpp" #include "os_mutex.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/include/stratosphere/patcher.hpp b/stratosphere/libstratosphere/include/stratosphere/patcher.hpp index 0e11d4c49..deafa05cd 100644 --- a/stratosphere/libstratosphere/include/stratosphere/patcher.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/patcher.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "patcher/patcher_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/pm.hpp b/stratosphere/libstratosphere/include/stratosphere/pm.hpp index 2a8d79762..7593c5b69 100644 --- a/stratosphere/libstratosphere/include/stratosphere/pm.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/pm.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include #include "pm/pm_types.hpp" #include "pm/pm_boot_mode_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/pm/pm_types.hpp b/stratosphere/libstratosphere/include/stratosphere/pm/pm_types.hpp index 36671b836..a40eee8f3 100644 --- a/stratosphere/libstratosphere/include/stratosphere/pm/pm_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/pm/pm_types.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include #include "../os/os_common_types.hpp" namespace ams::pm { diff --git a/stratosphere/libstratosphere/include/stratosphere/reg.hpp b/stratosphere/libstratosphere/include/stratosphere/reg.hpp index b3748199d..001c62827 100644 --- a/stratosphere/libstratosphere/include/stratosphere/reg.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/reg.hpp @@ -15,7 +15,7 @@ */ #pragma once -#include +#include namespace ams::reg { diff --git a/stratosphere/libstratosphere/include/stratosphere/rnd.hpp b/stratosphere/libstratosphere/include/stratosphere/rnd.hpp index 7315f6b9c..a11eba7b2 100644 --- a/stratosphere/libstratosphere/include/stratosphere/rnd.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/rnd.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "rnd/rnd_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/rnd/rnd_api.hpp b/stratosphere/libstratosphere/include/stratosphere/rnd/rnd_api.hpp index ae352f56b..dcea365cc 100644 --- a/stratosphere/libstratosphere/include/stratosphere/rnd/rnd_api.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/rnd/rnd_api.hpp @@ -15,8 +15,7 @@ */ #pragma once -#include -#include +#include namespace ams::rnd { diff --git a/stratosphere/libstratosphere/include/stratosphere/ro.hpp b/stratosphere/libstratosphere/include/stratosphere/ro.hpp index 42239e95e..c5835d46a 100644 --- a/stratosphere/libstratosphere/include/stratosphere/ro.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/ro.hpp @@ -15,6 +15,5 @@ */ #pragma once -#include #include "ro/ro_types.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/ro/ro_types.hpp b/stratosphere/libstratosphere/include/stratosphere/ro/ro_types.hpp index b4f857eb9..ed039326c 100644 --- a/stratosphere/libstratosphere/include/stratosphere/ro/ro_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/ro/ro_types.hpp @@ -15,10 +15,8 @@ */ #pragma once -#include -#include -#include "../defines.hpp" -#include "../ncm.hpp" +#include +#include "../ncm/ncm_types.hpp" namespace ams::ro { diff --git a/stratosphere/libstratosphere/include/stratosphere/sf.hpp b/stratosphere/libstratosphere/include/stratosphere/sf.hpp index 8b39292ae..7c7a52811 100644 --- a/stratosphere/libstratosphere/include/stratosphere/sf.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/sf.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include #include "sf/sf_common.hpp" #include "sf/sf_service_object.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp b/stratosphere/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp index 43cdc5018..4604a9334 100644 --- a/stratosphere/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp @@ -16,6 +16,7 @@ #pragma once #include "sf_hipc_server_domain_session_manager.hpp" +#include "../../sm.hpp" namespace ams::sf::hipc { diff --git a/stratosphere/libstratosphere/include/stratosphere/sf/sf_common.hpp b/stratosphere/libstratosphere/include/stratosphere/sf/sf_common.hpp index 57b9bc8f5..71975321c 100644 --- a/stratosphere/libstratosphere/include/stratosphere/sf/sf_common.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/sf/sf_common.hpp @@ -15,11 +15,6 @@ */ #pragma once -#include -#include -#include "../defines.hpp" -#include "../results.hpp" -#include "../util.hpp" -#include "../svc.hpp" +#include #include "../ams.hpp" #include "../os.hpp" \ No newline at end of file diff --git a/stratosphere/libstratosphere/include/stratosphere/sm.hpp b/stratosphere/libstratosphere/include/stratosphere/sm.hpp index 5c6ac9f36..8dd7421ee 100644 --- a/stratosphere/libstratosphere/include/stratosphere/sm.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/sm.hpp @@ -15,9 +15,10 @@ */ #pragma once -#include #include "sm/sm_types.hpp" #include "sm/sm_api.hpp" #include "sm/sm_mitm_api.hpp" #include "sm/sm_scoped_holder.hpp" + +#include "sm/sm_manager_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/sm/sm_types.hpp b/stratosphere/libstratosphere/include/stratosphere/sm/sm_types.hpp index d61777f40..028f2a8bf 100644 --- a/stratosphere/libstratosphere/include/stratosphere/sm/sm_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/sm/sm_types.hpp @@ -15,12 +15,7 @@ */ #pragma once -#include -#include -#include -#include "../defines.hpp" -#include "../results.hpp" -#include "../os.hpp" +#include namespace ams::sm { diff --git a/stratosphere/libstratosphere/include/stratosphere/spl.hpp b/stratosphere/libstratosphere/include/stratosphere/spl.hpp index d0b43e9d0..25f266b27 100644 --- a/stratosphere/libstratosphere/include/stratosphere/spl.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/spl.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include #include "spl/spl_types.hpp" #include "spl/spl_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp b/stratosphere/libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp index 5d1c05b73..cef9c970f 100644 --- a/stratosphere/libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp @@ -15,9 +15,6 @@ */ #pragma once -#include -#include - #include "../spl_types.hpp" namespace ams::spl::smc { diff --git a/stratosphere/libstratosphere/include/stratosphere/spl/spl_api.hpp b/stratosphere/libstratosphere/include/stratosphere/spl/spl_api.hpp index d49c15183..d68abc945 100644 --- a/stratosphere/libstratosphere/include/stratosphere/spl/spl_api.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/spl/spl_api.hpp @@ -15,7 +15,6 @@ */ #pragma once - #include "spl_types.hpp" namespace ams::spl { diff --git a/stratosphere/libstratosphere/include/stratosphere/spl/spl_types.hpp b/stratosphere/libstratosphere/include/stratosphere/spl/spl_types.hpp index 1cd3f7215..4f1816b5c 100644 --- a/stratosphere/libstratosphere/include/stratosphere/spl/spl_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/spl/spl_types.hpp @@ -15,8 +15,7 @@ */ #pragma once -#include -#include "../results.hpp" +#include namespace ams::spl { diff --git a/stratosphere/libstratosphere/include/stratosphere/updater.hpp b/stratosphere/libstratosphere/include/stratosphere/updater.hpp index 5195450cf..5d494147d 100644 --- a/stratosphere/libstratosphere/include/stratosphere/updater.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/updater.hpp @@ -15,7 +15,6 @@ */ #pragma once -#include #include "updater/updater_types.hpp" #include "updater/updater_api.hpp" diff --git a/stratosphere/libstratosphere/include/stratosphere/updater/updater_api.hpp b/stratosphere/libstratosphere/include/stratosphere/updater/updater_api.hpp index 55482efce..4c36dd289 100644 --- a/stratosphere/libstratosphere/include/stratosphere/updater/updater_api.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/updater/updater_api.hpp @@ -15,10 +15,8 @@ */ #pragma once -#include - -#include "../spl/spl_types.hpp" #include "updater_types.hpp" +#include "../spl/spl_types.hpp" namespace ams::updater { diff --git a/stratosphere/libstratosphere/include/stratosphere/updater/updater_types.hpp b/stratosphere/libstratosphere/include/stratosphere/updater/updater_types.hpp index 6675f3d4c..4690369b4 100644 --- a/stratosphere/libstratosphere/include/stratosphere/updater/updater_types.hpp +++ b/stratosphere/libstratosphere/include/stratosphere/updater/updater_types.hpp @@ -15,7 +15,7 @@ */ #pragma once -#include +#include namespace ams::updater { diff --git a/stratosphere/libstratosphere/source/boot2/boot2_api.cpp b/stratosphere/libstratosphere/source/boot2/boot2_api.cpp index 6cf08901a..d12e4932c 100644 --- a/stratosphere/libstratosphere/source/boot2/boot2_api.cpp +++ b/stratosphere/libstratosphere/source/boot2/boot2_api.cpp @@ -13,13 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include -#include -#include -#include -#include +#include namespace ams::boot2 { diff --git a/stratosphere/libstratosphere/source/cfg/cfg_flags.cpp b/stratosphere/libstratosphere/source/cfg/cfg_flags.cpp index ed0ea9d20..e5d70ed85 100644 --- a/stratosphere/libstratosphere/source/cfg/cfg_flags.cpp +++ b/stratosphere/libstratosphere/source/cfg/cfg_flags.cpp @@ -14,9 +14,7 @@ * along with this program. If not, see . */ -#include #include -#include namespace ams::cfg { diff --git a/stratosphere/libstratosphere/source/cfg/cfg_override.cpp b/stratosphere/libstratosphere/source/cfg/cfg_override.cpp index 76a20fb4d..2c1706747 100644 --- a/stratosphere/libstratosphere/source/cfg/cfg_override.cpp +++ b/stratosphere/libstratosphere/source/cfg/cfg_override.cpp @@ -14,13 +14,7 @@ * along with this program. If not, see . */ -#include -#include -#include #include -#include -#include -#include namespace ams::cfg { diff --git a/stratosphere/libstratosphere/source/cfg/cfg_privileged_process.cpp b/stratosphere/libstratosphere/source/cfg/cfg_privileged_process.cpp index 670e590e2..34a8fd259 100644 --- a/stratosphere/libstratosphere/source/cfg/cfg_privileged_process.cpp +++ b/stratosphere/libstratosphere/source/cfg/cfg_privileged_process.cpp @@ -14,9 +14,7 @@ * along with this program. If not, see . */ -#include #include -#include namespace ams::cfg { diff --git a/stratosphere/libstratosphere/source/cfg/cfg_sd_card.cpp b/stratosphere/libstratosphere/source/cfg/cfg_sd_card.cpp index 150047851..079e2455c 100644 --- a/stratosphere/libstratosphere/source/cfg/cfg_sd_card.cpp +++ b/stratosphere/libstratosphere/source/cfg/cfg_sd_card.cpp @@ -14,10 +14,7 @@ * along with this program. If not, see . */ -#include #include -#include -#include namespace ams::cfg { diff --git a/stratosphere/libstratosphere/source/hid/hid_api.cpp b/stratosphere/libstratosphere/source/hid/hid_api.cpp index 0419f96d2..220cabd6b 100644 --- a/stratosphere/libstratosphere/source/hid/hid_api.cpp +++ b/stratosphere/libstratosphere/source/hid/hid_api.cpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include #include -#include -#include namespace ams::hid { diff --git a/stratosphere/libstratosphere/source/kvdb/kvdb_archive.cpp b/stratosphere/libstratosphere/source/kvdb/kvdb_archive.cpp index f7f3418de..40a4d055b 100644 --- a/stratosphere/libstratosphere/source/kvdb/kvdb_archive.cpp +++ b/stratosphere/libstratosphere/source/kvdb/kvdb_archive.cpp @@ -15,7 +15,6 @@ */ #include -#include namespace ams::kvdb { @@ -32,9 +31,7 @@ namespace ams::kvdb { u32 entry_count; Result Validate() const { - if (std::memcmp(this->magic, ArchiveHeaderMagic, sizeof(ArchiveHeaderMagic)) != 0) { - return ResultInvalidKeyValue(); - } + R_UNLESS(std::memcmp(this->magic, ArchiveHeaderMagic, sizeof(ArchiveHeaderMagic)) == 0, ResultInvalidKeyValue()); return ResultSuccess(); } @@ -53,9 +50,7 @@ namespace ams::kvdb { u32 value_size; Result Validate() const { - if (std::memcmp(this->magic, ArchiveEntryMagic, sizeof(ArchiveEntryMagic)) != 0) { - return ResultInvalidKeyValue(); - } + R_UNLESS(std::memcmp(this->magic, ArchiveEntryMagic, sizeof(ArchiveEntryMagic)) == 0, ResultInvalidKeyValue()); return ResultSuccess(); } @@ -74,9 +69,8 @@ namespace ams::kvdb { /* Reader functionality. */ Result ArchiveReader::Peek(void *dst, size_t size) { /* Bounds check. */ - if (this->offset + size > this->buffer.GetSize() || this->offset + size <= this->offset) { - return ResultInvalidKeyValue(); - } + R_UNLESS(this->offset + size <= this->buffer.GetSize(), ResultInvalidKeyValue()); + R_UNLESS(this->offset + size <= this->offset, ResultInvalidKeyValue()); std::memcpy(dst, this->buffer.Get() + this->offset, size); return ResultSuccess(); @@ -136,9 +130,8 @@ namespace ams::kvdb { /* Writer functionality. */ Result ArchiveWriter::Write(const void *src, size_t size) { /* Bounds check. */ - if (this->offset + size > this->buffer.GetSize() || this->offset + size <= this->offset) { - return ResultInvalidKeyValue(); - } + R_UNLESS(this->offset + size <= this->buffer.GetSize(), ResultInvalidKeyValue()); + R_UNLESS(this->offset + size <= this->offset, ResultInvalidKeyValue()); std::memcpy(this->buffer.Get() + this->offset, src, size); this->offset += size; diff --git a/stratosphere/libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp b/stratosphere/libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp index 7b23e4c38..3e67cd632 100644 --- a/stratosphere/libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp +++ b/stratosphere/libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp @@ -14,9 +14,7 @@ * along with this program. If not, see . */ -#include #include -#include namespace ams::kvdb { @@ -40,9 +38,7 @@ namespace ams::kvdb { /* If we have memory to work with, ensure it's at least enough for the cache entries. */ if (this->backing_buffer != nullptr) { this->entries = static_castentries)>(this->Allocate(sizeof(*this->entries) * this->capacity)); - if (this->entries == nullptr) { - return ResultBufferInsufficient(); - } + R_UNLESS(this->entries != nullptr, ResultBufferInsufficient()); } return ResultSuccess(); @@ -158,15 +154,13 @@ namespace ams::kvdb { /* TODO: Nintendo does not validate that the key is valid hex. Should we do this? */ const size_t file_name_len = file_name.GetLength(); const size_t key_name_len = file_name_len - FileExtensionLength; - if (file_name_len < FileExtensionLength + 2 || !file_name.EndsWith(FileExtension) || key_name_len % 2 != 0) { - return ResultInvalidKeyValue(); - } + R_UNLESS(file_name_len >= FileExtensionLength + 2, ResultInvalidKeyValue()); + R_UNLESS(file_name.EndsWith(FileExtension), ResultInvalidKeyValue()); + R_UNLESS(util::IsAligned(key_name_len, 2), ResultInvalidKeyValue()); /* Validate that we have space for the converted key. */ const size_t key_size = key_name_len / 2; - if (key_size > max_out_size) { - return ResultBufferInsufficient(); - } + R_UNLESS(key_size <= max_out_size, ResultBufferInsufficient()); /* Convert the hex key back. */ u8 *out_key = static_cast(_out_key); @@ -188,9 +182,8 @@ namespace ams::kvdb { /* Ensure that the passed path is a directory. */ { struct stat st; - if (stat(dir, &st) != 0 || !(S_ISDIR(st.st_mode))) { - return fs::ResultPathNotFound(); - } + R_UNLESS(stat(dir, &st) == 0, fs::ResultPathNotFound()); + R_UNLESS((S_ISDIR(st.st_mode)), fs::ResultPathNotFound()); } /* Set path. */ @@ -205,9 +198,7 @@ namespace ams::kvdb { std::scoped_lock lk(this->lock); /* Ensure key size is small enough. */ - if (key_size > MaxKeySize) { - return ResultKeyCapacityInsufficient(); - } + R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource()); /* Try to get from cache. */ { @@ -233,14 +224,10 @@ namespace ams::kvdb { fseek(fp, 0, SEEK_SET); /* Ensure there's enough space for the value. */ - if (max_out_size < value_size) { - return ResultBufferInsufficient(); - } + R_UNLESS(value_size <= max_out_size, ResultBufferInsufficient()); /* Read the value. */ - if (fread(out_value, value_size, 1, fp) != 1) { - return fsdevGetLastResult(); - } + R_UNLESS(fread(out_value, value_size, 1, fp) == 1, fsdevGetLastResult()); *out_size = value_size; /* Cache the newly read value. */ @@ -252,9 +239,7 @@ namespace ams::kvdb { std::scoped_lock lk(this->lock); /* Ensure key size is small enough. */ - if (key_size > MaxKeySize) { - return ResultKeyCapacityInsufficient(); - } + R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource()); /* Try to get from cache. */ { @@ -284,9 +269,7 @@ namespace ams::kvdb { std::scoped_lock lk(this->lock); /* Ensure key size is small enough. */ - if (key_size > MaxKeySize) { - return ResultKeyCapacityInsufficient(); - } + R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource()); /* When the cache contains the key being set, Nintendo invalidates the cache. */ if (this->cache.Contains(key, key_size)) { @@ -299,15 +282,11 @@ namespace ams::kvdb { /* Open the value file. */ FILE *fp = fopen(key_path, "wb"); - if (fp == nullptr) { - return fsdevGetLastResult(); - } + R_UNLESS(fp != nullptr, fsdevGetLastResult()); ON_SCOPE_EXIT { fclose(fp); }; /* Write the value file. */ - if (fwrite(value, value_size, 1, fp) != 1) { - return fsdevGetLastResult(); - } + R_UNLESS(fwrite(value, value_size, 1, fp) == 1, fsdevGetLastResult()); /* Flush the value file. */ fflush(fp); @@ -319,9 +298,7 @@ namespace ams::kvdb { std::scoped_lock lk(this->lock); /* Ensure key size is small enough. */ - if (key_size > MaxKeySize) { - return ResultKeyCapacityInsufficient(); - } + R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource()); /* When the cache contains the key being set, Nintendo invalidates the cache. */ if (this->cache.Contains(key, key_size)) { diff --git a/stratosphere/libstratosphere/source/ldr/ldr_pm_api.cpp b/stratosphere/libstratosphere/source/ldr/ldr_pm_api.cpp index 6e213438a..de73724dc 100644 --- a/stratosphere/libstratosphere/source/ldr/ldr_pm_api.cpp +++ b/stratosphere/libstratosphere/source/ldr/ldr_pm_api.cpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include #include -#include -#include - #include "ldr_ams.h" namespace ams::ldr::pm { diff --git a/stratosphere/libstratosphere/source/map/map_api.cpp b/stratosphere/libstratosphere/source/map/map_api.cpp index d3e5ef333..ca239272f 100644 --- a/stratosphere/libstratosphere/source/map/map_api.cpp +++ b/stratosphere/libstratosphere/source/map/map_api.cpp @@ -14,9 +14,7 @@ * along with this program. If not, see . */ -#include #include -#include namespace ams::map { diff --git a/stratosphere/libstratosphere/source/os/impl/os_inter_process_event.cpp b/stratosphere/libstratosphere/source/os/impl/os_inter_process_event.cpp index d6a5b31c9..7194571e5 100644 --- a/stratosphere/libstratosphere/source/os/impl/os_inter_process_event.cpp +++ b/stratosphere/libstratosphere/source/os/impl/os_inter_process_event.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include "os_inter_process_event.hpp" namespace ams::os::impl { diff --git a/stratosphere/libstratosphere/source/os/impl/os_inter_process_event.hpp b/stratosphere/libstratosphere/source/os/impl/os_inter_process_event.hpp index ad3d56e87..51e32c9ff 100644 --- a/stratosphere/libstratosphere/source/os/impl/os_inter_process_event.hpp +++ b/stratosphere/libstratosphere/source/os/impl/os_inter_process_event.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include diff --git a/stratosphere/libstratosphere/source/os/os_event.cpp b/stratosphere/libstratosphere/source/os/os_event.cpp index 0aa4d3485..1e146b9e5 100644 --- a/stratosphere/libstratosphere/source/os/os_event.cpp +++ b/stratosphere/libstratosphere/source/os/os_event.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include "impl/os_waitable_object_list.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/source/os/os_interrupt_event.cpp b/stratosphere/libstratosphere/source/os/os_interrupt_event.cpp index 4fdeba40b..c9ee8197d 100644 --- a/stratosphere/libstratosphere/source/os/os_interrupt_event.cpp +++ b/stratosphere/libstratosphere/source/os/os_interrupt_event.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include "impl/os_waitable_object_list.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/source/os/os_message_queue.cpp b/stratosphere/libstratosphere/source/os/os_message_queue.cpp index 6d0a547a3..17accc8a8 100644 --- a/stratosphere/libstratosphere/source/os/os_message_queue.cpp +++ b/stratosphere/libstratosphere/source/os/os_message_queue.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include "impl/os_waitable_object_list.hpp" namespace ams::os { diff --git a/stratosphere/libstratosphere/source/os/os_waitable_holder.cpp b/stratosphere/libstratosphere/source/os/os_waitable_holder.cpp index e0f03b52f..1221e4469 100644 --- a/stratosphere/libstratosphere/source/os/os_waitable_holder.cpp +++ b/stratosphere/libstratosphere/source/os/os_waitable_holder.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include "impl/os_waitable_holder_impl.hpp" #include "impl/os_waitable_manager_impl.hpp" diff --git a/stratosphere/libstratosphere/source/os/os_waitable_manager.cpp b/stratosphere/libstratosphere/source/os/os_waitable_manager.cpp index 434ddfbd6..3d00554e5 100644 --- a/stratosphere/libstratosphere/source/os/os_waitable_manager.cpp +++ b/stratosphere/libstratosphere/source/os/os_waitable_manager.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include "impl/os_waitable_holder_impl.hpp" #include "impl/os_waitable_manager_impl.hpp" diff --git a/stratosphere/libstratosphere/source/patcher/patcher_api.cpp b/stratosphere/libstratosphere/source/patcher/patcher_api.cpp index 8fbe4a43a..e46b6a9d4 100644 --- a/stratosphere/libstratosphere/source/patcher/patcher_api.cpp +++ b/stratosphere/libstratosphere/source/patcher/patcher_api.cpp @@ -13,17 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include #include -#include - -#include #include -#include /* IPS Patching adapted from Luma3DS (https://github.com/AuroraWright/Luma3DS/blob/master/sysmodules/loader/source/patcher.c) */ diff --git a/stratosphere/libstratosphere/source/pm/pm_boot_mode_api.cpp b/stratosphere/libstratosphere/source/pm/pm_boot_mode_api.cpp index 5e4e86144..48a7b2e86 100644 --- a/stratosphere/libstratosphere/source/pm/pm_boot_mode_api.cpp +++ b/stratosphere/libstratosphere/source/pm/pm_boot_mode_api.cpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include -#include namespace ams::pm::bm { diff --git a/stratosphere/libstratosphere/source/pm/pm_dmnt_api.cpp b/stratosphere/libstratosphere/source/pm/pm_dmnt_api.cpp index 725346371..b42016d8f 100644 --- a/stratosphere/libstratosphere/source/pm/pm_dmnt_api.cpp +++ b/stratosphere/libstratosphere/source/pm/pm_dmnt_api.cpp @@ -13,10 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include -#include #include "pm_ams.h" diff --git a/stratosphere/libstratosphere/source/pm/pm_info_api.cpp b/stratosphere/libstratosphere/source/pm/pm_info_api.cpp index 5685208a9..8b6eeead6 100644 --- a/stratosphere/libstratosphere/source/pm/pm_info_api.cpp +++ b/stratosphere/libstratosphere/source/pm/pm_info_api.cpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include -#include #include -#include - #include "pm_ams.h" namespace ams::pm::info { diff --git a/stratosphere/libstratosphere/source/pm/pm_shell_api.cpp b/stratosphere/libstratosphere/source/pm/pm_shell_api.cpp index d7c4dbc97..c71c6a917 100644 --- a/stratosphere/libstratosphere/source/pm/pm_shell_api.cpp +++ b/stratosphere/libstratosphere/source/pm/pm_shell_api.cpp @@ -13,10 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include -#include namespace ams::pm::shell { diff --git a/stratosphere/libstratosphere/source/result/result_on_assertion.cpp b/stratosphere/libstratosphere/source/result/result_on_assertion.cpp index 160b220fb..848138fdc 100644 --- a/stratosphere/libstratosphere/source/result/result_on_assertion.cpp +++ b/stratosphere/libstratosphere/source/result/result_on_assertion.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include namespace ams::result { diff --git a/stratosphere/libstratosphere/source/rnd/rnd_api.cpp b/stratosphere/libstratosphere/source/rnd/rnd_api.cpp index c8cc07dfe..e0553c748 100644 --- a/stratosphere/libstratosphere/source/rnd/rnd_api.cpp +++ b/stratosphere/libstratosphere/source/rnd/rnd_api.cpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include -#include #include -#include namespace ams::rnd { diff --git a/stratosphere/libstratosphere/source/sf/cmif/sf_cmif_domain_service_object.cpp b/stratosphere/libstratosphere/source/sf/cmif/sf_cmif_domain_service_object.cpp index 57c53bb91..05705538b 100644 --- a/stratosphere/libstratosphere/source/sf/cmif/sf_cmif_domain_service_object.cpp +++ b/stratosphere/libstratosphere/source/sf/cmif/sf_cmif_domain_service_object.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include namespace ams::sf::cmif { diff --git a/stratosphere/libstratosphere/source/sf/cmif/sf_cmif_service_object_holder.cpp b/stratosphere/libstratosphere/source/sf/cmif/sf_cmif_service_object_holder.cpp index 7bdcc4a10..c842b0384 100644 --- a/stratosphere/libstratosphere/source/sf/cmif/sf_cmif_service_object_holder.cpp +++ b/stratosphere/libstratosphere/source/sf/cmif/sf_cmif_service_object_holder.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include #include namespace ams::sf::cmif { diff --git a/stratosphere/libstratosphere/source/sm/sm_api.cpp b/stratosphere/libstratosphere/source/sm/sm_api.cpp index 7fa6666ad..a865b6476 100644 --- a/stratosphere/libstratosphere/source/sm/sm_api.cpp +++ b/stratosphere/libstratosphere/source/sm/sm_api.cpp @@ -13,12 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - -#include "sm_ams.h" #include "sm_utils.hpp" namespace ams::sm { diff --git a/stratosphere/libstratosphere/source/sm/sm_manager_api.cpp b/stratosphere/libstratosphere/source/sm/sm_manager_api.cpp index e00977f28..374428c43 100644 --- a/stratosphere/libstratosphere/source/sm/sm_manager_api.cpp +++ b/stratosphere/libstratosphere/source/sm/sm_manager_api.cpp @@ -13,14 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include - -#include "smm_ams.h" #include "sm_utils.hpp" +#include "smm_ams.h" namespace ams::sm::manager { diff --git a/stratosphere/libstratosphere/source/sm/sm_mitm_api.cpp b/stratosphere/libstratosphere/source/sm/sm_mitm_api.cpp index 0f475b85e..037cb6b3f 100644 --- a/stratosphere/libstratosphere/source/sm/sm_mitm_api.cpp +++ b/stratosphere/libstratosphere/source/sm/sm_mitm_api.cpp @@ -13,12 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - -#include "sm_ams.h" #include "sm_utils.hpp" namespace ams::sm::mitm { diff --git a/stratosphere/libstratosphere/source/sm/sm_utils.cpp b/stratosphere/libstratosphere/source/sm/sm_utils.cpp index 4f553faad..5c920b001 100644 --- a/stratosphere/libstratosphere/source/sm/sm_utils.cpp +++ b/stratosphere/libstratosphere/source/sm/sm_utils.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "sm_utils.hpp" namespace ams::sm::impl { diff --git a/stratosphere/libstratosphere/source/sm/sm_utils.hpp b/stratosphere/libstratosphere/source/sm/sm_utils.hpp index 5a15bf6c7..3b1804f02 100644 --- a/stratosphere/libstratosphere/source/sm/sm_utils.hpp +++ b/stratosphere/libstratosphere/source/sm/sm_utils.hpp @@ -15,11 +15,7 @@ */ #pragma once - -#include #include -#include - #include "sm_ams.h" namespace ams::sm::impl { diff --git a/stratosphere/libstratosphere/source/spl/smc/spl_smc.cpp b/stratosphere/libstratosphere/source/spl/smc/spl_smc.cpp index b8692755c..50aac6f07 100644 --- a/stratosphere/libstratosphere/source/spl/smc/spl_smc.cpp +++ b/stratosphere/libstratosphere/source/spl/smc/spl_smc.cpp @@ -13,10 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include -#include namespace ams::spl::smc { diff --git a/stratosphere/libstratosphere/source/spl/spl_api.cpp b/stratosphere/libstratosphere/source/spl/spl_api.cpp index a9bc8f1f5..6edd72f0e 100644 --- a/stratosphere/libstratosphere/source/spl/spl_api.cpp +++ b/stratosphere/libstratosphere/source/spl/spl_api.cpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include -#include namespace ams::spl { diff --git a/stratosphere/libstratosphere/source/updater/updater_bis_management.cpp b/stratosphere/libstratosphere/source/updater/updater_bis_management.cpp index 879810d90..29a34b482 100644 --- a/stratosphere/libstratosphere/source/updater/updater_bis_management.cpp +++ b/stratosphere/libstratosphere/source/updater/updater_bis_management.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "updater_bis_management.hpp" namespace ams::updater { diff --git a/stratosphere/libstratosphere/source/updater/updater_bis_management.hpp b/stratosphere/libstratosphere/source/updater/updater_bis_management.hpp index df7c1a85a..73ae1e7db 100644 --- a/stratosphere/libstratosphere/source/updater/updater_bis_management.hpp +++ b/stratosphere/libstratosphere/source/updater/updater_bis_management.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include #include -#include namespace ams::updater { diff --git a/stratosphere/libstratosphere/source/updater/updater_bis_save.cpp b/stratosphere/libstratosphere/source/updater/updater_bis_save.cpp index 6b0c1133f..fba422673 100644 --- a/stratosphere/libstratosphere/source/updater/updater_bis_save.cpp +++ b/stratosphere/libstratosphere/source/updater/updater_bis_save.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "updater_bis_save.hpp" namespace ams::updater { diff --git a/stratosphere/libstratosphere/source/updater/updater_bis_save.hpp b/stratosphere/libstratosphere/source/updater/updater_bis_save.hpp index a3b0ecbc1..8f3dea2c2 100644 --- a/stratosphere/libstratosphere/source/updater/updater_bis_save.hpp +++ b/stratosphere/libstratosphere/source/updater/updater_bis_save.hpp @@ -15,10 +15,6 @@ */ #pragma once -#include -#include -#include - #include "updater_bis_management.hpp" namespace ams::updater { diff --git a/stratosphere/libstratosphere/source/updater/updater_files.cpp b/stratosphere/libstratosphere/source/updater/updater_files.cpp index 0c172d2c1..0ddab9659 100644 --- a/stratosphere/libstratosphere/source/updater/updater_files.cpp +++ b/stratosphere/libstratosphere/source/updater/updater_files.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "updater_files.hpp" namespace ams::updater { diff --git a/stratosphere/libstratosphere/source/updater/updater_files.hpp b/stratosphere/libstratosphere/source/updater/updater_files.hpp index 369d4c095..d1c584519 100644 --- a/stratosphere/libstratosphere/source/updater/updater_files.hpp +++ b/stratosphere/libstratosphere/source/updater/updater_files.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::updater { diff --git a/stratosphere/libstratosphere/source/updater/updater_paths.cpp b/stratosphere/libstratosphere/source/updater/updater_paths.cpp index 355708c8d..8c659a116 100644 --- a/stratosphere/libstratosphere/source/updater/updater_paths.cpp +++ b/stratosphere/libstratosphere/source/updater/updater_paths.cpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include #include - #include "updater_paths.hpp" namespace ams::updater { diff --git a/stratosphere/libstratosphere/source/updater/updater_paths.hpp b/stratosphere/libstratosphere/source/updater/updater_paths.hpp index 8a5739218..a7a0e5944 100644 --- a/stratosphere/libstratosphere/source/updater/updater_paths.hpp +++ b/stratosphere/libstratosphere/source/updater/updater_paths.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::updater { diff --git a/stratosphere/libstratosphere/source/util/util_compression.cpp b/stratosphere/libstratosphere/source/util/util_compression.cpp index 54199f276..687484436 100644 --- a/stratosphere/libstratosphere/source/util/util_compression.cpp +++ b/stratosphere/libstratosphere/source/util/util_compression.cpp @@ -13,11 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include -#include - #include "lz4.h" namespace ams::util { diff --git a/stratosphere/libstratosphere/source/util/util_ini.cpp b/stratosphere/libstratosphere/source/util/util_ini.cpp index 006405404..aac3c20b6 100644 --- a/stratosphere/libstratosphere/source/util/util_ini.cpp +++ b/stratosphere/libstratosphere/source/util/util_ini.cpp @@ -14,10 +14,7 @@ * along with this program. If not, see . */ -#include #include -#include - #include "ini.h" namespace ams::util::ini { diff --git a/stratosphere/loader/source/ldr_arguments.cpp b/stratosphere/loader/source/ldr_arguments.cpp index c23e60cd2..6496ccdc3 100644 --- a/stratosphere/loader/source/ldr_arguments.cpp +++ b/stratosphere/loader/source/ldr_arguments.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "ldr_arguments.hpp" namespace ams::ldr::args { diff --git a/stratosphere/loader/source/ldr_arguments.hpp b/stratosphere/loader/source/ldr_arguments.hpp index 66abdda07..478acfaea 100644 --- a/stratosphere/loader/source/ldr_arguments.hpp +++ b/stratosphere/loader/source/ldr_arguments.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::ldr::args { diff --git a/stratosphere/loader/source/ldr_capabilities.cpp b/stratosphere/loader/source/ldr_capabilities.cpp index 01ce1b90e..bcb57d00c 100644 --- a/stratosphere/loader/source/ldr_capabilities.cpp +++ b/stratosphere/loader/source/ldr_capabilities.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "ldr_capabilities.hpp" namespace ams::ldr::caps { diff --git a/stratosphere/loader/source/ldr_capabilities.hpp b/stratosphere/loader/source/ldr_capabilities.hpp index e98a5a56e..1d0440841 100644 --- a/stratosphere/loader/source/ldr_capabilities.hpp +++ b/stratosphere/loader/source/ldr_capabilities.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::ldr::caps { diff --git a/stratosphere/loader/source/ldr_content_management.cpp b/stratosphere/loader/source/ldr_content_management.cpp index 4c3ddaa20..43f6ce615 100644 --- a/stratosphere/loader/source/ldr_content_management.cpp +++ b/stratosphere/loader/source/ldr_content_management.cpp @@ -14,8 +14,6 @@ * along with this program. If not, see . */ #include -#include - #include "ldr_content_management.hpp" #include "ldr_ecs.hpp" diff --git a/stratosphere/loader/source/ldr_content_management.hpp b/stratosphere/loader/source/ldr_content_management.hpp index b6a789ec7..029428206 100644 --- a/stratosphere/loader/source/ldr_content_management.hpp +++ b/stratosphere/loader/source/ldr_content_management.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::ldr { diff --git a/stratosphere/loader/source/ldr_ecs.cpp b/stratosphere/loader/source/ldr_ecs.cpp index c96928151..3ba4caa1e 100644 --- a/stratosphere/loader/source/ldr_ecs.cpp +++ b/stratosphere/loader/source/ldr_ecs.cpp @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include "ldr_ecs.hpp" namespace ams::ldr::ecs { diff --git a/stratosphere/loader/source/ldr_ecs.hpp b/stratosphere/loader/source/ldr_ecs.hpp index 481125b09..40d5c6d98 100644 --- a/stratosphere/loader/source/ldr_ecs.hpp +++ b/stratosphere/loader/source/ldr_ecs.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::ldr::ecs { diff --git a/stratosphere/loader/source/ldr_launch_record.cpp b/stratosphere/loader/source/ldr_launch_record.cpp index 314f25411..6c9ee86f0 100644 --- a/stratosphere/loader/source/ldr_launch_record.cpp +++ b/stratosphere/loader/source/ldr_launch_record.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "ldr_launch_record.hpp" namespace ams::ldr { diff --git a/stratosphere/loader/source/ldr_launch_record.hpp b/stratosphere/loader/source/ldr_launch_record.hpp index 9fac03a10..f0288e325 100644 --- a/stratosphere/loader/source/ldr_launch_record.hpp +++ b/stratosphere/loader/source/ldr_launch_record.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::ldr { diff --git a/stratosphere/loader/source/ldr_loader_service.cpp b/stratosphere/loader/source/ldr_loader_service.cpp index 5481e9411..a1652c6d6 100644 --- a/stratosphere/loader/source/ldr_loader_service.cpp +++ b/stratosphere/loader/source/ldr_loader_service.cpp @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include "ldr_arguments.hpp" #include "ldr_content_management.hpp" #include "ldr_ecs.hpp" diff --git a/stratosphere/loader/source/ldr_loader_service.hpp b/stratosphere/loader/source/ldr_loader_service.hpp index e150cf9d3..f6cada310 100644 --- a/stratosphere/loader/source/ldr_loader_service.hpp +++ b/stratosphere/loader/source/ldr_loader_service.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::ldr { diff --git a/stratosphere/loader/source/ldr_main.cpp b/stratosphere/loader/source/ldr_main.cpp index 8bf6fa5ac..9ced0ef71 100644 --- a/stratosphere/loader/source/ldr_main.cpp +++ b/stratosphere/loader/source/ldr_main.cpp @@ -14,17 +14,6 @@ * along with this program. If not, see . */ -#include -#include -#include -#include - -#include -#include -#include -#include -#include - #include "ldr_loader_service.hpp" extern "C" { diff --git a/stratosphere/loader/source/ldr_meta.cpp b/stratosphere/loader/source/ldr_meta.cpp index bef672d0d..2a7a8418e 100644 --- a/stratosphere/loader/source/ldr_meta.cpp +++ b/stratosphere/loader/source/ldr_meta.cpp @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include "ldr_capabilities.hpp" #include "ldr_content_management.hpp" #include "ldr_meta.hpp" diff --git a/stratosphere/loader/source/ldr_meta.hpp b/stratosphere/loader/source/ldr_meta.hpp index 66a3dea9d..8f5b8afa5 100644 --- a/stratosphere/loader/source/ldr_meta.hpp +++ b/stratosphere/loader/source/ldr_meta.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::ldr { diff --git a/stratosphere/loader/source/ldr_patcher.cpp b/stratosphere/loader/source/ldr_patcher.cpp index 38b6c2489..4f109be7e 100644 --- a/stratosphere/loader/source/ldr_patcher.cpp +++ b/stratosphere/loader/source/ldr_patcher.cpp @@ -13,11 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - #include "ldr_patcher.hpp" namespace ams::ldr { diff --git a/stratosphere/loader/source/ldr_patcher.hpp b/stratosphere/loader/source/ldr_patcher.hpp index 3f1c6b30e..60e02b1bd 100644 --- a/stratosphere/loader/source/ldr_patcher.hpp +++ b/stratosphere/loader/source/ldr_patcher.hpp @@ -13,10 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include +#include namespace ams::ldr { diff --git a/stratosphere/loader/source/ldr_process_creation.cpp b/stratosphere/loader/source/ldr_process_creation.cpp index 8b5c0d2cb..0cce9eb24 100644 --- a/stratosphere/loader/source/ldr_process_creation.cpp +++ b/stratosphere/loader/source/ldr_process_creation.cpp @@ -13,12 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include - #include "ldr_capabilities.hpp" #include "ldr_content_management.hpp" #include "ldr_ecs.hpp" diff --git a/stratosphere/loader/source/ldr_process_creation.hpp b/stratosphere/loader/source/ldr_process_creation.hpp index 1d1704d52..f24028118 100644 --- a/stratosphere/loader/source/ldr_process_creation.hpp +++ b/stratosphere/loader/source/ldr_process_creation.hpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include - #include "ldr_arguments.hpp" namespace ams::ldr { diff --git a/stratosphere/loader/source/ldr_ro_manager.cpp b/stratosphere/loader/source/ldr_ro_manager.cpp index eaca6c34e..358fe1484 100644 --- a/stratosphere/loader/source/ldr_ro_manager.cpp +++ b/stratosphere/loader/source/ldr_ro_manager.cpp @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include "ldr_ro_manager.hpp" namespace ams::ldr::ro { diff --git a/stratosphere/loader/source/ldr_ro_manager.hpp b/stratosphere/loader/source/ldr_ro_manager.hpp index 4b1c929f8..6441f6831 100644 --- a/stratosphere/loader/source/ldr_ro_manager.hpp +++ b/stratosphere/loader/source/ldr_ro_manager.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::ldr::ro { diff --git a/stratosphere/pm/source/impl/pm_process_info.cpp b/stratosphere/pm/source/impl/pm_process_info.cpp index f38962eb3..eacd026d5 100644 --- a/stratosphere/pm/source/impl/pm_process_info.cpp +++ b/stratosphere/pm/source/impl/pm_process_info.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "pm_process_info.hpp" namespace ams::pm::impl { diff --git a/stratosphere/pm/source/impl/pm_process_info.hpp b/stratosphere/pm/source/impl/pm_process_info.hpp index 514b65fad..fa12dae49 100644 --- a/stratosphere/pm/source/impl/pm_process_info.hpp +++ b/stratosphere/pm/source/impl/pm_process_info.hpp @@ -13,13 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include -#include - #include "pm_process_manager.hpp" namespace ams::pm::impl { diff --git a/stratosphere/pm/source/impl/pm_process_manager.cpp b/stratosphere/pm/source/impl/pm_process_manager.cpp index 14bb7d8c1..6ad2d5f95 100644 --- a/stratosphere/pm/source/impl/pm_process_manager.cpp +++ b/stratosphere/pm/source/impl/pm_process_manager.cpp @@ -13,13 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include -#include - #include "pm_process_manager.hpp" #include "pm_resource_manager.hpp" diff --git a/stratosphere/pm/source/impl/pm_process_manager.hpp b/stratosphere/pm/source/impl/pm_process_manager.hpp index 4fe734044..2f525c71f 100644 --- a/stratosphere/pm/source/impl/pm_process_manager.hpp +++ b/stratosphere/pm/source/impl/pm_process_manager.hpp @@ -13,12 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include -#include namespace ams::pm::impl { diff --git a/stratosphere/pm/source/impl/pm_resource_manager.cpp b/stratosphere/pm/source/impl/pm_resource_manager.cpp index d9f840d3a..0babd157e 100644 --- a/stratosphere/pm/source/impl/pm_resource_manager.cpp +++ b/stratosphere/pm/source/impl/pm_resource_manager.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "pm_resource_manager.hpp" namespace ams::pm::resource { diff --git a/stratosphere/pm/source/impl/pm_resource_manager.hpp b/stratosphere/pm/source/impl/pm_resource_manager.hpp index 53e515e72..f100e3642 100644 --- a/stratosphere/pm/source/impl/pm_resource_manager.hpp +++ b/stratosphere/pm/source/impl/pm_resource_manager.hpp @@ -13,12 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include -#include namespace ams::pm::resource { diff --git a/stratosphere/pm/source/pm_boot_mode_service.cpp b/stratosphere/pm/source/pm_boot_mode_service.cpp index 66c080177..3935a76d0 100644 --- a/stratosphere/pm/source/pm_boot_mode_service.cpp +++ b/stratosphere/pm/source/pm_boot_mode_service.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "pm_boot_mode_service.hpp" namespace ams::pm::bm { diff --git a/stratosphere/pm/source/pm_boot_mode_service.hpp b/stratosphere/pm/source/pm_boot_mode_service.hpp index 44890fa2a..4e676d394 100644 --- a/stratosphere/pm/source/pm_boot_mode_service.hpp +++ b/stratosphere/pm/source/pm_boot_mode_service.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::pm::bm { diff --git a/stratosphere/pm/source/pm_debug_monitor_service.cpp b/stratosphere/pm/source/pm_debug_monitor_service.cpp index bf4780dbd..cda2a87d5 100644 --- a/stratosphere/pm/source/pm_debug_monitor_service.cpp +++ b/stratosphere/pm/source/pm_debug_monitor_service.cpp @@ -13,8 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include #include "pm_debug_monitor_service.hpp" #include "impl/pm_process_manager.hpp" diff --git a/stratosphere/pm/source/pm_debug_monitor_service.hpp b/stratosphere/pm/source/pm_debug_monitor_service.hpp index c610d0f91..6692dc66e 100644 --- a/stratosphere/pm/source/pm_debug_monitor_service.hpp +++ b/stratosphere/pm/source/pm_debug_monitor_service.hpp @@ -13,12 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include -#include namespace ams::pm::dmnt { diff --git a/stratosphere/pm/source/pm_info_service.cpp b/stratosphere/pm/source/pm_info_service.cpp index c7ada3d6e..890bd049e 100644 --- a/stratosphere/pm/source/pm_info_service.cpp +++ b/stratosphere/pm/source/pm_info_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "pm_info_service.hpp" #include "impl/pm_process_manager.hpp" diff --git a/stratosphere/pm/source/pm_info_service.hpp b/stratosphere/pm/source/pm_info_service.hpp index 47b778a8e..454265980 100644 --- a/stratosphere/pm/source/pm_info_service.hpp +++ b/stratosphere/pm/source/pm_info_service.hpp @@ -13,12 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include -#include namespace ams::pm::info { diff --git a/stratosphere/pm/source/pm_main.cpp b/stratosphere/pm/source/pm_main.cpp index 6040a051a..e28630233 100644 --- a/stratosphere/pm/source/pm_main.cpp +++ b/stratosphere/pm/source/pm_main.cpp @@ -13,17 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - -#include -#include -#include -#include -#include - #include "pm_boot_mode_service.hpp" #include "pm_debug_monitor_service.hpp" #include "pm_info_service.hpp" diff --git a/stratosphere/pm/source/pm_shell_service.cpp b/stratosphere/pm/source/pm_shell_service.cpp index 8f159c906..a67154248 100644 --- a/stratosphere/pm/source/pm_shell_service.cpp +++ b/stratosphere/pm/source/pm_shell_service.cpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "pm_shell_service.hpp" #include "impl/pm_process_manager.hpp" diff --git a/stratosphere/pm/source/pm_shell_service.hpp b/stratosphere/pm/source/pm_shell_service.hpp index ac6ee39b8..81245ebf9 100644 --- a/stratosphere/pm/source/pm_shell_service.hpp +++ b/stratosphere/pm/source/pm_shell_service.hpp @@ -13,12 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include -#include namespace ams::pm::shell { diff --git a/stratosphere/ro/source/impl/ro_nro_utils.cpp b/stratosphere/ro/source/impl/ro_nro_utils.cpp index 6606e823f..02abc7744 100644 --- a/stratosphere/ro/source/impl/ro_nro_utils.cpp +++ b/stratosphere/ro/source/impl/ro_nro_utils.cpp @@ -13,9 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include - #include "ro_nro_utils.hpp" namespace ams::ro::impl { diff --git a/stratosphere/ro/source/impl/ro_nro_utils.hpp b/stratosphere/ro/source/impl/ro_nro_utils.hpp index 84d20ee4d..f22435e49 100644 --- a/stratosphere/ro/source/impl/ro_nro_utils.hpp +++ b/stratosphere/ro/source/impl/ro_nro_utils.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include #include -#include namespace ams::ro::impl { diff --git a/stratosphere/ro/source/impl/ro_nrr_utils.cpp b/stratosphere/ro/source/impl/ro_nrr_utils.cpp index 0b7a9a743..4343ba7f1 100644 --- a/stratosphere/ro/source/impl/ro_nrr_utils.cpp +++ b/stratosphere/ro/source/impl/ro_nrr_utils.cpp @@ -13,9 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include - #include "ro_nrr_utils.hpp" #include "ro_service_impl.hpp" diff --git a/stratosphere/ro/source/impl/ro_nrr_utils.hpp b/stratosphere/ro/source/impl/ro_nrr_utils.hpp index 351a93681..2b66c36c6 100644 --- a/stratosphere/ro/source/impl/ro_nrr_utils.hpp +++ b/stratosphere/ro/source/impl/ro_nrr_utils.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include #include -#include namespace ams::ro::impl { diff --git a/stratosphere/ro/source/impl/ro_patcher.cpp b/stratosphere/ro/source/impl/ro_patcher.cpp index e4f5318aa..ec976422f 100644 --- a/stratosphere/ro/source/impl/ro_patcher.cpp +++ b/stratosphere/ro/source/impl/ro_patcher.cpp @@ -13,9 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include - #include "ro_patcher.hpp" namespace ams::ro::impl { diff --git a/stratosphere/ro/source/impl/ro_patcher.hpp b/stratosphere/ro/source/impl/ro_patcher.hpp index 2a9239097..310bc7f3b 100644 --- a/stratosphere/ro/source/impl/ro_patcher.hpp +++ b/stratosphere/ro/source/impl/ro_patcher.hpp @@ -15,8 +15,7 @@ */ #pragma once -#include -#include +#include namespace ams::ro::impl { diff --git a/stratosphere/ro/source/impl/ro_service_impl.cpp b/stratosphere/ro/source/impl/ro_service_impl.cpp index 2f957b109..66938cef2 100644 --- a/stratosphere/ro/source/impl/ro_service_impl.cpp +++ b/stratosphere/ro/source/impl/ro_service_impl.cpp @@ -13,13 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include -#include - #include "ro_nrr_utils.hpp" #include "ro_nro_utils.hpp" #include "ro_patcher.hpp" diff --git a/stratosphere/ro/source/impl/ro_service_impl.hpp b/stratosphere/ro/source/impl/ro_service_impl.hpp index 4bc646e85..0ca419c93 100644 --- a/stratosphere/ro/source/impl/ro_service_impl.hpp +++ b/stratosphere/ro/source/impl/ro_service_impl.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include #include -#include namespace ams::ro::impl { diff --git a/stratosphere/ro/source/ro_debug_monitor.cpp b/stratosphere/ro/source/ro_debug_monitor.cpp index f648d9155..4e41144cb 100644 --- a/stratosphere/ro/source/ro_debug_monitor.cpp +++ b/stratosphere/ro/source/ro_debug_monitor.cpp @@ -13,11 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - #include "ro_debug_monitor.hpp" #include "impl/ro_service_impl.hpp" diff --git a/stratosphere/ro/source/ro_debug_monitor.hpp b/stratosphere/ro/source/ro_debug_monitor.hpp index 0cbced5ee..f6cf6b618 100644 --- a/stratosphere/ro/source/ro_debug_monitor.hpp +++ b/stratosphere/ro/source/ro_debug_monitor.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::ro { diff --git a/stratosphere/ro/source/ro_main.cpp b/stratosphere/ro/source/ro_main.cpp index e60cf5194..9c16b5694 100644 --- a/stratosphere/ro/source/ro_main.cpp +++ b/stratosphere/ro/source/ro_main.cpp @@ -13,18 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - #include "ro_debug_monitor.hpp" #include "ro_service.hpp" diff --git a/stratosphere/ro/source/ro_service.cpp b/stratosphere/ro/source/ro_service.cpp index 9de7d0a29..1a3578a98 100644 --- a/stratosphere/ro/source/ro_service.cpp +++ b/stratosphere/ro/source/ro_service.cpp @@ -13,12 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include - #include "ro_service.hpp" #include "impl/ro_service_impl.hpp" diff --git a/stratosphere/ro/source/ro_service.hpp b/stratosphere/ro/source/ro_service.hpp index ddbb3b9fa..1676d941d 100644 --- a/stratosphere/ro/source/ro_service.hpp +++ b/stratosphere/ro/source/ro_service.hpp @@ -15,10 +15,7 @@ */ #pragma once -#include - #include -#include namespace ams::ro { diff --git a/stratosphere/sm/source/impl/sm_service_manager.cpp b/stratosphere/sm/source/impl/sm_service_manager.cpp index 1a4150cf5..50f0e5856 100644 --- a/stratosphere/sm/source/impl/sm_service_manager.cpp +++ b/stratosphere/sm/source/impl/sm_service_manager.cpp @@ -13,13 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include -#include - #include "sm_service_manager.hpp" namespace ams::sm::impl { diff --git a/stratosphere/sm/source/impl/sm_service_manager.hpp b/stratosphere/sm/source/impl/sm_service_manager.hpp index 155e93ae1..f07713aab 100644 --- a/stratosphere/sm/source/impl/sm_service_manager.hpp +++ b/stratosphere/sm/source/impl/sm_service_manager.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include -#include -#include +#include namespace ams::sm::impl { diff --git a/stratosphere/sm/source/sm_dmnt_service.cpp b/stratosphere/sm/source/sm_dmnt_service.cpp index f56a824e5..a5f25b9c1 100644 --- a/stratosphere/sm/source/sm_dmnt_service.cpp +++ b/stratosphere/sm/source/sm_dmnt_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "sm_dmnt_service.hpp" #include "impl/sm_service_manager.hpp" diff --git a/stratosphere/sm/source/sm_dmnt_service.hpp b/stratosphere/sm/source/sm_dmnt_service.hpp index bbf7c6e74..5f5ef657b 100644 --- a/stratosphere/sm/source/sm_dmnt_service.hpp +++ b/stratosphere/sm/source/sm_dmnt_service.hpp @@ -15,9 +15,7 @@ */ #pragma once -#include #include -#include namespace ams::sm { diff --git a/stratosphere/sm/source/sm_main.cpp b/stratosphere/sm/source/sm_main.cpp index e35d1522e..eb21c493c 100644 --- a/stratosphere/sm/source/sm_main.cpp +++ b/stratosphere/sm/source/sm_main.cpp @@ -13,19 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include -#include - -#include -#include - #include "sm_user_service.hpp" #include "sm_manager_service.hpp" #include "sm_dmnt_service.hpp" - #include "impl/sm_service_manager.hpp" extern "C" { diff --git a/stratosphere/sm/source/sm_manager_service.cpp b/stratosphere/sm/source/sm_manager_service.cpp index 2438b83fa..9e646f390 100644 --- a/stratosphere/sm/source/sm_manager_service.cpp +++ b/stratosphere/sm/source/sm_manager_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "sm_manager_service.hpp" #include "impl/sm_service_manager.hpp" diff --git a/stratosphere/sm/source/sm_manager_service.hpp b/stratosphere/sm/source/sm_manager_service.hpp index 6292a67ca..0fb9f1a9c 100644 --- a/stratosphere/sm/source/sm_manager_service.hpp +++ b/stratosphere/sm/source/sm_manager_service.hpp @@ -13,12 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include -#include namespace ams::sm { diff --git a/stratosphere/sm/source/sm_user_service.cpp b/stratosphere/sm/source/sm_user_service.cpp index ad8ff8b9f..6f8c22b7c 100644 --- a/stratosphere/sm/source/sm_user_service.cpp +++ b/stratosphere/sm/source/sm_user_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "sm_user_service.hpp" #include "impl/sm_service_manager.hpp" diff --git a/stratosphere/sm/source/sm_user_service.hpp b/stratosphere/sm/source/sm_user_service.hpp index 1b3d42739..9edb80529 100644 --- a/stratosphere/sm/source/sm_user_service.hpp +++ b/stratosphere/sm/source/sm_user_service.hpp @@ -15,10 +15,7 @@ */ #pragma once -#include #include -#include -#include namespace ams::sm { diff --git a/stratosphere/spl/source/spl_api_impl.cpp b/stratosphere/spl/source/spl_api_impl.cpp index 2451125a3..43761601f 100644 --- a/stratosphere/spl/source/spl_api_impl.cpp +++ b/stratosphere/spl/source/spl_api_impl.cpp @@ -13,11 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - #include "spl_api_impl.hpp" #include "spl_ctr_drbg.hpp" diff --git a/stratosphere/spl/source/spl_api_impl.hpp b/stratosphere/spl/source/spl_api_impl.hpp index 03c3573db..d25529526 100644 --- a/stratosphere/spl/source/spl_api_impl.hpp +++ b/stratosphere/spl/source/spl_api_impl.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::spl::impl { diff --git a/stratosphere/spl/source/spl_crypto_service.cpp b/stratosphere/spl/source/spl_crypto_service.cpp index 600ab49d1..4397e2e68 100644 --- a/stratosphere/spl/source/spl_crypto_service.cpp +++ b/stratosphere/spl/source/spl_crypto_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "spl_api_impl.hpp" #include "spl_crypto_service.hpp" diff --git a/stratosphere/spl/source/spl_crypto_service.hpp b/stratosphere/spl/source/spl_crypto_service.hpp index 36f75c62a..c817b0bea 100644 --- a/stratosphere/spl/source/spl_crypto_service.hpp +++ b/stratosphere/spl/source/spl_crypto_service.hpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include - #include "spl_general_service.hpp" namespace ams::spl { diff --git a/stratosphere/spl/source/spl_ctr_drbg.cpp b/stratosphere/spl/source/spl_ctr_drbg.cpp index 2dd90b11b..a83a6ea02 100644 --- a/stratosphere/spl/source/spl_ctr_drbg.cpp +++ b/stratosphere/spl/source/spl_ctr_drbg.cpp @@ -13,11 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - #include "spl_ctr_drbg.hpp" namespace ams::spl { diff --git a/stratosphere/spl/source/spl_ctr_drbg.hpp b/stratosphere/spl/source/spl_ctr_drbg.hpp index 53c21da4c..d17cc1b57 100644 --- a/stratosphere/spl/source/spl_ctr_drbg.hpp +++ b/stratosphere/spl/source/spl_ctr_drbg.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::spl { diff --git a/stratosphere/spl/source/spl_deprecated_service.cpp b/stratosphere/spl/source/spl_deprecated_service.cpp index c8b33b975..9fef93fb1 100644 --- a/stratosphere/spl/source/spl_deprecated_service.cpp +++ b/stratosphere/spl/source/spl_deprecated_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "spl_api_impl.hpp" #include "spl_deprecated_service.hpp" diff --git a/stratosphere/spl/source/spl_deprecated_service.hpp b/stratosphere/spl/source/spl_deprecated_service.hpp index 9f0978b1a..39aae3ba7 100644 --- a/stratosphere/spl/source/spl_deprecated_service.hpp +++ b/stratosphere/spl/source/spl_deprecated_service.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::spl { diff --git a/stratosphere/spl/source/spl_es_service.cpp b/stratosphere/spl/source/spl_es_service.cpp index e27fa4c25..ed5f2d04a 100644 --- a/stratosphere/spl/source/spl_es_service.cpp +++ b/stratosphere/spl/source/spl_es_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "spl_api_impl.hpp" #include "spl_es_service.hpp" diff --git a/stratosphere/spl/source/spl_es_service.hpp b/stratosphere/spl/source/spl_es_service.hpp index e827d006e..d08681a38 100644 --- a/stratosphere/spl/source/spl_es_service.hpp +++ b/stratosphere/spl/source/spl_es_service.hpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include - #include "spl_rsa_service.hpp" namespace ams::spl { diff --git a/stratosphere/spl/source/spl_fs_service.cpp b/stratosphere/spl/source/spl_fs_service.cpp index e191ae05f..b4e7255cd 100644 --- a/stratosphere/spl/source/spl_fs_service.cpp +++ b/stratosphere/spl/source/spl_fs_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "spl_api_impl.hpp" #include "spl_fs_service.hpp" diff --git a/stratosphere/spl/source/spl_fs_service.hpp b/stratosphere/spl/source/spl_fs_service.hpp index 6f5ab9b4d..7478f7aaa 100644 --- a/stratosphere/spl/source/spl_fs_service.hpp +++ b/stratosphere/spl/source/spl_fs_service.hpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include - #include "spl_crypto_service.hpp" namespace ams::spl { diff --git a/stratosphere/spl/source/spl_general_service.cpp b/stratosphere/spl/source/spl_general_service.cpp index f655be8b5..a39473df6 100644 --- a/stratosphere/spl/source/spl_general_service.cpp +++ b/stratosphere/spl/source/spl_general_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "spl_api_impl.hpp" #include "spl_general_service.hpp" diff --git a/stratosphere/spl/source/spl_general_service.hpp b/stratosphere/spl/source/spl_general_service.hpp index 9bd35d1e4..1261a5ab9 100644 --- a/stratosphere/spl/source/spl_general_service.hpp +++ b/stratosphere/spl/source/spl_general_service.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::spl { diff --git a/stratosphere/spl/source/spl_main.cpp b/stratosphere/spl/source/spl_main.cpp index d4eaa5717..c43b6fa13 100644 --- a/stratosphere/spl/source/spl_main.cpp +++ b/stratosphere/spl/source/spl_main.cpp @@ -13,15 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include -#include - -#include -#include -#include - #include "spl_api_impl.hpp" #include "spl_random_service.hpp" diff --git a/stratosphere/spl/source/spl_manu_service.cpp b/stratosphere/spl/source/spl_manu_service.cpp index 458e649d7..8825d86a8 100644 --- a/stratosphere/spl/source/spl_manu_service.cpp +++ b/stratosphere/spl/source/spl_manu_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "spl_api_impl.hpp" #include "spl_manu_service.hpp" diff --git a/stratosphere/spl/source/spl_manu_service.hpp b/stratosphere/spl/source/spl_manu_service.hpp index 371d48a56..8667f6638 100644 --- a/stratosphere/spl/source/spl_manu_service.hpp +++ b/stratosphere/spl/source/spl_manu_service.hpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include - #include "spl_rsa_service.hpp" namespace ams::spl { diff --git a/stratosphere/spl/source/spl_random_service.cpp b/stratosphere/spl/source/spl_random_service.cpp index f307900ef..932d17ce9 100644 --- a/stratosphere/spl/source/spl_random_service.cpp +++ b/stratosphere/spl/source/spl_random_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "spl_api_impl.hpp" #include "spl_random_service.hpp" diff --git a/stratosphere/spl/source/spl_random_service.hpp b/stratosphere/spl/source/spl_random_service.hpp index 408144c83..2d64a83ee 100644 --- a/stratosphere/spl/source/spl_random_service.hpp +++ b/stratosphere/spl/source/spl_random_service.hpp @@ -13,11 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include namespace ams::spl { diff --git a/stratosphere/spl/source/spl_rsa_service.cpp b/stratosphere/spl/source/spl_rsa_service.cpp index 17ebd27d0..ab61b9141 100644 --- a/stratosphere/spl/source/spl_rsa_service.cpp +++ b/stratosphere/spl/source/spl_rsa_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "spl_api_impl.hpp" #include "spl_rsa_service.hpp" diff --git a/stratosphere/spl/source/spl_rsa_service.hpp b/stratosphere/spl/source/spl_rsa_service.hpp index a428eb063..5ced88713 100644 --- a/stratosphere/spl/source/spl_rsa_service.hpp +++ b/stratosphere/spl/source/spl_rsa_service.hpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include - #include "spl_crypto_service.hpp" namespace ams::spl { diff --git a/stratosphere/spl/source/spl_ssl_service.cpp b/stratosphere/spl/source/spl_ssl_service.cpp index 12b2d4687..4f57c21b9 100644 --- a/stratosphere/spl/source/spl_ssl_service.cpp +++ b/stratosphere/spl/source/spl_ssl_service.cpp @@ -13,10 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include -#include - #include "spl_api_impl.hpp" #include "spl_ssl_service.hpp" diff --git a/stratosphere/spl/source/spl_ssl_service.hpp b/stratosphere/spl/source/spl_ssl_service.hpp index 845097cb7..3c3aa12c7 100644 --- a/stratosphere/spl/source/spl_ssl_service.hpp +++ b/stratosphere/spl/source/spl_ssl_service.hpp @@ -13,12 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include -#include - #include "spl_rsa_service.hpp" namespace ams::spl {