mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-27 04:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return an error before a pad is opened (#3323)

Browse Source
This commit is contained in:
Marcin Mikołajczyk 2025-07-26 01:23:57 +02:00 committed by GitHub
parent 446426224e
commit c863b350b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/libraries/pad/pad.cpp
View File

@ -13,6 +13,9 @@ namespace Libraries::Pad {
using Input::GameController; using Input::GameController;
static bool g_initialized = false;
static bool g_opened = false;
int PS4_SYSV_ABI scePadClose(s32 handle) { int PS4_SYSV_ABI scePadClose(s32 handle) {
LOG_ERROR(Lib_Pad, "(STUBBED) called"); LOG_ERROR(Lib_Pad, "(STUBBED) called");
return ORBIS_OK; return ORBIS_OK;
@ -157,7 +160,10 @@ int PS4_SYSV_ABI scePadGetFeatureReport() {
} }
int PS4_SYSV_ABI scePadGetHandle(s32 userId, s32 type, s32 index) { int PS4_SYSV_ABI scePadGetHandle(s32 userId, s32 type, s32 index) {
if (userId == -1) { if (!g_initialized) {
return ORBIS_PAD_ERROR_NOT_INITIALIZED;
}
if (userId == -1 || !g_opened) {
return ORBIS_PAD_ERROR_DEVICE_NO_HANDLE; return ORBIS_PAD_ERROR_DEVICE_NO_HANDLE;
} }
LOG_DEBUG(Lib_Pad, "(DUMMY) called"); LOG_DEBUG(Lib_Pad, "(DUMMY) called");
@ -206,6 +212,7 @@ int PS4_SYSV_ABI scePadGetVersionInfo() {
int PS4_SYSV_ABI scePadInit() { int PS4_SYSV_ABI scePadInit() {
LOG_ERROR(Lib_Pad, "(STUBBED) called"); LOG_ERROR(Lib_Pad, "(STUBBED) called");
g_initialized = true;
return ORBIS_OK; return ORBIS_OK;
} }
@ -250,6 +257,9 @@ int PS4_SYSV_ABI scePadMbusTerm() {
} }
int PS4_SYSV_ABI scePadOpen(s32 userId, s32 type, s32 index, const OrbisPadOpenParam* pParam) { int PS4_SYSV_ABI scePadOpen(s32 userId, s32 type, s32 index, const OrbisPadOpenParam* pParam) {
if (!g_initialized) {
return ORBIS_PAD_ERROR_NOT_INITIALIZED;
}
if (userId == -1) { if (userId == -1) {
return ORBIS_PAD_ERROR_DEVICE_NO_HANDLE; return ORBIS_PAD_ERROR_DEVICE_NO_HANDLE;
} }
@ -261,6 +271,7 @@ int PS4_SYSV_ABI scePadOpen(s32 userId, s32 type, s32 index, const OrbisPadOpenP
return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED; return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED;
} }
LOG_INFO(Lib_Pad, "(DUMMY) called user_id = {} type = {} index = {}", userId, type, index); LOG_INFO(Lib_Pad, "(DUMMY) called user_id = {} type = {} index = {}", userId, type, index);
g_opened = true;
scePadResetLightBar(1); scePadResetLightBar(1);
return 1; // dummy return 1; // dummy
} }