diff --git a/libraries/libstratosphere/source/hos/hos_version_api.cpp b/libraries/libstratosphere/source/hos/hos_version_api.cpp index e2487ddbe..49075d736 100644 --- a/libraries/libstratosphere/source/hos/hos_version_api.cpp +++ b/libraries/libstratosphere/source/hos/hos_version_api.cpp @@ -59,23 +59,6 @@ namespace ams::hos { } } - settings::FirmwareVersion GetSettingsFirmwareVersion() { - /* Mount the system version title. */ - R_ABORT_UNLESS(ams::fs::MountSystemData("sysver", ncm::SystemDataId::SystemVersion)); - ON_SCOPE_EXIT { ams::fs::Unmount("sysver"); }; - - /* Read the firmware version file. */ - ams::fs::FileHandle file; - R_ABORT_UNLESS(ams::fs::OpenFile(std::addressof(file), "sysver:/file", fs::OpenMode_Read)); - ON_SCOPE_EXIT { ams::fs::CloseFile(file); }; - - /* Must be possible to read firmware version from file. */ - settings::FirmwareVersion firmware_version; - R_ABORT_UNLESS(ams::fs::ReadFile(file, 0, std::addressof(firmware_version), sizeof(firmware_version))); - - return firmware_version; - } - } void InitializeVersionInternal(bool allow_approximate) { @@ -134,17 +117,6 @@ namespace ams::hos { } } - void SetNonApproximateVersionInternal() { - /* Get the settings . */ - const auto firmware_version = GetSettingsFirmwareVersion(); - - /* Set the exosphere api version. */ - R_ABORT_UNLESS(spl::SetConfig(spl::ConfigItem::ExosphereApiVersion, (static_cast(firmware_version.major) << 24) | (static_cast(firmware_version.minor) << 16) | (static_cast(firmware_version.micro) << 8))); - - /* Update our own version value. */ - InitializeVersionInternal(false); - } - ::ams::hos::Version GetVersion() { return g_hos_version; } diff --git a/libraries/libstratosphere/source/hos/hos_version_api_private.cpp b/libraries/libstratosphere/source/hos/hos_version_api_private.cpp new file mode 100644 index 000000000..d34fcdb8a --- /dev/null +++ b/libraries/libstratosphere/source/hos/hos_version_api_private.cpp @@ -0,0 +1,54 @@ +/* + * Copyright (c) Atmosphère-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 . + */ +#include + +namespace ams::hos { + + namespace { + + settings::FirmwareVersion GetSettingsFirmwareVersion() { + /* Mount the system version title. */ + R_ABORT_UNLESS(ams::fs::MountSystemData("sysver", ncm::SystemDataId::SystemVersion)); + ON_SCOPE_EXIT { ams::fs::Unmount("sysver"); }; + + /* Read the firmware version file. */ + ams::fs::FileHandle file; + R_ABORT_UNLESS(ams::fs::OpenFile(std::addressof(file), "sysver:/file", fs::OpenMode_Read)); + ON_SCOPE_EXIT { ams::fs::CloseFile(file); }; + + /* Must be possible to read firmware version from file. */ + settings::FirmwareVersion firmware_version; + R_ABORT_UNLESS(ams::fs::ReadFile(file, 0, std::addressof(firmware_version), sizeof(firmware_version))); + + return firmware_version; + } + + } + + void InitializeVersionInternal(bool allow_approximate); + + void SetNonApproximateVersionInternal() { + /* Get the settings . */ + const auto firmware_version = GetSettingsFirmwareVersion(); + + /* Set the exosphere api version. */ + R_ABORT_UNLESS(spl::SetConfig(spl::ConfigItem::ExosphereApiVersion, (static_cast(firmware_version.major) << 24) | (static_cast(firmware_version.minor) << 16) | (static_cast(firmware_version.micro) << 8))); + + /* Update our own version value. */ + InitializeVersionInternal(false); + } + +}