Add Extra sceNp2 logging

This commit is contained in:
RipleyTom 2025-12-19 05:47:50 +01:00 committed by Megamouse
parent 5507078bd8
commit b99bd12d5e
4 changed files with 20 additions and 3 deletions

View File

@ -1,3 +1,4 @@
#include "Emu/NP/np_structs_extra.h"
#include "stdafx.h" #include "stdafx.h"
#include <bit> #include <bit>
@ -155,6 +156,8 @@ namespace np
slots.openPublicSlotNum = open_public_slots; slots.openPublicSlotNum = open_public_slots;
slots.openPrivateSlotNum = open_private_slots; slots.openPrivateSlotNum = open_private_slots;
extra_nps::print_SceNpMatching2RoomSlotInfo(&slots);
return {CELL_OK, slots}; return {CELL_OK, slots};
} }

View File

@ -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 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); cb(cb_ppu, ctx_id, req_id, event_type, event_key, error_code, data_size, cb_arg);
return 0; return 0;
}); });

View File

@ -186,7 +186,7 @@ namespace extra_nps
sceNp2.warning("SceNpMatching2SearchRoomResponse:"); sceNp2.warning("SceNpMatching2SearchRoomResponse:");
print_range(&resp->range); 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++) for (u32 i = 0; i < resp->range.total; i++)
{ {
sceNp2.warning("SceNpMatching2SearchRoomResponse[%d]:", i); sceNp2.warning("SceNpMatching2SearchRoomResponse[%d]:", i);
@ -471,7 +471,7 @@ namespace extra_nps
{ {
sceNp.warning("ptr: *0x%x", data->value.data.ptr); sceNp.warning("ptr: *0x%x", data->value.data.ptr);
sceNp.warning("size: %d", data->value.data.size); sceNp.warning("size: %d", data->value.data.size);
sceNp.warning("data:\n%s", fmt::buf_to_hexstring(static_cast<u8 *>(data->value.data.ptr.get_ptr()), data->value.data.size)); sceNp.warning("data:\n%s", fmt::buf_to_hexstring(static_cast<u8*>(data->value.data.ptr.get_ptr()), data->value.data.size));
} }
else 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 } // namespace extra_nps

View File

@ -41,4 +41,5 @@ namespace extra_nps
void print_SceNpMatchingRoomStatus(const SceNpMatchingRoomStatus* data); void print_SceNpMatchingRoomStatus(const SceNpMatchingRoomStatus* data);
void print_SceNpMatchingJoinedRoomInfo(const SceNpMatchingJoinedRoomInfo* data); void print_SceNpMatchingJoinedRoomInfo(const SceNpMatchingJoinedRoomInfo* data);
void print_SceNpMatchingSearchJoinRoomInfo(const SceNpMatchingSearchJoinRoomInfo* data); void print_SceNpMatchingSearchJoinRoomInfo(const SceNpMatchingSearchJoinRoomInfo* data);
void print_SceNpMatching2RoomSlotInfo(const SceNpMatching2RoomSlotInfo* data);
} // namespace extra_nps } // namespace extra_nps