Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #19856 from Nemoumbra/infra-minor

Browse source 
Infra cleanup + more syscall names
This commit is contained in:
Henrik Rydgård 2025-01-10 22:43:13 +01:00 • committed by GitHub
commit f5d6291382
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/HLE/HLETables.cpp
View file

@ -83,6 +83,7 @@
#include "KUBridge.h"
#include "sceNetInet.h"
#include "sceNetResolver.h"
// #include "sceNp2.h"
#define N(s) s
@ -318,6 +319,9 @@ void RegisterAllModules() {
Register_mp4msv();
Register_InterruptManagerForKernel();
Register_sceSircs();
// Not ready to enable this due to apparent softlocks in Patapon 3.
// Register_sceNpMatching2();
// add new modules here.
}

10
Core/HLE/sceNet.cpp
View file

@ -1324,27 +1324,27 @@ static int sceNetApctl_lib2_C20A144C(int connIndex, u32 ps3MacAddressPtr) {
}
static int sceNetUpnpInit(int unknown1,int unknown2) {
ERROR_LOG_REPORT_ONCE(sceNetUpnpInit, Log::sceNet, "UNIMPLsceNetUpnpInit %d,%d",unknown1,unknown2);
ERROR_LOG_REPORT_ONCE(sceNetUpnpInit, Log::sceNet, "UNIMPL sceNetUpnpInit %d,%d",unknown1,unknown2);
return 0;
}
static int sceNetUpnpStart() {
ERROR_LOG(Log::sceNet, "UNIMPLsceNetUpnpStart");
ERROR_LOG(Log::sceNet, "UNIMPL sceNetUpnpStart");
return 0;
}
static int sceNetUpnpStop() {
ERROR_LOG(Log::sceNet, "UNIMPLsceNetUpnpStop");
ERROR_LOG(Log::sceNet, "UNIMPL sceNetUpnpStop");
return 0;
}
static int sceNetUpnpTerm() {
ERROR_LOG(Log::sceNet, "UNIMPLsceNetUpnpTerm");
ERROR_LOG(Log::sceNet, "UNIMPL sceNetUpnpTerm");
return 0;
}
static int sceNetUpnpGetNatInfo() {
ERROR_LOG(Log::sceNet, "UNIMPLsceNetUpnpGetNatInfo");
ERROR_LOG(Log::sceNet, "UNIMPL sceNetUpnpGetNatInfo");
return 0;
}

11
Core/HLE/sceNp2.cpp
View file

@ -475,7 +475,7 @@ static int sceNpMatching2LeaveRoom(int ctxId, u32 reqParamPtr, u32 optParamPtr,
return 0;
}
static int sceNpMatching2JoinRoom(int ctxId, u32 reqParamPtr, u32 optParamPtr, u32 unknown1, u32 unknown2, u32 assignedReqIdPtr)
static int sceNpMatching2CreateJoinRoom(int ctxId, u32 reqParamPtr, u32 optParamPtr, u32 unknown1, u32 unknown2, u32 assignedReqIdPtr)
{
ERROR_LOG(Log::sceNet, "UNIMPL %s(%d, %08x, %08x, %08x[%08x]) at %08x", __FUNCTION__, ctxId, reqParamPtr, optParamPtr, assignedReqIdPtr, Memory::Read_U32(assignedReqIdPtr), currentMIPS->pc);
if (!npMatching2Inited)
@ -588,9 +588,16 @@ const HLEFunction sceNpMatching2[] = {
{0xF47342FC, &WrapI_IUI<sceNpMatching2GetServerIdListLocal>, "sceNpMatching2GetServerIdListLocal", 'i', "ixi" },
{0x4EE3A8EC, &WrapI_IUUU<sceNpMatching2GetServerInfo>, "sceNpMatching2GetServerInfo", 'i', "ixxx" },
{0xC870535A, &WrapI_IUUU<sceNpMatching2LeaveRoom>, "sceNpMatching2LeaveRoom", 'i', "ixxx" },
{0xAAD0946A, &WrapI_IUUUUU<sceNpMatching2JoinRoom>, "sceNpMatching2JoinRoom", 'i', "ixxxxx" },
{0xAAD0946A, &WrapI_IUUUUU<sceNpMatching2CreateJoinRoom>, "sceNpMatching2CreateJoinRoom", 'i', "ixxxxx" },
{0x81C13E6D, &WrapI_IUUU<sceNpMatching2SearchRoom>, "sceNpMatching2SearchRoom", 'i', "ixxx" },
{0x55F7837F, &WrapI_IUUU<sceNpMatching2SendRoomChatMessage>, "sceNpMatching2SendRoomChatMessage", 'i', "ixxx" },
{0x12C5A111, nullptr, "sceNpMatching2GetRoomDataExternalList", 'i', "" },
{0x6D6D0C75, nullptr, "sceNpMatching2SignalingGetConnectionStatus", 'i', "" },
{0x7BBFC427, nullptr, "sceNpMatching2JoinRoom", 'i', "" },
{0x97529ECC, nullptr, "sceNpMatching2KickoutRoomMember", 'i', "" },
{0xA53E7C69, nullptr, "sceNpMatching2GetWorldInfoList", 'i', "" },
{0xE6C93DBD, nullptr, "sceNpMatching2SetRoomDataInternal", 'i', "" },
{0xFADBA9DB, nullptr, "sceNpMatching2AbortRequest", 'i', "" },
};
void Register_sceNpMatching2()