From cd9bfba790650e958f7512465a5d574e011af089 Mon Sep 17 00:00:00 2001 From: scribam Date: Sat, 3 Feb 2018 14:07:41 +0100 Subject: [PATCH] Add sceNpMatchingInt --- rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp | 41 +++++++++++++++++++++ rpcs3/Emu/Cell/PPUModule.cpp | 1 + rpcs3/Emu/Cell/PPUModule.h | 1 + rpcs3/emucore.vcxproj | 1 + rpcs3/emucore.vcxproj.filters | 9 +++-- 5 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp b/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp new file mode 100644 index 0000000000..03a88d057e --- /dev/null +++ b/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp @@ -0,0 +1,41 @@ +#include "stdafx.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUModule.h" + +namespace vm { using namespace ps3; } + +logs::channel sceNpMatchingInt("sceNpMatchingInt"); + +s32 sceNpMatchingGetRoomMemberList() +{ + UNIMPLEMENTED_FUNC(sceNpMatchingInt); + return CELL_OK; +} + +// Parameter "unknown" added to distinguish this function +// from the one in sceNp.cpp which has the same name +s32 sceNpMatchingJoinRoomGUI(vm::ptr unknown) +{ + UNIMPLEMENTED_FUNC(sceNpMatchingInt); + return CELL_OK; +} + +s32 sceNpMatchingGetRoomListGUI() +{ + UNIMPLEMENTED_FUNC(sceNpMatchingInt); + return CELL_OK; +} + +s32 sceNpMatchingSendRoomMessage() +{ + UNIMPLEMENTED_FUNC(sceNpMatchingInt); + return CELL_OK; +} + +DECLARE(ppu_module_manager::sceNpMatchingInt)("sceNpMatchingInt", []() +{ + REG_FUNC(sceNpMatchingInt, sceNpMatchingGetRoomMemberList); + REG_FUNC(sceNpMatchingInt, sceNpMatchingJoinRoomGUI); + REG_FUNC(sceNpMatchingInt, sceNpMatchingGetRoomListGUI); + REG_FUNC(sceNpMatchingInt, sceNpMatchingSendRoomMessage); +}); diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index b5f438e7d2..f041e6cb66 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -244,6 +244,7 @@ static void ppu_initialize_modules(const std::shared_ptr& link &ppu_module_manager::sceNp2, &ppu_module_manager::sceNpClans, &ppu_module_manager::sceNpCommerce2, + &ppu_module_manager::sceNpMatchingInt, &ppu_module_manager::sceNpSns, &ppu_module_manager::sceNpTrophy, &ppu_module_manager::sceNpTus, diff --git a/rpcs3/Emu/Cell/PPUModule.h b/rpcs3/Emu/Cell/PPUModule.h index ca11e49150..b55c4c648d 100644 --- a/rpcs3/Emu/Cell/PPUModule.h +++ b/rpcs3/Emu/Cell/PPUModule.h @@ -255,6 +255,7 @@ public: static const ppu_static_module sceNp2; static const ppu_static_module sceNpClans; static const ppu_static_module sceNpCommerce2; + static const ppu_static_module sceNpMatchingInt; static const ppu_static_module sceNpSns; static const ppu_static_module sceNpTrophy; static const ppu_static_module sceNpTus; diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 25ef24c291..815eb3b8df 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -250,6 +250,7 @@ + diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index ff3af6549a..39f15d2c55 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -587,6 +587,9 @@ Emu\Cell\Modules + + Emu\Cell\Modules + Emu\Cell\Modules @@ -934,12 +937,12 @@ Emu\Cell\lv2 - + Emu\Io - + - Emu\GPU\RSX + Emu\GPU\RSX