diff --git a/docs/changelog.md b/docs/changelog.md index 495a024..c1b43d1 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,4 +1,8 @@ # Changelog +## 1.11.2 ++ Basic support was added for 22.5.0. ++ Atmosphère was updated to use GCC 16/newlib (latest devkitA64/devkitARM releases). ++ General system stability improvements to enhance the user's experience. ## 1.11.1 + Basic support was added for 22.1.0. + General system stability improvements to enhance the user's experience. diff --git a/emummc/.gitrepo b/emummc/.gitrepo index 32f4bb8..503f95e 100644 --- a/emummc/.gitrepo +++ b/emummc/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/m4xw/emummc branch = develop - commit = 3726bfd659600cdafd138277054568a3edba60a6 - parent = 80bd459516e813fc6f10268ca31dd72a053a4ef3 + commit = f6b3a28ecea9834f96151a526de66abd11033b70 + parent = 1478f3443e8f04534edac8c15bf2d504663d0384 method = merge cmdver = 0.4.9 diff --git a/emummc/README.md b/emummc/README.md index ba438c6..f630040 100644 --- a/emummc/README.md +++ b/emummc/README.md @@ -2,7 +2,7 @@ *A SDMMC driver replacement for Nintendo's Filesystem Services, by **m4xw*** ### Supported Horizon Versions -**1.0.0 - 21.2.0** +**1.0.0 - 22.5.0** ## Features * Arbitrary SDMMC backend selection diff --git a/emummc/source/FS/FS_offsets.c b/emummc/source/FS/FS_offsets.c index 9749aef..133e0e8 100644 --- a/emummc/source/FS/FS_offsets.c +++ b/emummc/source/FS/FS_offsets.c @@ -85,6 +85,8 @@ #include "offsets/2120_exfat.h" #include "offsets/2200.h" #include "offsets/2200_exfat.h" +#include "offsets/2250.h" +#include "offsets/2250_exfat.h" #include "../utils/fatal.h" #define GET_OFFSET_STRUCT_NAME(vers) g_offsets##vers @@ -181,6 +183,8 @@ DEFINE_OFFSET_STRUCT(_2120_EXFAT); DEFINE_OFFSET_STRUCT(_2200); DEFINE_OFFSET_STRUCT(_2200_EXFAT); +DEFINE_OFFSET_STRUCT(_2250); +DEFINE_OFFSET_STRUCT(_2250_EXFAT); const fs_offsets_t *get_fs_offsets(enum FS_VER version) { switch (version) { @@ -322,6 +326,10 @@ return &(GET_OFFSET_STRUCT_NAME(_2200)); case FS_VER_22_0_0_EXFAT: return &(GET_OFFSET_STRUCT_NAME(_2200_EXFAT)); + case FS_VER_22_5_0: + return &(GET_OFFSET_STRUCT_NAME(_2250)); + case FS_VER_22_5_0_EXFAT: + return &(GET_OFFSET_STRUCT_NAME(_2250_EXFAT)); default: fatal_abort(Fatal_UnknownVersion); } diff --git a/emummc/source/FS/FS_versions.h b/emummc/source/FS/FS_versions.h index 892bc4c..af2913d 100644 --- a/emummc/source/FS/FS_versions.h +++ b/emummc/source/FS/FS_versions.h @@ -124,6 +124,9 @@ FS_VER_22_0_0, FS_VER_22_0_0_EXFAT, + + FS_VER_22_5_0, + FS_VER_22_5_0_EXFAT, FS_VER_MAX, }; diff --git a/emummc/source/FS/offsets/2250.h b/emummc/source/FS/offsets/2250.h new file mode 100644 index 0000000..a613c0a --- /dev/null +++ b/emummc/source/FS/offsets/2250.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2019 m4xw + * Copyright (c) 2019 Atmosphere-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 . + */ +#ifndef __FS_2250_H__ +#define __FS_2250_H__ + +// Accessor vtable getters +#define FS_OFFSET_2250_SDMMC_ACCESSOR_GC 0x1B01C0 +#define FS_OFFSET_2250_SDMMC_ACCESSOR_SD 0x1B21C0 +#define FS_OFFSET_2250_SDMMC_ACCESSOR_NAND 0x1B07F0 + +// Hooks +#define FS_OFFSET_2250_SDMMC_WRAPPER_READ 0x1AC0F0 +#define FS_OFFSET_2250_SDMMC_WRAPPER_WRITE 0x1AC150 +#define FS_OFFSET_2250_RTLD 0x2DED0 +#define FS_OFFSET_2250_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2250_CLKRST_SET_MIN_V_CLK_RATE 0x1CF260 + +// Misc funcs +#define FS_OFFSET_2250_LOCK_MUTEX 0x1A4EF0 +#define FS_OFFSET_2250_UNLOCK_MUTEX 0x1A4F40 + +#define FS_OFFSET_2250_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1AC0B0 +#define FS_OFFSET_2250_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1AC0D0 + +// Misc Data +#define FS_OFFSET_2250_SD_MUTEX 0xFF1408 +#define FS_OFFSET_2250_NAND_MUTEX 0xFECD00 +#define FS_OFFSET_2250_ACTIVE_PARTITION 0xFECD40 +#define FS_OFFSET_2250_SDMMC_DAS_HANDLE 0xFCEB98 + +// NOPs +#define FS_OFFSET_2250_SD_DAS_INIT 0x2B438 + +// Nintendo Paths +#define FS_OFFSET_2250_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x000715EC, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00082E64, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008B888, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x000A1B1C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2250_H__ diff --git a/emummc/source/FS/offsets/2250_exfat.h b/emummc/source/FS/offsets/2250_exfat.h new file mode 100644 index 0000000..c8d4281 --- /dev/null +++ b/emummc/source/FS/offsets/2250_exfat.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2019 m4xw + * Copyright (c) 2019 Atmosphere-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 . + */ +#ifndef __FS_2250_EXFAT_H__ +#define __FS_2250_EXFAT_H__ + +// Accessor vtable getters +#define FS_OFFSET_2250_EXFAT_SDMMC_ACCESSOR_GC 0x1BB3B0 +#define FS_OFFSET_2250_EXFAT_SDMMC_ACCESSOR_SD 0x1BD3B0 +#define FS_OFFSET_2250_EXFAT_SDMMC_ACCESSOR_NAND 0x1BB9E0 + +// Hooks +#define FS_OFFSET_2250_EXFAT_SDMMC_WRAPPER_READ 0x1B72E0 +#define FS_OFFSET_2250_EXFAT_SDMMC_WRAPPER_WRITE 0x1B7340 +#define FS_OFFSET_2250_EXFAT_RTLD 0x2DED0 +#define FS_OFFSET_2250_EXFAT_RTLD_DESTINATION ((uintptr_t)(INT64_C(-0x4C))) + +#define FS_OFFSET_2250_EXFAT_CLKRST_SET_MIN_V_CLK_RATE 0x1DA450 + +// Misc funcs +#define FS_OFFSET_2250_EXFAT_LOCK_MUTEX 0x1B00E0 +#define FS_OFFSET_2250_EXFAT_UNLOCK_MUTEX 0x1B0130 + +#define FS_OFFSET_2250_EXFAT_SDMMC_WRAPPER_CONTROLLER_OPEN 0x1B72A0 +#define FS_OFFSET_2250_EXFAT_SDMMC_WRAPPER_CONTROLLER_CLOSE 0x1B72C0 + +// Misc Data +#define FS_OFFSET_2250_EXFAT_SD_MUTEX 0x1002408 +#define FS_OFFSET_2250_EXFAT_NAND_MUTEX 0xFFDD00 +#define FS_OFFSET_2250_EXFAT_ACTIVE_PARTITION 0xFFDD40 +#define FS_OFFSET_2250_EXFAT_SDMMC_DAS_HANDLE 0xFDBB98 + +// NOPs +#define FS_OFFSET_2250_EXFAT_SD_DAS_INIT 0x2B438 + +// Nintendo Paths +#define FS_OFFSET_2250_EXFAT_NINTENDO_PATHS \ +{ \ + {.opcode_reg = 3, .adrp_offset = 0x000715EC, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 3, .adrp_offset = 0x00082E64, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x0008B888, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 4, .adrp_offset = 0x000A1B1C, .add_rel_offset = 0x00000004}, \ + {.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \ +} + +#endif // __FS_2250_EXFAT_H__ \ No newline at end of file diff --git a/fusee/program/source/fusee_stratosphere.cpp b/fusee/program/source/fusee_stratosphere.cpp index e784cb5..8f34237 100644 --- a/fusee/program/source/fusee_stratosphere.cpp +++ b/fusee/program/source/fusee_stratosphere.cpp @@ -194,6 +194,9 @@ FsVersion_22_0_0, FsVersion_22_0_0_Exfat, + + FsVersion_22_5_0, + FsVersion_22_5_0_Exfat, FsVersion_Count, }; @@ -302,6 +305,9 @@ { 0xB7, 0xA2, 0x97, 0x39, 0xB7, 0xED, 0xDE, 0xFC }, /* FsVersion_22_0_0 */ { 0xFB, 0x0B, 0x68, 0xDB, 0x24, 0x03, 0xD1, 0x19 }, /* FsVersion_22_0_0_Exfat */ + + { 0x53, 0x6D, 0x93, 0x84, 0x69, 0xFE, 0x73, 0xBE }, /* FsVersion_22_5_0 */ + { 0xD4, 0x45, 0x28, 0x29, 0x5B, 0x41, 0x92, 0xBA }, /* FsVersion_22_5_0_Exfat */ }; const InitialProcessBinaryHeader *FindInitialProcessBinary(const pkg2::Package2Header *header, const u8 *data, ams::TargetFirmware target_firmware) { @@ -716,11 +722,13 @@ AddPatch(fs_meta, 0x18AD40, NogcPatch1, sizeof(NogcPatch1)); break; case FsVersion_22_0_0: + case FsVersion_22_5_0: AddPatch(fs_meta, 0x1B023D, NogcPatch0, sizeof(NogcPatch0)); AddPatch(fs_meta, 0x1B0255, NogcPatch0, sizeof(NogcPatch0)); AddPatch(fs_meta, 0x183060, NogcPatch1, sizeof(NogcPatch1)); break; case FsVersion_22_0_0_Exfat: + case FsVersion_22_5_0_Exfat: AddPatch(fs_meta, 0x1BB42D, NogcPatch0, sizeof(NogcPatch0)); AddPatch(fs_meta, 0x1BB445, NogcPatch0, sizeof(NogcPatch0)); AddPatch(fs_meta, 0x18E250, NogcPatch1, sizeof(NogcPatch1)); diff --git a/fusee/program/source/mtc/fusee_mtc_erista.cpp b/fusee/program/source/mtc/fusee_mtc_erista.cpp index 2eb4bce..0981f37 100644 --- a/fusee/program/source/mtc/fusee_mtc_erista.cpp +++ b/fusee/program/source/mtc/fusee_mtc_erista.cpp @@ -1355,6 +1355,9 @@ uint32_t emc_zcal_wait_cnt_new = dst_timing->burst_regs.emc_zcal_wait_cnt; emc_zcal_wait_cnt_old &= ~0x7ff; emc_zcal_wait_cnt_new &= ~0x7ff; + + /* TODO: Unused variable. */ + AMS_UNUSED(emc_zcal_wait_cnt_old); if (dram_type == DRAM_TYPE_LPDDR4) { zq_wait_long = std::max(1, util::DivideUp(1000000, destination_clock_period)); diff --git a/libraries/.gitrepo b/libraries/.gitrepo index bf29b37..e8ed07d 100644 --- a/libraries/.gitrepo +++ b/libraries/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/Atmosphere-NX/Atmosphere-libs branch = master - commit = 82f1553c4c7e68364f7e630b1c68f2aee8681dee - parent = 252f8685b493d0dfd428e9439b0296109776b935 + commit = d3083af1827cd6ca2a96feb9316eb85cd01bae1f + parent = 974a1025b834136134e8133d8db23f69cb5ae0be method = merge cmdver = 0.4.9 diff --git a/libraries/libexosphere/source/se/se_rsa.cpp b/libraries/libexosphere/source/se/se_rsa.cpp index b370007..3317a46 100644 --- a/libraries/libexosphere/source/se/se_rsa.cpp +++ b/libraries/libexosphere/source/se/se_rsa.cpp @@ -104,7 +104,10 @@ value |= ((flags & KeySlotLockFlags_KeyRead) == 0) ? (1u << 0) : 0; value |= ((flags & KeySlotLockFlags_KeyRead) == 0) ? (1u << 1) : 0; value |= ((flags & KeySlotLockFlags_KeyRead) == 0) ? (1u << 2) : 0; - + + /* TODO: Unused variable. */ + AMS_UNUSED(value); + reg::Write(SE->SE_RSA_KEYTABLE_ACCESS[slot], SE_REG_BITS_ENUM_SEL(RSA_KEYTABLE_ACCESS_KEYREAD, (flags & KeySlotLockFlags_KeyRead) != 0, DISABLE, ENABLE), SE_REG_BITS_ENUM_SEL(RSA_KEYTABLE_ACCESS_KEYUPDATE, (flags & KeySlotLockFlags_KeyWrite) != 0, DISABLE, ENABLE), SE_REG_BITS_ENUM_SEL(RSA_KEYTABLE_ACCESS_KEYUSE, (flags & KeySlotLockFlags_KeyUse) != 0, DISABLE, ENABLE)); diff --git a/libraries/libmesosphere/source/arch/arm64/kern_k_page_table.cpp b/libraries/libmesosphere/source/arch/arm64/kern_k_page_table.cpp index b8bce7b..6992281 100644 --- a/libraries/libmesosphere/source/arch/arm64/kern_k_page_table.cpp +++ b/libraries/libmesosphere/source/arch/arm64/kern_k_page_table.cpp @@ -729,6 +729,9 @@ } } MESOSPHERE_ASSERT(mapped_pages == num_pages); + + /* TODO: Unused variable. */ + AMS_UNUSED(mapped_pages); /* Perform what coalescing we can. */ this->MergePages(orig_virt_addr, num_pages, page_list); diff --git a/libraries/libmesosphere/source/arch/arm64/kern_userspace_memory_access_asm.s b/libraries/libmesosphere/source/arch/arm64/kern_userspace_memory_access_asm.s index 4c25538..5fab2ca 100644 --- a/libraries/libmesosphere/source/arch/arm64/kern_userspace_memory_access_asm.s +++ b/libraries/libmesosphere/source/arch/arm64/kern_userspace_memory_access_asm.s @@ -682,7 +682,7 @@ mov x30, x10 /* Write the word to io. */ - sttr w9, [x5] + sttr w9, [x4] dsb sy 2: /* Continue. */ @@ -727,7 +727,7 @@ mov x30, x10 /* Write the word to io. */ - sttrh w9, [x5] + sttrh w9, [x4] dsb sy 2: /* Continue. */ @@ -772,7 +772,7 @@ mov x30, x10 /* Write the word to io. */ - sttrb w9, [x5] + sttrb w9, [x4] dsb sy 2: /* Continue. */ diff --git a/libraries/libmesosphere/source/kern_k_debug_base.cpp b/libraries/libmesosphere/source/kern_k_debug_base.cpp index 88ec791..453eb74 100644 --- a/libraries/libmesosphere/source/kern_k_debug_base.cpp +++ b/libraries/libmesosphere/source/kern_k_debug_base.cpp @@ -756,11 +756,13 @@ case ams::svc::DebugException_UndefinedSystemCall: { MESOSPHERE_ASSERT(num_params >= 3); - - info->info.exception.exception_address = params[1]; - - info->info.exception.exception_data_count = 1; - info->info.exception.exception_data[0] = params[2]; + + /* Keep the compiler happy, even though the assert has us covered. */ + if (num_params >= 3) { + info->info.exception.exception_address = params[1]; + info->info.exception.exception_data_count = 1; + info->info.exception.exception_data[0] = params[2]; + } } break; case ams::svc::DebugException_DebuggerAttached: @@ -773,9 +775,12 @@ case ams::svc::DebugException_UserBreak: { MESOSPHERE_ASSERT(num_params >= 2); - - info->info.exception.exception_address = params[1]; - + + /* Keep the compiler happy, even though the assert has us covered. */ + if (num_params >= 2) { + info->info.exception.exception_address = params[1]; + } + info->info.exception.exception_data_count = 0; for (size_t i = 2; i < num_params; ++i) { info->info.exception.exception_data[info->info.exception.exception_data_count++] = params[i]; @@ -805,8 +810,11 @@ default: { MESOSPHERE_ASSERT(num_params >= 2); - - info->info.exception.exception_address = params[1]; + + /* Keep the compiler happy, even though the assert has us covered. */ + if (num_params >= 2) { + info->info.exception.exception_address = params[1]; + } } break; } diff --git a/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp b/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp index 3437f52..cb4272b 100644 --- a/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp +++ b/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp @@ -979,6 +979,7 @@ HANDLER(FsSaveDataFileSystemPeakMountCount, 777, FsProxyErrorInfo3, FieldType_NumericI32, FieldFlag_None ) \ HANDLER(TestBool, 778, Test, FieldType_Bool, FieldFlag_None ) \ HANDLER(TestI8Array, 779, Test, FieldType_I8Array, FieldFlag_None ) \ + HANDLER(SslProcessHeapAllocatable, 781, NetworkSecurityCertificateInfo, FieldType_NumericU32, FieldFlag_None ) \ HANDLER(TestStringNx, 1000, TestNx, FieldType_String, FieldFlag_None ) \ HANDLER(BoostModeCurrentLimit, 1001, BatteryChargeInfo, FieldType_NumericI32, FieldFlag_None ) \ HANDLER(ChargeConfiguration, 1002, BatteryChargeInfo, FieldType_NumericI32, FieldFlag_None ) \ diff --git a/libraries/libstratosphere/include/stratosphere/hos/hos_types.hpp b/libraries/libstratosphere/include/stratosphere/hos/hos_types.hpp index 246c943..c9ee30d 100644 --- a/libraries/libstratosphere/include/stratosphere/hos/hos_types.hpp +++ b/libraries/libstratosphere/include/stratosphere/hos/hos_types.hpp @@ -102,6 +102,7 @@ Version_21_2_0 = ::ams::TargetFirmware_21_2_0, Version_22_0_0 = ::ams::TargetFirmware_22_0_0, Version_22_1_0 = ::ams::TargetFirmware_22_1_0, + Version_22_5_0 = ::ams::TargetFirmware_22_5_0, Version_Current = ::ams::TargetFirmware_Current, diff --git a/libraries/libstratosphere/source/hos/hos_version_api.cpp b/libraries/libstratosphere/source/hos/hos_version_api.cpp index db3d6f6..511559d 100644 --- a/libraries/libstratosphere/source/hos/hos_version_api.cpp +++ b/libraries/libstratosphere/source/hos/hos_version_api.cpp @@ -47,7 +47,7 @@ #endif exosphere::ApiInfo GetExosphereApiInfo(bool allow_approximate) { - exosphere::ApiInfo info; + exosphere::ApiInfo info = exosphere::ApiInfo{ util::BitPack64{0} }; #if defined(ATMOSPHERE_OS_HORIZON) while (true) { if (R_SUCCEEDED(GetExosphereApiInfo(std::addressof(info)))) { diff --git a/libraries/libstratosphere/source/ncm/ncm_content_meta.cpp b/libraries/libstratosphere/source/ncm/ncm_content_meta.cpp index 02f648a..298de53 100644 --- a/libraries/libstratosphere/source/ncm/ncm_content_meta.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_content_meta.cpp @@ -220,6 +220,9 @@ /* Assert that we copied the right number of infos. */ AMS_ASSERT(count == fragment_count); + + /* TODO: Unused variable. */ + AMS_UNUSED(count); R_SUCCEED(); } @@ -432,6 +435,9 @@ /* Assert that we copied the right number of infos. */ AMS_ASSERT(count == fragment_count); + + /* TODO: Unused variable. */ + AMS_UNUSED(count); R_SUCCEED(); } diff --git a/libraries/libvapours/include/vapours/ams/ams_api_version.h b/libraries/libvapours/include/vapours/ams/ams_api_version.h index b55cdd6..264737f 100644 --- a/libraries/libvapours/include/vapours/ams/ams_api_version.h +++ b/libraries/libvapours/include/vapours/ams/ams_api_version.h @@ -17,10 +17,10 @@ #define ATMOSPHERE_RELEASE_VERSION_MAJOR 1 #define ATMOSPHERE_RELEASE_VERSION_MINOR 11 -#define ATMOSPHERE_RELEASE_VERSION_MICRO 1 +#define ATMOSPHERE_RELEASE_VERSION_MICRO 2 #define ATMOSPHERE_RELEASE_VERSION ATMOSPHERE_RELEASE_VERSION_MAJOR, ATMOSPHERE_RELEASE_VERSION_MINOR, ATMOSPHERE_RELEASE_VERSION_MICRO #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MAJOR 22 -#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MINOR 1 +#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MINOR 5 #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MICRO 0 diff --git a/libraries/libvapours/include/vapours/ams/ams_target_firmware.h b/libraries/libvapours/include/vapours/ams/ams_target_firmware.h index 5a6bb17..6791a99 100644 --- a/libraries/libvapours/include/vapours/ams/ams_target_firmware.h +++ b/libraries/libvapours/include/vapours/ams/ams_target_firmware.h @@ -100,8 +100,9 @@ #define ATMOSPHERE_TARGET_FIRMWARE_21_2_0 ATMOSPHERE_TARGET_FIRMWARE(21, 2, 0) #define ATMOSPHERE_TARGET_FIRMWARE_22_0_0 ATMOSPHERE_TARGET_FIRMWARE(22, 0, 0) #define ATMOSPHERE_TARGET_FIRMWARE_22_1_0 ATMOSPHERE_TARGET_FIRMWARE(22, 1, 0) +#define ATMOSPHERE_TARGET_FIRMWARE_22_5_0 ATMOSPHERE_TARGET_FIRMWARE(22, 5, 0) -#define ATMOSPHERE_TARGET_FIRMWARE_CURRENT ATMOSPHERE_TARGET_FIRMWARE_22_1_0 +#define ATMOSPHERE_TARGET_FIRMWARE_CURRENT ATMOSPHERE_TARGET_FIRMWARE_22_5_0 #define ATMOSPHERE_TARGET_FIRMWARE_MIN ATMOSPHERE_TARGET_FIRMWARE(0, 0, 0) #define ATMOSPHERE_TARGET_FIRMWARE_MAX ATMOSPHERE_TARGET_FIRMWARE_CURRENT @@ -194,6 +195,7 @@ TargetFirmware_21_2_0 = ATMOSPHERE_TARGET_FIRMWARE_21_2_0, TargetFirmware_22_0_0 = ATMOSPHERE_TARGET_FIRMWARE_22_0_0, TargetFirmware_22_1_0 = ATMOSPHERE_TARGET_FIRMWARE_22_1_0, + TargetFirmware_22_5_0 = ATMOSPHERE_TARGET_FIRMWARE_22_5_0, TargetFirmware_Current = ATMOSPHERE_TARGET_FIRMWARE_CURRENT, diff --git a/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout.hpp b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout.hpp index e22a3a3..741445c 100644 --- a/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout.hpp +++ b/libraries/libvapours/include/vapours/svc/codegen/impl/svc_codegen_impl_layout.hpp @@ -185,7 +185,10 @@ /* Process all arguments, in order. */ size_t i = 0; (layout.ProcessArgument(i++, NGRN, NSAA), ...); - + + /* TODO: Unused variable. */ + AMS_UNUSED(i); + return layout; } diff --git a/stratosphere/loader/source/ldr_embedded_usb_patches.inc b/stratosphere/loader/source/ldr_embedded_usb_patches.inc index b789716..0ac5bc2 100644 --- a/stratosphere/loader/source/ldr_embedded_usb_patches.inc +++ b/stratosphere/loader/source/ldr_embedded_usb_patches.inc @@ -100,5 +100,6 @@ { ParseModuleId("40E80E7442C0DFC985315E6F9E8C77229818AC0F"), util::size(Usb30ForceEnablePatches_20_0_0), Usb30ForceEnablePatches_20_0_0 }, /* 20.0.0 */ { ParseModuleId("A5EF8D22EDF8A384E4135270ED596C1D2D524159"), util::size(Usb30ForceEnablePatches_20_0_0), Usb30ForceEnablePatches_20_0_0 }, /* 20.1.0 - 20.5.0 */ { ParseModuleId("766D0C2277207B40AD9B8DE309396D50CCE94885"), util::size(Usb30ForceEnablePatches_21_0_0), Usb30ForceEnablePatches_21_0_0 }, /* 21.0.0 */ - { ParseModuleId("B734339F2280170AF0200573F9B943242CEF8C15"), util::size(Usb30ForceEnablePatches_22_0_0), Usb30ForceEnablePatches_22_0_0 }, /* 22.0.0 */ + { ParseModuleId("B734339F2280170AF0200573F9B943242CEF8C15"), util::size(Usb30ForceEnablePatches_22_0_0), Usb30ForceEnablePatches_22_0_0 }, /* 22.0.0 - 22.1.0 */ + { ParseModuleId("AD8D36F2029822A4C498F055ADBDAA789EB913C6"), util::size(Usb30ForceEnablePatches_22_0_0), Usb30ForceEnablePatches_22_0_0 }, /* 22.5.0 */ };