From f7f29f645ad68da49bfdb11d7aedd6924f0d8b10 Mon Sep 17 00:00:00 2001 From: Maufeat Date: Sun, 23 Nov 2025 20:52:15 +0100 Subject: [PATCH] fix some formatting + compilation error --- src/core/CMakeLists.txt | 8 +- src/core/file_sys/control_metadata.h | 52 +-- src/core/hle/service/am/am_types.h | 10 +- src/core/hle/service/am/applet_manager.cpp | 5 +- .../am/service/application_creator.cpp | 1 - .../set/setting_formats/system_settings.h | 332 +++++------------- 6 files changed, 100 insertions(+), 308 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 923dd8ea9a..d1bbf37eb9 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -487,10 +487,10 @@ add_library(core STATIC hle/service/am/service/library_applet_self_accessor.h hle/service/am/service/lock_accessor.cpp hle/service/am/service/lock_accessor.h - hle/service/am/service/overlay_functions.cpp - hle/service/am/service/overlay_functions.h - hle/service/am/service/overlay_applet_proxy.cpp - hle/service/am/service/overlay_applet_proxy.h + hle/service/am/service/overlay_functions.cpp + hle/service/am/service/overlay_functions.h + hle/service/am/service/overlay_applet_proxy.cpp + hle/service/am/service/overlay_applet_proxy.h hle/service/am/service/process_winding_controller.cpp hle/service/am/service/process_winding_controller.h hle/service/am/service/self_controller.cpp diff --git a/src/core/file_sys/control_metadata.h b/src/core/file_sys/control_metadata.h index 7798f5a80e..c9b2c9f836 100644 --- a/src/core/file_sys/control_metadata.h +++ b/src/core/file_sys/control_metadata.h @@ -41,10 +41,7 @@ namespace FileSys { bool screenshot_enabled; u8 video_capture_mode; bool data_loss_confirmation; - INSERT_PADDING_BYTES ( - - 1 - ); + INSERT_PADDING_BYTES (1); u64_le presence_group_id; std::array rating_age; std::array version_string; @@ -60,16 +57,10 @@ namespace FileSys { u8 logo_type; u8 logo_handling; bool runtime_add_on_content_install; - INSERT_PADDING_BYTES ( - - 5 - ); + INSERT_PADDING_BYTES (5); u64_le seed_for_pseudo_device_id; std::array bcat_passphrase; - INSERT_PADDING_BYTES ( - - 7 - ); + INSERT_PADDING_BYTES (7); u64_le user_account_save_data_max_size; u64_le user_account_save_data_max_journal_size; u64_le device_save_data_max_size; @@ -79,47 +70,25 @@ namespace FileSys { u64_le cache_storage_journal_size; u64_le cache_storage_data_and_journal_max_size; u16_le cache_storage_max_index; - INSERT_PADDING_BYTES ( - - 0x8B - ); + INSERT_PADDING_BYTES (0x8B); u8 app_error_code_prefix; - INSERT_PADDING_BYTES ( - - 1 - ); + INSERT_PADDING_BYTES (1); u8 acd_index; u8 apparent_platform; - INSERT_PADDING_BYTES ( - - 0x22F - ); + INSERT_PADDING_BYTES (0x22F); std::array app_control_data_condition; u8 initial_program_index; - INSERT_PADDING_BYTES ( - - 2 - ); + INSERT_PADDING_BYTES (2); u32_le accessible_program_index_flags; u8 album_file_export; - INSERT_PADDING_BYTES ( - - 7 - ); + INSERT_PADDING_BYTES (7); std::array save_data_certificate_bytes; u8 has_ingame_voice_chat; - INSERT_PADDING_BYTES ( - - 3 - ); + INSERT_PADDING_BYTES (3); u32_le supported_extra_addon_content_flag; - INSERT_PADDING_BYTES ( - - 0x698 - ); + INSERT_PADDING_BYTES (0x698); std::array platform_specific_region; }; - static_assert(sizeof(RawNACP) == 0x4000, "RawNACP has incorrect size."); // A language on the NX. These are for names and icons. @@ -143,7 +112,6 @@ namespace FileSys { Default = 255, }; - extern const std::array LANGUAGE_NAMES; // A class representing the format used by NX metadata files, typically named Control.nacp. diff --git a/src/core/hle/service/am/am_types.h b/src/core/hle/service/am/am_types.h index e0082d1b67..83af530cfe 100644 --- a/src/core/hle/service/am/am_types.h +++ b/src/core/hle/service/am/am_types.h @@ -53,10 +53,7 @@ namespace Service::AM { struct AppletProcessLaunchReason { u8 flag; - INSERT_PADDING_BYTES ( - - 3 - ); + INSERT_PADDING_BYTES (3); }; static_assert(sizeof(AppletProcessLaunchReason) == 0x4, @@ -216,10 +213,7 @@ namespace Service::AM { struct AppletIdentityInfo { AppletId applet_id; - INSERT_PADDING_BYTES ( - - 0x4 - ); + INSERT_PADDING_BYTES (0x4); u64 application_id; }; diff --git a/src/core/hle/service/am/applet_manager.cpp b/src/core/hle/service/am/applet_manager.cpp index 7fd77d3d33..bd7d033226 100644 --- a/src/core/hle/service/am/applet_manager.cpp +++ b/src/core/hle/service/am/applet_manager.cpp @@ -28,10 +28,7 @@ namespace Service::AM { u32 magic; u32 is_account_selected; Common::UUID current_user; - INSERT_PADDING_BYTES ( - - 0x70 - ); + INSERT_PADDING_BYTES (0x70); }; static_assert(sizeof(LaunchParameterAccountPreselectedUser) == 0x88); diff --git a/src/core/hle/service/am/service/application_creator.cpp b/src/core/hle/service/am/service/application_creator.cpp index e3171445d4..2e125b3d17 100644 --- a/src/core/hle/service/am/service/application_creator.cpp +++ b/src/core/hle/service/am/service/application_creator.cpp @@ -84,7 +84,6 @@ namespace Service::AM { std::vector control; std::unique_ptr loader; - Loader::ResultStatus result; auto process = CreateProcess(system, application_id, 1, 21); diff --git a/src/core/hle/service/set/setting_formats/system_settings.h b/src/core/hle/service/set/setting_formats/system_settings.h index 794b6771bb..72ad73fd64 100644 --- a/src/core/hle/service/set/setting_formats/system_settings.h +++ b/src/core/hle/service/set/setting_formats/system_settings.h @@ -27,24 +27,16 @@ namespace Service::Set { // 0/unwritten (1.0.0), 1 (6.0.0-8.1.0), 2 (8.1.1), 7 (9.0.0+). // if (flags & 2), defaults are written for AnalogStickUserCalibration u32 flags; - INSERT_PADDING_BYTES ( - 0x8 - ); // Reserved + INSERT_PADDING_BYTES (0x8); // Reserved LanguageCode language_code; - INSERT_PADDING_BYTES ( - 0x38 - ); // Reserved + INSERT_PADDING_BYTES (0x38); // Reserved // nn::settings::system::NetworkSettings u32 network_setting_count; bool wireless_lan_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x8 - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x8); // Reserved // nn::settings::system::NetworkSettings std::array, 32> network_settings_1B0; @@ -52,180 +44,112 @@ namespace Service::Set { // nn::settings::system::BluetoothDevicesSettings std::array bluetooth_device_settings_count; bool bluetooth_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); bool bluetooth_afh_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); bool bluetooth_boost_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); std::array, 10> bluetooth_device_settings_first_10; s32 ldn_channel; - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3C); // Reserved // nn::util::Uuid MiiAuthorId Common::UUID mii_author_id; - INSERT_PADDING_BYTES ( - 0x30 - ); // Reserved + INSERT_PADDING_BYTES (0x30); // Reserved // nn::settings::system::NxControllerSettings u32 nx_controller_settings_count; - INSERT_PADDING_BYTES ( - 0xC - ); // Reserved + INSERT_PADDING_BYTES (0xC); // Reserved // nn::settings::system::NxControllerSettings, // nn::settings::system::NxControllerLegacySettings on 13.0.0+ std::array, 10> nx_controller_legacy_settings; - INSERT_PADDING_BYTES ( - 0x170 - ); // Reserved + INSERT_PADDING_BYTES (0x170); // Reserved bool external_rtc_reset_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x3C); // Reserved s32 push_notification_activity_mode_on_sleep; - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3C); // Reserved ErrorReportSharePermission error_report_share_permission; - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3C); // Reserved KeyboardLayout keyboard_layout; - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3C); // Reserved bool web_inspector_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); // nn::settings::system::AllowedSslHost u32 allowed_ssl_host_count; bool memory_usage_rate_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x34 - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x34); // Reserved // nn::settings::system::HostFsMountPoint std::array host_fs_mount_point; // nn::settings::system::AllowedSslHost std::array, 8> allowed_ssl_hosts; - INSERT_PADDING_BYTES ( - 0x6C0 - ); // Reserved + INSERT_PADDING_BYTES (0x6C0); // Reserved // nn::settings::system::BlePairingSettings u32 ble_pairing_settings_count; - INSERT_PADDING_BYTES ( - 0xC - ); // Reserved + INSERT_PADDING_BYTES (0xC); // Reserved std::array, 10> ble_pairing_settings; // nn::settings::system::AccountOnlineStorageSettings u32 account_online_storage_settings_count; - INSERT_PADDING_BYTES ( - 0xC - ); // Reserved + INSERT_PADDING_BYTES (0xC); // Reserved std::array, 8> account_online_storage_settings; bool pctl_ready_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x3C); // Reserved // nn::settings::system::ThemeId std::array theme_id_type0; std::array theme_id_type1; - INSERT_PADDING_BYTES ( - 0x100 - ); // Reserved + INSERT_PADDING_BYTES (0x100); // Reserved ChineseTraditionalInputMethod chinese_traditional_input_method; - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3C); // Reserved bool zoom_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x3C); // Reserved // nn::settings::system::ButtonConfigRegisteredSettings u32 button_config_registered_settings_count; - INSERT_PADDING_BYTES ( - 0xC - ); // Reserved + INSERT_PADDING_BYTES (0xC); // Reserved // nn::settings::system::ButtonConfigSettings u32 button_config_settings_count; - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x4); // Reserved std::array, 5> button_config_settings; - INSERT_PADDING_BYTES ( - 0x13B0 - ); // Reserved + INSERT_PADDING_BYTES (0x13B0); // Reserved u32 button_config_settings_embedded_count; - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x4); // Reserved std::array, 5> button_config_settings_embedded; - INSERT_PADDING_BYTES ( - 0x13B0 - ); // Reserved + INSERT_PADDING_BYTES (0x13B0); // Reserved u32 button_config_settings_left_count; - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x4); // Reserved std::array, 5> button_config_settings_left; - INSERT_PADDING_BYTES ( - 0x13B0 - ); // Reserved + INSERT_PADDING_BYTES (0x13B0); // Reserved u32 button_config_settings_right_count; - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x4); // Reserved std::array, 5> button_config_settings_right; - INSERT_PADDING_BYTES ( - 0x73B0 - ); // Reserved + INSERT_PADDING_BYTES (0x73B0); // Reserved // nn::settings::system::ButtonConfigRegisteredSettings std::array button_config_registered_settings_embedded; std::array, 10> button_config_registered_settings; - INSERT_PADDING_BYTES ( - 0x7FF8 - ); // Reserved + INSERT_PADDING_BYTES (0x7FF8); // Reserved // nn::settings::system::ConsoleSixAxisSensorAccelerationBias Common::Vec3 console_six_axis_sensor_acceleration_bias; @@ -239,17 +163,11 @@ namespace Service::Set { Common::Vec3 console_six_axis_sensor_angular_velocity_time_bias; // nn::settings::system::ConsoleSixAxisSensorAngularAcceleration std::array console_six_axis_sensor_angular_velocity_acceleration; - INSERT_PADDING_BYTES ( - 0x70 - ); // Reserved + INSERT_PADDING_BYTES (0x70); // Reserved bool lock_screen_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x4); // Reserved ColorSet color_set_id; @@ -261,9 +179,7 @@ namespace Service::Set { InitialLaunchSettingsPacked initial_launch_settings_packed; bool battery_percentage_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); // BitFlagSet<32, nn::settings::system::AppletLaunchFlag> u32 applet_launch_flag; @@ -274,42 +190,28 @@ namespace Service::Set { std::array theme_key; bool field_testing_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); s32 panel_crc_mode; - INSERT_PADDING_BYTES ( - 0x28 - ); // Reserved + INSERT_PADDING_BYTES (0x28); // Reserved // nn::settings::system::BacklightSettings std::array backlight_settings_mixed_up; - INSERT_PADDING_BYTES ( - 0x64 - ); // Reserved + INSERT_PADDING_BYTES (0x64); // Reserved // nn::time::SystemClockContext Service::PSC::Time::SystemClockContext user_system_clock_context; Service::PSC::Time::SystemClockContext network_system_clock_context; bool user_system_clock_automatic_correction_enabled; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x4); // Reserved // nn::time::SteadyClockTimePoint Service::PSC::Time::SteadyClockTimePoint user_system_clock_automatic_correction_updated_time_point; - INSERT_PADDING_BYTES ( - 0x10 - ); // Reserved + INSERT_PADDING_BYTES (0x10); // Reserved AccountSettings account_settings; - INSERT_PADDING_BYTES ( - 0xFC - ); // Reserved + INSERT_PADDING_BYTES (0xFC); // Reserved // nn::settings::system::AudioVolume std::array audio_volume_type0; @@ -318,180 +220,112 @@ namespace Service::Set { AudioOutputMode audio_output_mode_speaker; AudioOutputMode audio_output_mode_headphone; bool force_mute_on_headphone_removed; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); s32 headphone_volume_warning_count; bool heaphone_volume_update_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); // nn::settings::system::AudioVolume std::array audio_volume_type2; AudioOutputMode audio_output_mode_type3; AudioOutputMode audio_output_mode_type4; bool hearing_protection_safeguard_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x4); // Reserved s64 hearing_protection_safeguard_remaining_time; - INSERT_PADDING_BYTES ( - 0x38 - ); // Reserved + INSERT_PADDING_BYTES (0x38); // Reserved bool console_information_upload_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x3C); // Reserved bool automatic_application_download_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x4); // Reserved NotificationSettings notification_settings; - INSERT_PADDING_BYTES ( - 0x60 - ); // Reserved + INSERT_PADDING_BYTES (0x60); // Reserved // nn::settings::system::AccountNotificationSettings s32 account_notification_settings_count; - INSERT_PADDING_BYTES ( - 0xC - ); // Reserved + INSERT_PADDING_BYTES (0xC); // Reserved std::array account_notification_settings; - INSERT_PADDING_BYTES ( - 0x140 - ); // Reserved + INSERT_PADDING_BYTES (0x140); // Reserved f32 vibration_master_volume; bool usb_full_key_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); // nn::settings::system::AnalogStickUserCalibration std::array analog_stick_user_calibration_left; std::array analog_stick_user_calibration_right; TouchScreenMode touch_screen_mode; - INSERT_PADDING_BYTES ( - 0x14 - ); // Reserved + INSERT_PADDING_BYTES (0x14); // Reserved TvSettings tv_settings; // nn::settings::system::Edid std::array edid; - INSERT_PADDING_BYTES ( - 0x2E0 - ); // Reserved + INSERT_PADDING_BYTES (0x2E0); // Reserved // nn::settings::system::DataDeletionSettings std::array data_deletion_settings; - INSERT_PADDING_BYTES ( - 0x38 - ); // Reserved + INSERT_PADDING_BYTES (0x38); // Reserved // nn::ncm::ProgramId std::array initial_system_applet_program_id; std::array overlay_disp_program_id; - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x4); // Reserved bool requires_run_repair_time_reviser; - INSERT_PADDING_BYTES ( - 0x6B - ); // Reserved + INSERT_PADDING_BYTES (0x6B); // Reserved // nn::time::LocationName Service::PSC::Time::LocationName device_time_zone_location_name; - INSERT_PADDING_BYTES ( - 0x4 - ); // Reserved + INSERT_PADDING_BYTES (0x4); // Reserved // nn::time::SteadyClockTimePoint Service::PSC::Time::SteadyClockTimePoint device_time_zone_location_updated_time; - INSERT_PADDING_BYTES ( - 0xC0 - ); // Reserved + INSERT_PADDING_BYTES (0xC0); // Reserved // nn::settings::system::PrimaryAlbumStorage PrimaryAlbumStorage primary_album_storage; - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3C); // Reserved bool usb_30_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); bool usb_30_host_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); + INSERT_PADDING_BYTES (0x3); bool usb_30_device_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x34 - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x34); // Reserved bool nfc_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x3C - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x3C); // Reserved // nn::settings::system::SleepSettings SleepSettings sleep_settings; - INSERT_PADDING_BYTES ( - 0x34 - ); // Reserved + INSERT_PADDING_BYTES (0x34); // Reserved // nn::settings::system::EulaVersion s32 eula_version_count; - INSERT_PADDING_BYTES ( - 0xC - ); // Reserved + INSERT_PADDING_BYTES (0xC); // Reserved std::array eula_versions; - INSERT_PADDING_BYTES ( - 0x200 - ); // Reserved + INSERT_PADDING_BYTES (0x200); // Reserved // nn::settings::system::DeviceNickName std::array device_nick_name; - INSERT_PADDING_BYTES ( - 0x80 - ); // Reserved + INSERT_PADDING_BYTES (0x80); // Reserved bool auto_update_enable_flag; - INSERT_PADDING_BYTES ( - 0x3 - ); - INSERT_PADDING_BYTES ( - 0x4C - ); // Reserved + INSERT_PADDING_BYTES (0x3); + INSERT_PADDING_BYTES (0x4C); // Reserved // nn::settings::system::BluetoothDevicesSettings std::array, 14> bluetooth_device_settings_last_14; - INSERT_PADDING_BYTES ( - 0x2000 - ); // Reserved + INSERT_PADDING_BYTES (0x2000); // Reserved // nn::settings::system::NxControllerSettings std::array, 10> nx_controller_settings_data_from_offset_30;