Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use g_fxo in cellRudp

Browse Source 
Rename rudp_t -> rudp_info
This commit is contained in:
Nekotekina
2019-08-21 22:58:01 +03:00
parent 02fe1ef7ff
commit 2b55bde104
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/Cell/Modules/cellRudp.cpp
+12 -6
View File
@@ -7,7 +7,7 @@
LOG_CHANNEL(cellRudp); LOG_CHANNEL(cellRudp);
struct rudp_t struct rudp_info
{ {
// allocator functions // allocator functions
std::function<vm::ptr<void>(ppu_thread& ppu, u32 size)> malloc; std::function<vm::ptr<void>(ppu_thread& ppu, u32 size)> malloc;
@@ -22,9 +22,9 @@ s32 cellRudpInit(vm::ptr<CellRudpAllocator> allocator)
{ {
cellRudp.warning("cellRudpInit(allocator=*0x%x)", allocator); cellRudp.warning("cellRudpInit(allocator=*0x%x)", allocator);
const auto rudp = fxm::make<rudp_t>(); const auto rudp = g_fxo->get<rudp_info>();
if (!rudp) if (rudp->malloc)
{ {
return CELL_RUDP_ERROR_ALREADY_INITIALIZED; return CELL_RUDP_ERROR_ALREADY_INITIALIZED;
} }
@@ -57,11 +57,17 @@ s32 cellRudpEnd()
{ {
cellRudp.warning("cellRudpEnd()"); cellRudp.warning("cellRudpEnd()");
if (!fxm::remove<rudp_t>()) const auto rudp = g_fxo->get<rudp_info>();
if (!rudp->malloc)
{ {
return CELL_RUDP_ERROR_NOT_INITIALIZED; return CELL_RUDP_ERROR_NOT_INITIALIZED;
} }
rudp->malloc = nullptr;
rudp->free = nullptr;
rudp->handler = vm::null;
return CELL_OK; return CELL_OK;
} }
@@ -75,9 +81,9 @@ s32 cellRudpSetEventHandler(vm::ptr<CellRudpEventHandler> handler, vm::ptr<void>
{ {
cellRudp.todo("cellRudpSetEventHandler(handler=*0x%x, arg=*0x%x)", handler, arg); cellRudp.todo("cellRudpSetEventHandler(handler=*0x%x, arg=*0x%x)", handler, arg);
const auto rudp = fxm::get<rudp_t>(); const auto rudp = g_fxo->get<rudp_info>();
if (!rudp) if (!rudp->malloc)
{ {
return CELL_RUDP_ERROR_NOT_INITIALIZED; return CELL_RUDP_ERROR_NOT_INITIALIZED;
} }