archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add the ability to set the PSID from the configuration (#12637)

Browse source
This commit is contained in:
Yui 2022-09-12 11:23:13 +01:00 • committed by GitHub
parent 37aefe5811
commit 9e83bc6544
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/Cell/lv2/sys_ss.cpp
View file

@ -5,6 +5,7 @@
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUThread.h"
#include "Emu/Cell/timers.hpp" #include "Emu/Cell/timers.hpp"
#include "Emu/system_config.h"
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
@ -137,8 +138,8 @@ s32 sys_ss_get_open_psid(vm::ptr<CellSsOpenPSID> psid)
{ {
sys_ss.warning("sys_ss_get_open_psid(psid=*0x%x)", psid); sys_ss.warning("sys_ss_get_open_psid(psid=*0x%x)", psid);
psid->high = 0; psid->high = g_cfg.sys.console_psid_high;
psid->low = 0; psid->low = g_cfg.sys.console_psid_low;
return CELL_OK; return CELL_OK;
} }

2
rpcs3/Emu/system_config.h
View file

@ -295,6 +295,8 @@ struct cfg_root : cfg::node
cfg::_enum<CellKbMappingType> keyboard_type{ this, "Keyboard Type", CellKbMappingType{0} }; // CELL_KB_MAPPING_101 = US cfg::_enum<CellKbMappingType> keyboard_type{ this, "Keyboard Type", CellKbMappingType{0} }; // CELL_KB_MAPPING_101 = US
cfg::_enum<enter_button_assign> enter_button_assignment{ this, "Enter button assignment", enter_button_assign::cross }; cfg::_enum<enter_button_assign> enter_button_assignment{ this, "Enter button assignment", enter_button_assign::cross };
cfg::_int<-60*60*24*365*100LL, 60*60*24*365*100LL> console_time_offset{ this, "Console time offset (s)", 0 }; // console time offset, limited to +/-100years cfg::_int<-60*60*24*365*100LL, 60*60*24*365*100LL> console_time_offset{ this, "Console time offset (s)", 0 }; // console time offset, limited to +/-100years
cfg::uint<0,umax> console_psid_high{ this, "PSID high"};
cfg::uint<0,umax> console_psid_low{ this, "PSID low"};
} sys{ this }; } sys{ this };