From b99bd12d5ed723bb476c09beb277c28d69545673 Mon Sep 17 00:00:00 2001 From: RipleyTom Date: Fri, 19 Dec 2025 05:47:50 +0100 Subject: [PATCH] Add Extra sceNp2 logging --- rpcs3/Emu/NP/np_cache.cpp | 3 +++ rpcs3/Emu/NP/np_handler.cpp | 1 + rpcs3/Emu/NP/np_structs_extra.cpp | 18 +++++++++++++++--- rpcs3/Emu/NP/np_structs_extra.h | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/NP/np_cache.cpp b/rpcs3/Emu/NP/np_cache.cpp index 3b1c38bd9e..edb0ab1903 100644 --- a/rpcs3/Emu/NP/np_cache.cpp +++ b/rpcs3/Emu/NP/np_cache.cpp @@ -1,3 +1,4 @@ +#include "Emu/NP/np_structs_extra.h" #include "stdafx.h" #include @@ -155,6 +156,8 @@ namespace np slots.openPublicSlotNum = open_public_slots; slots.openPrivateSlotNum = open_private_slots; + extra_nps::print_SceNpMatching2RoomSlotInfo(&slots); + return {CELL_OK, slots}; } diff --git a/rpcs3/Emu/NP/np_handler.cpp b/rpcs3/Emu/NP/np_handler.cpp index 5bf637747c..01d947d32e 100644 --- a/rpcs3/Emu/NP/np_handler.cpp +++ b/rpcs3/Emu/NP/np_handler.cpp @@ -1708,6 +1708,7 @@ namespace np { sysutil_register_cb([=, ctx_id = this->ctx_id, event_type = this->event_type, cb = this->cb, cb_arg = this->cb_arg](ppu_thread& cb_ppu) -> s32 { + sceNp2.trace("Calling callback 0x%x with req_id %d, event_type: 0x%x, error_code: 0x%x", cb, req_id, event_type, error_code); cb(cb_ppu, ctx_id, req_id, event_type, event_key, error_code, data_size, cb_arg); return 0; }); diff --git a/rpcs3/Emu/NP/np_structs_extra.cpp b/rpcs3/Emu/NP/np_structs_extra.cpp index 2acba3d045..52f394ff2e 100644 --- a/rpcs3/Emu/NP/np_structs_extra.cpp +++ b/rpcs3/Emu/NP/np_structs_extra.cpp @@ -104,7 +104,7 @@ namespace extra_nps for (u32 i = 0; i < req->roomSearchableIntAttrExternalNum && req->roomSearchableIntAttrExternal; i++) print_int_attr(&req->roomSearchableIntAttrExternal[i]); - + sceNp2.warning("roomSearchableBinAttrExternal: *0x%x", req->roomSearchableBinAttrExternal); sceNp2.warning("roomSearchableBinAttrExternalNum: %d", req->roomSearchableBinAttrExternalNum); @@ -186,7 +186,7 @@ namespace extra_nps sceNp2.warning("SceNpMatching2SearchRoomResponse:"); print_range(&resp->range); - const SceNpMatching2RoomDataExternal *room_ptr = resp->roomDataExternal.get_ptr(); + const SceNpMatching2RoomDataExternal* room_ptr = resp->roomDataExternal.get_ptr(); for (u32 i = 0; i < resp->range.total; i++) { sceNp2.warning("SceNpMatching2SearchRoomResponse[%d]:", i); @@ -471,7 +471,7 @@ namespace extra_nps { sceNp.warning("ptr: *0x%x", data->value.data.ptr); sceNp.warning("size: %d", data->value.data.size); - sceNp.warning("data:\n%s", fmt::buf_to_hexstring(static_cast(data->value.data.ptr.get_ptr()), data->value.data.size)); + sceNp.warning("data:\n%s", fmt::buf_to_hexstring(static_cast(data->value.data.ptr.get_ptr()), data->value.data.size)); } else { @@ -577,4 +577,16 @@ namespace extra_nps } } + void print_SceNpMatching2RoomSlotInfo(const SceNpMatching2RoomSlotInfo* data) + { + sceNp.warning("SceNpMatching2RoomSlotInfo:"); + sceNp.warning("roomId: %d", data->roomId); + sceNp.warning("joinedSlotMask: %x", data->joinedSlotMask); + sceNp.warning("passwordSlotMask: %x", data->passwordSlotMask); + sceNp.warning("publicSlotNum: %d", data->publicSlotNum); + sceNp.warning("privateSlotNum: %d", data->privateSlotNum); + sceNp.warning("openPublicSlotNum: %d", data->openPublicSlotNum); + sceNp.warning("openPrivateSlotNum: %d", data->openPrivateSlotNum); + } + } // namespace extra_nps diff --git a/rpcs3/Emu/NP/np_structs_extra.h b/rpcs3/Emu/NP/np_structs_extra.h index d05711fabd..1c722a0cf2 100644 --- a/rpcs3/Emu/NP/np_structs_extra.h +++ b/rpcs3/Emu/NP/np_structs_extra.h @@ -41,4 +41,5 @@ namespace extra_nps void print_SceNpMatchingRoomStatus(const SceNpMatchingRoomStatus* data); void print_SceNpMatchingJoinedRoomInfo(const SceNpMatchingJoinedRoomInfo* data); void print_SceNpMatchingSearchJoinRoomInfo(const SceNpMatchingSearchJoinRoomInfo* data); + void print_SceNpMatching2RoomSlotInfo(const SceNpMatching2RoomSlotInfo* data); } // namespace extra_nps