nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

boot: update for api changes

Browse source
This commit is contained in:
Michael Scire 2019-10-16 14:28:19 -07:00 committed by SciresM
parent 635ae4e3da
commit 8d16d2152b
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stratosphere/boot/source/boot_boot_reason.cpp
View file

@ -91,7 +91,7 @@ namespace sts::boot {
g_boot_reason = MakeBootReason(power_intr, rtc_intr & ~rtc_intr_m, nv_erc, ac_ok); g_boot_reason = MakeBootReason(power_intr, rtc_intr & ~rtc_intr_m, nv_erc, ac_ok);
/* Set boot reason for SPL. */ /* Set boot reason for SPL. */
if (GetRuntimeFirmwareVersion() >= FirmwareVersion_300) { if (hos::GetVersion() >= hos::Version_300) {
BootReasonValue boot_reason_value; BootReasonValue boot_reason_value;
boot_reason_value.power_intr = power_intr; boot_reason_value.power_intr = power_intr;
boot_reason_value.rtc_intr = rtc_intr & ~rtc_intr_m; boot_reason_value.rtc_intr = rtc_intr & ~rtc_intr_m;

2
stratosphere/boot/source/boot_clock_initial_configuration.cpp
View file

@ -31,7 +31,7 @@ namespace sts::boot {
void SetInitialClockConfiguration() { void SetInitialClockConfiguration() {
/* Write mask to APBDEV_PMC_PWR_DET, then clear APBDEV_PMC_PWR_DET_VAL. */ /* Write mask to APBDEV_PMC_PWR_DET, then clear APBDEV_PMC_PWR_DET_VAL. */
const u32 mask = GetRuntimeFirmwareVersion() >= FirmwareVersion_600 ? InitialClockOutMask6x : InitialClockOutMask1x; const u32 mask = hos::GetVersion() >= hos::Version_600 ? InitialClockOutMask6x : InitialClockOutMask1x;
WritePmcRegister(PmcClkOutCntrl, mask, mask); WritePmcRegister(PmcClkOutCntrl, mask, mask);
} }

2
stratosphere/boot/source/boot_main.cpp
View file

@ -85,7 +85,7 @@ void __libnx_initheap(void) {
} }
void __appInit(void) { void __appInit(void) {
SetFirmwareVersionForLibnx(); hos::SetVersionForLibnx();
/* Initialize services we need (TODO: NCM) */ /* Initialize services we need (TODO: NCM) */
DoWithSmSession([&]() { DoWithSmSession([&]() {

6
stratosphere/boot/source/gpio/gpio_initial_configuration.cpp
View file

@ -41,14 +41,14 @@ namespace sts::gpio {
const InitialConfig *configs = nullptr; const InitialConfig *configs = nullptr;
size_t num_configs = 0; size_t num_configs = 0;
const auto hw_type = spl::GetHardwareType(); const auto hw_type = spl::GetHardwareType();
const FirmwareVersion fw_ver = GetRuntimeFirmwareVersion(); const auto hos_ver = hos::GetVersion();
/* Choose GPIO map. */ /* Choose GPIO map. */
if (fw_ver >= FirmwareVersion_200) { if (hos_ver >= hos::Version_200) {
switch (hw_type) { switch (hw_type) {
case spl::HardwareType::Icosa: case spl::HardwareType::Icosa:
{ {
if (fw_ver >= FirmwareVersion_400) { if (hos_ver >= hos::Version_400) {
configs = InitialConfigsIcosa4x; configs = InitialConfigsIcosa4x;
num_configs = NumInitialConfigsIcosa4x; num_configs = NumInitialConfigsIcosa4x;
} else { } else {