ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: load main settings once per startup and remove "configChanged" boolean 

Let save state loading override currently selected devices
This commit is contained in:
jackun 2020-11-25 01:08:25 +02:00
parent b2bf0301bb
commit 17cbb835ce
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/USB/USB.cpp
View File

@ -32,7 +32,6 @@
OHCIState* qemu_ohci = NULL; OHCIState* qemu_ohci = NULL;
USBDevice* usb_device[2] = {NULL}; USBDevice* usb_device[2] = {NULL};
bool configChanged = false;
static bool usb_opened = false; static bool usb_opened = false;
Config conf; Config conf;
@ -283,9 +282,8 @@ s32 USBopen(void* pDsp)
Console.WriteLn(Color_Red, "USB: %s", e.what()); Console.WriteLn(Color_Red, "USB: %s", e.what());
} }
if (configChanged || (!usb_device[0] && !usb_device[1])) if (!usb_device[0] && !usb_device[1])
{ {
configChanged = false;
CreateDevices(); //TODO Pass pDsp to init? CreateDevices(); //TODO Pass pDsp to init?
} }
@ -353,7 +351,7 @@ s32 USBfreeze(int mode, freezeData* data)
{ {
if ((long unsigned int)data->size < sizeof(USBfreezeData)) if ((long unsigned int)data->size < sizeof(USBfreezeData))
{ {
Console.WriteLn(Color_Red, "USB: Unable to load freeze data! Got %d bytes, expected >= %zu.\n", data->size, sizeof(USBfreezeData)); Console.WriteLn(Color_Red, "USB: Unable to load freeze data! Got %d bytes, expected >= %zu.", data->size, sizeof(USBfreezeData));
return -1; return -1;
} }
@ -362,12 +360,10 @@ s32 USBfreeze(int mode, freezeData* data)
if (strcmp(usbd.freezeID, USBfreezeID) != 0) if (strcmp(usbd.freezeID, USBfreezeID) != 0)
{ {
Console.WriteLn(Color_Red, "USB: Unable to load freeze data! Found ID %s, expected ID %s.\n", usbd.freezeID, USBfreezeID); Console.WriteLn(Color_Red, "USB: Unable to load freeze data! Found ID %s, expected ID %s.", usbd.freezeID, USBfreezeID);
return -1; return -1;
} }
s8* ptr = data->data + sizeof(USBfreezeData);
// Load the state of the attached devices
if ((long unsigned int)data->size < sizeof(USBfreezeData) + usbd.device[0].size + usbd.device[1].size + 8192) if ((long unsigned int)data->size < sizeof(USBfreezeData) + usbd.device[0].size + usbd.device[1].size + 8192)
return -1; return -1;
@ -390,6 +386,7 @@ s32 USBfreeze(int mode, freezeData* data)
// restore USBPacket for OHCIState // restore USBPacket for OHCIState
usb_packet_init(&qemu_ohci->usb_packet); usb_packet_init(&qemu_ohci->usb_packet);
s8* ptr = data->data + sizeof(USBfreezeData);
RegisterDevice& regInst = RegisterDevice::instance(); RegisterDevice& regInst = RegisterDevice::instance();
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
@ -418,7 +415,7 @@ s32 USBfreeze(int mode, freezeData* data)
{ {
if (proxy->Freeze(FREEZE_SIZE, usb_device[i], nullptr) != (s32)usbd.device[i].size) if (proxy->Freeze(FREEZE_SIZE, usb_device[i], nullptr) != (s32)usbd.device[i].size)
{ {
Console.WriteLn(Color_Red, "USB: Port %d: device's freeze size doesn't match.\n", 1 + (1 - i)); Console.WriteLn(Color_Red, "USB: Port %d: device's freeze size doesn't match.", i);
return -1; return -1;
} }

2
pcsx2/USB/Win32/Config_usb.cpp
View File

@ -25,7 +25,6 @@
#include "../shared/inifile_usb.h" #include "../shared/inifile_usb.h"
HINSTANCE hInstUSB; HINSTANCE hInstUSB;
extern bool configChanged;
void SysMessageA(const char* fmt, ...) void SysMessageA(const char* fmt, ...)
{ {
@ -223,7 +222,6 @@ BOOL CALLBACK ConfigureDlgProcUSB(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
SaveConfig(); SaveConfig();
CreateDevices(); CreateDevices();
EndDialog(hW, RESULT_OK); EndDialog(hW, RESULT_OK);
configChanged = true;
return TRUE; return TRUE;
} }
} }

6
pcsx2/USB/configuration.cpp
View File

@ -174,9 +174,13 @@ void SaveConfig()
void LoadConfig() void LoadConfig()
{ {
USBsetSettingsDir(); USBsetSettingsDir();
static bool loaded = false;
if (loaded)
return;
loaded = true;
#ifdef _WIN32 #ifdef _WIN32
ciniFile.Load(IniPath); ciniFile.Load(IniPath);
LoadSetting(L"MAIN", L"log", conf.Log); LoadSetting(L"MAIN", L"log", conf.Log);

5
pcsx2/USB/linux/config-gtk.cpp
View File

@ -31,9 +31,6 @@
#include "config.h" #include "config.h"
#include "../USB.h" #include "../USB.h"
// src/USB.cpp
extern bool configChanged;
struct SettingsCB struct SettingsCB
{ {
int player; int player;
@ -311,7 +308,7 @@ void USBconfigure()
if (result == GTK_RESPONSE_OK) if (result == GTK_RESPONSE_OK)
{ {
SaveConfig(); SaveConfig();
configChanged = true; CreateDevices();
} }
// ClearAPIs(); // ClearAPIs();
paused_core.AllowResume(); paused_core.AllowResume();