boot: update for api changes

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

View file

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

View file

@ -31,7 +31,7 @@ namespace sts::boot {
void SetInitialClockConfiguration() {
/* 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);
}

View file

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

View file

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