mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-22 04:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #770 from tambry/cellNetCtlImprovements

Browse source 
More improvements and small additions to cellNetCtl
This commit is contained in:
Alexandro Sánchez Bach 2014-08-23 15:28:57 +02:00
commit c71ed13f1a
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp
View file

@ -27,24 +27,28 @@ int cellNetCtlGetState(mem32_t state)
cellNetCtl->Log("cellNetCtlGetState(state_addr=0x%x)", state.GetAddr());
state = CELL_NET_CTL_STATE_Disconnected; // TODO: Allow other states
return CELL_OK;
}
int cellNetCtlAddHandler()
int cellNetCtlAddHandler(mem_ptr_t<cellNetCtlHandler> handler, mem32_t arg, s32 hid)
{
UNIMPLEMENTED_FUNC(cellNetCtl);
cellNetCtl->Todo("cellNetCtlAddHandler(handler_addr=0x%x, arg_addr=0x%x, hid=%x)", handler.GetAddr(), arg.GetAddr(), hid);
return CELL_OK;
}
int cellNetCtlDelHandler()
int cellNetCtlDelHandler(s32 hid)
{
UNIMPLEMENTED_FUNC(cellNetCtl);
cellNetCtl->Todo("cellNetCtlDelHandler(hid=%x)", hid);
return CELL_OK;
}
int cellNetCtlGetInfo()
int cellNetCtlGetInfo(s32 code, mem_ptr_t<CellNetCtlInfo> info)
{
UNIMPLEMENTED_FUNC(cellNetCtl);
cellNetCtl->Todo("cellNetCtlGetInfo(code=%x, info_addr=0x%x)", code, info.GetAddr());
return CELL_OK;
}
@ -57,7 +61,8 @@ int cellNetCtlNetStartDialogLoadAsync(mem_ptr_t<CellNetCtlNetStartDialogParam> p
int cellNetCtlNetStartDialogAbortAsync()
{
UNIMPLEMENTED_FUNC(cellNetCtl);
cellNetCtl->Todo("cellNetCtlNetStartDialogAbortAsync()");
return CELL_OK;
}

6
rpcs3/Emu/SysCalls/Modules/cellNetCtl.h
View file

@ -207,7 +207,7 @@ struct CellNetCtlSSID
u8 padding[3];
};
struct CellNetCtlInfo
union CellNetCtlInfo
{
be_t<u32> device;
CellNetCtlEtherAddr ether_addr;
@ -255,4 +255,6 @@ struct CellNetCtlNatInfo
be_t<s32> stun_status;
be_t<s32> nat_type;
be_t<u32> mapped_addr;
};
};
typedef void(cellNetCtlHandler)(s32 prev_state, s32 new_state, s32 event, s32 error_code, mem32_t arg);