BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-26 07:48:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge commit '40f0744b73' into main

Browse source
This commit is contained in:
Sam Lantinga 2023-01-13 14:20:10 -08:00
commit 0475d65635
1 changed files with 3 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/core/ps2/SDL_ps2.c
View file

@ -34,9 +34,7 @@
#include <sifrpc.h>
#include <iopcontrol.h>
#include <sbv_patches.h>
#include <ps2_fileXio_driver.h>
#include <ps2_memcard_driver.h>
#include <ps2_usb_driver.h>
#include <ps2_filesystem_driver.h>
__attribute__((weak)) void reset_IOP()
{
@ -58,29 +56,12 @@ static void prepare_IOP()
static void init_drivers()
{
init_memcard_driver(true);
init_usb_driver(true);
init_ps2_filesystem_driver();
}
static void deinit_drivers()
{
deinit_usb_driver(true);
deinit_memcard_driver(true);
}
static void waitUntilDeviceIsReady(char *path)
{
struct stat buffer;
int ret = -1;
int retries = 50;
while (ret != 0 && retries > 0) {
ret = stat(path, &buffer);
/* Wait until the device is ready */
nopdelay();
retries--;
}
deinit_ps2_filesystem_driver();
}
DECLSPEC int
@ -93,9 +74,6 @@ SDL_RunApp(int argc, char* argv[], SDL_main_func mainFunction, void * reserved)
prepare_IOP();
init_drivers();
getcwd(cwd, sizeof(cwd));
waitUntilDeviceIsReady(cwd);
SDL_SetMainReady();
res = mainFunction(argc, argv);