nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-20 07:08:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

kern: remove firmare-specific SignalAndModify impl

Browse source 
Nintendo made this breaking change because there was zero official software relying on it,
so it's safe for us to make the same change.
This commit is contained in:
Michael Scire 2021-07-22 15:56:43 -07:00
parent 73afa042f1
commit f5704d25f8
1 changed files with 12 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
libraries/libmesosphere/source/kern_k_address_arbiter.cpp
View file

@ -103,54 +103,29 @@ namespace ams::kern {
auto it = m_tree.nfind_key({ addr, -1 }); auto it = m_tree.nfind_key({ addr, -1 });
/* Determine the updated value. */ /* Determine the updated value. */
s32 new_value; s32 new_value;
if (GetTargetFirmware() >= TargetFirmware_7_0_0) { if (count <= 0) {
if (count <= 0) { if ((it != m_tree.end()) && (it->GetAddressArbiterKey() == addr)) {
if ((it != m_tree.end()) && (it->GetAddressArbiterKey() == addr)) { new_value = value - 2;
new_value = value - 2;
} else {
new_value = value + 1;
}
} else { } else {
if ((it != m_tree.end()) && (it->GetAddressArbiterKey() == addr)) { new_value = value + 1;
auto tmp_it = it;
s32 tmp_num_waiters = 0;
while ((++tmp_it != m_tree.end()) && (tmp_it->GetAddressArbiterKey() == addr)) {
if ((tmp_num_waiters++) >= count) {
break;
}
}
if (tmp_num_waiters < count) {
new_value = value - 1;
} else {
new_value = value;
}
} else {
new_value = value + 1;
}
} }
} else { } else {
if (count <= 0) { if ((it != m_tree.end()) && (it->GetAddressArbiterKey() == addr)) {
if ((it != m_tree.end()) && (it->GetAddressArbiterKey() == addr)) {
new_value = value - 1;
} else {
new_value = value + 1;
}
} else {
auto tmp_it = it; auto tmp_it = it;
s32 tmp_num_waiters = 0; s32 tmp_num_waiters = 0;
while ((tmp_it != m_tree.end()) && (tmp_it->GetAddressArbiterKey() == addr) && (tmp_num_waiters < count + 1)) { while ((++tmp_it != m_tree.end()) && (tmp_it->GetAddressArbiterKey() == addr)) {
++tmp_num_waiters; if ((tmp_num_waiters++) >= count) {
++tmp_it; break;
}
} }
if (tmp_num_waiters == 0) { if (tmp_num_waiters < count) {
new_value = value + 1;
} else if (tmp_num_waiters <= count) {
new_value = value - 1; new_value = value - 1;
} else { } else {
new_value = value; new_value = value;
} }
} else {
new_value = value + 1;
} }
} }