mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 17:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cellVoiceCreatePort syntax

Browse Source
This commit is contained in:
Eladash 2019-12-31 16:02:41 +02:00 committed by Ivan
parent 9958a83d10
commit b30be0fbc1
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rpcs3/Emu/Cell/Modules/cellVoice.cpp
View File

@ -168,22 +168,24 @@ error_code cellVoiceCreatePort(vm::ptr<u32> portId, vm::cptr<CellVoicePortParam>
// Id: bits [8,15] seem to contain a "random" value
// bits [0,7] are based on creation counter modulo 0xa0
// The rest are set to zero and ignored.
manager->id_ctr = (manager->id_ctr + 1) % 0xa0;
auto port = manager->ports.begin();
bool success = false;
manager->id_ctr++; manager->id_ctr %= 0xa0;
// It isn't known whether bits[8,15] are guaranteed to be non-zero
for (u8 ctr2 = 1; !success; ctr2++)
{
verify(HERE), ctr2 < CELLVOICE_MAX_PORT + 1;
constexpr u32 min_value = 1;
std::tie(port, success) = manager->ports.try_emplace(::narrow<u16>((ctr2 << 8) | manager->id_ctr));
for (u32 ctr2 = min_value; ctr2 < CELLVOICE_MAX_PORT + min_value; ctr2++)
{
const auto [port, success] = manager->ports.try_emplace(static_cast<u16>((ctr2 << 8) | manager->id_ctr));
if (success)
{
port->second.info = *pArg;
*portId = port->first;
return CELL_OK;
}
}
port->second.info = *pArg;
*portId = port->first;
return CELL_OK;
fmt::throw_exception("Unreachable" HERE);
}
error_code cellVoiceDeletePort(u32 portId)

2
rpcs3/Emu/Cell/Modules/cellVoice.h
View File

@ -185,7 +185,7 @@ struct voice_manager
};
// See cellVoiceCreatePort
u32 id_ctr = 0;
u8 id_ctr = 0;
// For cellVoiceSetNotifyEventQueue
u32 port_source = 0;