OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ams: globally prefer R_RETURN to return for ams::Result

Browse Source
This commit is contained in:
Michael Scire
2022-03-26 14:48:33 -07:00
parent dd78ede99f
commit bbf22b4c60
325 changed files with 1955 additions and 1993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/libstratosphere/source/psc/psc_pm_module.os.horizon.cpp
View File

@@ -69,7 +69,7 @@ namespace ams::psc {
Result PmModule::GetRequest(PmState *out_state, PmFlagSet *out_flags) {
R_UNLESS(m_initialized, psc::ResultNotInitialized());
return m_intf->GetRequest(out_state, out_flags);
R_RETURN(m_intf->GetRequest(out_state, out_flags));
}
Result PmModule::Acknowledge(PmState state, Result res) {
@@ -77,9 +77,9 @@ namespace ams::psc {
R_UNLESS(m_initialized, psc::ResultNotInitialized());
if (hos::GetVersion() >= hos::Version_5_1_0) {
return m_intf->AcknowledgeEx(state);
R_RETURN(m_intf->AcknowledgeEx(state));
} else {
return m_intf->Acknowledge();
R_RETURN(m_intf->Acknowledge());
}
}

8
libraries/libstratosphere/source/psc/psc_remote_pm_module.hpp
View File

@@ -38,21 +38,21 @@ namespace ams::psc {
Result GetRequest(ams::sf::Out<PmState> out_state, ams::sf::Out<PmFlagSet> out_flags) {
static_assert(sizeof(PmState) == sizeof(::PscPmState));
static_assert(sizeof(PmFlagSet) == sizeof(u32));
return ::pscPmModuleGetRequest(std::addressof(m_module), reinterpret_cast<::PscPmState *>(out_state.GetPointer()), reinterpret_cast<u32 *>(out_flags.GetPointer()));
R_RETURN(::pscPmModuleGetRequest(std::addressof(m_module), reinterpret_cast<::PscPmState *>(out_state.GetPointer()), reinterpret_cast<u32 *>(out_flags.GetPointer())));
}
Result Acknowledge() {
/* NOTE: libnx does not separate acknowledge/acknowledgeEx. */
return ::pscPmModuleAcknowledge(std::addressof(m_module), static_cast<::PscPmState>(0));
R_RETURN(::pscPmModuleAcknowledge(std::addressof(m_module), static_cast<::PscPmState>(0)));
}
Result Finalize() {
return ::pscPmModuleFinalize(std::addressof(m_module));
R_RETURN(::pscPmModuleFinalize(std::addressof(m_module)));
}
Result AcknowledgeEx(PmState state) {
static_assert(sizeof(state) == sizeof(::PscPmState));
return ::pscPmModuleAcknowledge(std::addressof(m_module), static_cast<::PscPmState>(state));
R_RETURN(::pscPmModuleAcknowledge(std::addressof(m_module), static_cast<::PscPmState>(state)));
}
};
static_assert(psc::sf::IsIPmModule<RemotePmModule>);