From 3aa293a7a3a8521dca8f9ee078297054f8d1fc4a Mon Sep 17 00:00:00 2001 From: AniLeo Date: Thu, 20 Feb 2020 17:34:09 +0000 Subject: [PATCH] hle: cellAuthDialog Basic RE of cellAuthDialog, stubs functions --- rpcs3/Emu/CMakeLists.txt | 1 + rpcs3/Emu/Cell/Modules/cellAuthDialog.cpp | 66 +++++++++++++++++++++++ rpcs3/Emu/Cell/PPUModule.cpp | 1 + rpcs3/Emu/Cell/PPUModule.h | 1 + rpcs3/emucore.vcxproj | 3 +- rpcs3/emucore.vcxproj.filters | 5 +- 6 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 rpcs3/Emu/Cell/Modules/cellAuthDialog.cpp diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index fa01bfaff4..6142d581b9 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -191,6 +191,7 @@ target_sources(rpcs3_emu PRIVATE Cell/Modules/cellAtracMulti.cpp Cell/Modules/cellAudio.cpp Cell/Modules/cellAudioOut.cpp + Cell/Modules/cellAuthDialog.cpp Cell/Modules/cellAvconfExt.cpp Cell/Modules/cellBgdl.cpp Cell/Modules/cellCamera.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellAuthDialog.cpp b/rpcs3/Emu/Cell/Modules/cellAuthDialog.cpp new file mode 100644 index 0000000000..d5e6718351 --- /dev/null +++ b/rpcs3/Emu/Cell/Modules/cellAuthDialog.cpp @@ -0,0 +1,66 @@ +#include "stdafx.h" +#include "Emu/Cell/PPUModule.h" + +LOG_CHANNEL(cellSysutil); + +// All error codes are unknown at this point in implementation +enum cellSysutilAuthDialogError : u32 +{ + CELL_AUTHDIALOG_UNKNOWN_201 = 0x8002D201, + CELL_AUTHDIALOG_ARG1_IS_ZERO = 0x8002D202, + CELL_AUTHDIALOG_UNKNOWN_203 = 0x8002D203, +}; + +template<> +void fmt_class_string::format(std::string& out, u64 arg) +{ + format_enum(out, arg, [](auto error) + { + switch (error) + { + STR_CASE(CELL_AUTHDIALOG_UNKNOWN_201); + STR_CASE(CELL_AUTHDIALOG_ARG1_IS_ZERO); + STR_CASE(CELL_AUTHDIALOG_UNKNOWN_203); + } + + return unknown; + }); +} + +// Decompilation suggests arg1 is s64 but the check is for == 0 instead of >= 0 +error_code cellAuthDialogOpen(u64 arg1 /* arg2 */) +{ + cellSysutil.todo("cellAuthDialogOpen(arg1=%u)", arg1); + + if (arg1 == 0) + return CELL_AUTHDIALOG_ARG1_IS_ZERO; + + return CELL_OK; +} + +error_code cellAuthDialogAbort() +{ + cellSysutil.todo("cellAuthDialogAbort()"); + + // If it fails the first if condition (not init cond?) + // return CELL_AUTHDIALOG_UNKNOWN_203; + + return CELL_OK; +} + +error_code cellAuthDialogClose(/* arg1 */) +{ + cellSysutil.todo("cellAuthDialogClose()"); + + // If it fails the first if condition (not init cond?) + // return CELL_AUTHDIALOG_UNKNOWN_203; + + return CELL_OK; +} + +DECLARE(ppu_module_manager::cellAuthDialogUtility)("cellAuthDialogUtility", []() +{ + REG_FUNC(cellAuthDialogUtility, cellAuthDialogOpen); + REG_FUNC(cellAuthDialogUtility, cellAuthDialogAbort); + REG_FUNC(cellAuthDialogUtility, cellAuthDialogClose); +}); diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index 86b2d49808..848885b87a 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -164,6 +164,7 @@ static void ppu_initialize_modules(ppu_linkage_info* link) &ppu_module_manager::cellAtracMulti, &ppu_module_manager::cellAudio, &ppu_module_manager::cellAvconfExt, + &ppu_module_manager::cellAuthDialogUtility, &ppu_module_manager::cellBGDL, &ppu_module_manager::cellCamera, &ppu_module_manager::cellCelp8Enc, diff --git a/rpcs3/Emu/Cell/PPUModule.h b/rpcs3/Emu/Cell/PPUModule.h index 8a6e2b572d..5dca65cd04 100644 --- a/rpcs3/Emu/Cell/PPUModule.h +++ b/rpcs3/Emu/Cell/PPUModule.h @@ -171,6 +171,7 @@ public: static const ppu_static_module cellAtracMulti; static const ppu_static_module cellAudio; static const ppu_static_module cellAvconfExt; + static const ppu_static_module cellAuthDialogUtility; static const ppu_static_module cellBGDL; static const ppu_static_module cellCamera; static const ppu_static_module cellCelp8Enc; diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 7d19ae7025..c9fa8dabb1 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -190,6 +190,7 @@ + @@ -691,4 +692,4 @@ - \ No newline at end of file + diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index cf5b78d574..e4dfc96636 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -341,6 +341,9 @@ Emu\Cell\Modules + + Emu\Cell\Modules + Emu\Cell\Modules @@ -1703,4 +1706,4 @@ Emu\GPU\RSX\Overlays - \ No newline at end of file +