From 9ac6f527e2a48ba97636ba8f65538f960870cd8a Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Wed, 12 May 2021 08:46:41 -0700 Subject: [PATCH] ams: update for 12.0.2 --- libexosphere/include/exosphere/pkg2.hpp | 4 ++-- libexosphere/source/fuse/fuse_api.cpp | 1 + libstratosphere/include/stratosphere/hos/hos_types.hpp | 1 + libvapours/include/vapours/ams/ams_api_version.h | 4 ++-- libvapours/include/vapours/ams/ams_target_firmware.h | 4 +++- libvapours/include/vapours/tegra/tegra_pinmux.hpp | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libexosphere/include/exosphere/pkg2.hpp b/libexosphere/include/exosphere/pkg2.hpp index b96a82b1..5b6f26aa 100644 --- a/libexosphere/include/exosphere/pkg2.hpp +++ b/libexosphere/include/exosphere/pkg2.hpp @@ -23,8 +23,8 @@ namespace ams::pkg2 { constexpr inline int PayloadCount = 3; - constexpr inline int MinimumValidDataVersion = 0; /* We allow older package2 to load; this value is currently 0x10 in Nintendo's code. */ - constexpr inline int CurrentBootloaderVersion = 0xE; + constexpr inline int MinimumValidDataVersion = 0; /* We allow older package2 to load; this value is currently 0x11 in Nintendo's code. */ + constexpr inline int CurrentBootloaderVersion = 0xF; struct Package2Meta { using Magic = util::FourCC<'P','K','2','1'>; diff --git a/libexosphere/source/fuse/fuse_api.cpp b/libexosphere/source/fuse/fuse_api.cpp index 40047a9b..ba915764 100644 --- a/libexosphere/source/fuse/fuse_api.cpp +++ b/libexosphere/source/fuse/fuse_api.cpp @@ -165,6 +165,7 @@ namespace ams::fuse { } constexpr const TargetFirmware FuseVersionIncrementFirmwares[] = { + TargetFirmware_12_0_2, TargetFirmware_11_0_0, TargetFirmware_10_0_0, TargetFirmware_9_1_0, diff --git a/libstratosphere/include/stratosphere/hos/hos_types.hpp b/libstratosphere/include/stratosphere/hos/hos_types.hpp index fb6e23e3..a0877ca5 100644 --- a/libstratosphere/include/stratosphere/hos/hos_types.hpp +++ b/libstratosphere/include/stratosphere/hos/hos_types.hpp @@ -62,6 +62,7 @@ namespace ams::hos { Version_11_0_1 = ::ams::TargetFirmware_11_0_1, Version_12_0_0 = ::ams::TargetFirmware_12_0_0, Version_12_0_1 = ::ams::TargetFirmware_12_0_1, + Version_12_0_2 = ::ams::TargetFirmware_12_0_2, Version_Current = ::ams::TargetFirmware_Current, diff --git a/libvapours/include/vapours/ams/ams_api_version.h b/libvapours/include/vapours/ams/ams_api_version.h index 1d0db762..d9003710 100644 --- a/libvapours/include/vapours/ams/ams_api_version.h +++ b/libvapours/include/vapours/ams/ams_api_version.h @@ -17,10 +17,10 @@ #define ATMOSPHERE_RELEASE_VERSION_MAJOR 0 #define ATMOSPHERE_RELEASE_VERSION_MINOR 19 -#define ATMOSPHERE_RELEASE_VERSION_MICRO 2 +#define ATMOSPHERE_RELEASE_VERSION_MICRO 3 #define ATMOSPHERE_RELEASE_VERSION ATMOSPHERE_RELEASE_VERSION_MAJOR, ATMOSPHERE_RELEASE_VERSION_MINOR, ATMOSPHERE_RELEASE_VERSION_MICRO #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MAJOR 12 #define ATMOSPHERE_SUPPORTED_HOS_VERSION_MINOR 0 -#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MICRO 1 +#define ATMOSPHERE_SUPPORTED_HOS_VERSION_MICRO 2 diff --git a/libvapours/include/vapours/ams/ams_target_firmware.h b/libvapours/include/vapours/ams/ams_target_firmware.h index 9d35b301..842e44c5 100644 --- a/libvapours/include/vapours/ams/ams_target_firmware.h +++ b/libvapours/include/vapours/ams/ams_target_firmware.h @@ -60,8 +60,9 @@ #define ATMOSPHERE_TARGET_FIRMWARE_11_0_1 ATMOSPHERE_TARGET_FIRMWARE(11, 0, 1) #define ATMOSPHERE_TARGET_FIRMWARE_12_0_0 ATMOSPHERE_TARGET_FIRMWARE(12, 0, 0) #define ATMOSPHERE_TARGET_FIRMWARE_12_0_1 ATMOSPHERE_TARGET_FIRMWARE(12, 0, 1) +#define ATMOSPHERE_TARGET_FIRMWARE_12_0_2 ATMOSPHERE_TARGET_FIRMWARE(12, 0, 2) -#define ATMOSPHERE_TARGET_FIRMWARE_CURRENT ATMOSPHERE_TARGET_FIRMWARE_12_0_1 +#define ATMOSPHERE_TARGET_FIRMWARE_CURRENT ATMOSPHERE_TARGET_FIRMWARE_12_0_2 #define ATMOSPHERE_TARGET_FIRMWARE_MIN ATMOSPHERE_TARGET_FIRMWARE(0, 0, 0) #define ATMOSPHERE_TARGET_FIRMWARE_MAX ATMOSPHERE_TARGET_FIRMWARE_CURRENT @@ -114,6 +115,7 @@ namespace ams { TargetFirmware_11_0_1 = ATMOSPHERE_TARGET_FIRMWARE_11_0_1, TargetFirmware_12_0_0 = ATMOSPHERE_TARGET_FIRMWARE_12_0_0, TargetFirmware_12_0_1 = ATMOSPHERE_TARGET_FIRMWARE_12_0_1, + TargetFirmware_12_0_2 = ATMOSPHERE_TARGET_FIRMWARE_12_0_2, TargetFirmware_Current = ATMOSPHERE_TARGET_FIRMWARE_CURRENT, diff --git a/libvapours/include/vapours/tegra/tegra_pinmux.hpp b/libvapours/include/vapours/tegra/tegra_pinmux.hpp index c79d2d17..9284ce14 100644 --- a/libvapours/include/vapours/tegra/tegra_pinmux.hpp +++ b/libvapours/include/vapours/tegra/tegra_pinmux.hpp @@ -50,6 +50,7 @@ #define PINMUX_AUX_DVFS_PWM (0x3184) #define PINMUX_AUX_NFC_EN (0x31D0) #define PINMUX_AUX_NFC_INT (0x31D4) +#define PINMUX_AUX_CAM_FLASH_EN (0x31E8) #define PINMUX_AUX_LCD_BL_PWM (0x31FC) #define PINMUX_AUX_LCD_BL_EN (0x3200) #define PINMUX_AUX_LCD_RST (0x3204)