mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-27 12:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GX) fix USB support

Browse Source
This commit is contained in:
Toad King 2012-08-22 15:56:20 -04:00
parent c065f93e7c
commit a88e9e024f
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
console/rarch_console_exec.c
View File

@ -30,6 +30,10 @@
#include <ogc/lwp_threads.h> #include <ogc/lwp_threads.h>
#include <ogc/system.h> #include <ogc/system.h>
#include <gctypes.h> #include <gctypes.h>
#ifdef HW_RVL
#include <sdcard/wiisd_io.h>
#include <ogc/usbstorage.h>
#endif
#include "exec/dol.h" #include "exec/dol.h"
#endif #endif
@ -88,6 +92,10 @@ void rarch_console_exec(const char *path)
#endif #endif
fatUnmount("carda:"); fatUnmount("carda:");
fatUnmount("cardb:"); fatUnmount("cardb:");
#ifdef HW_RVL
__io_wiisd.shutdown();
__io_usbstorage.shutdown();
#endif
uint32_t *ep = load_dol_image(mem); uint32_t *ep = load_dol_image(mem);
if (ep[1] == ARGV_MAGIC) if (ep[1] == ARGV_MAGIC)

7
gx/frontend/main.c
View File

@ -37,7 +37,7 @@
#include <dirent.h> #include <dirent.h>
#ifdef HW_RVL #ifdef HW_RVL
#include <sdcard/wiisd_io.h> #include <ogc/ios.h>
#endif #endif
#include <sdcard/gcsd.h> #include <sdcard/gcsd.h>
#include <fat.h> #include <fat.h>
@ -313,8 +313,10 @@ int rarch_main(int argc, char **argv);
static void get_environment_settings(void) static void get_environment_settings(void)
{ {
snprintf(default_paths.port_dir, sizeof(default_paths.port_dir), "/retroarch");
getcwd(default_paths.core_dir, MAXPATHLEN); getcwd(default_paths.core_dir, MAXPATHLEN);
*(strrchr(default_paths.core_dir, '/')) = 0;
char *device_end = strchr(default_paths.core_dir, '/');
snprintf(default_paths.port_dir, sizeof(default_paths.port_dir), "%.*s/retroarch", device_end - default_paths.core_dir, default_paths.core_dir);
snprintf(default_paths.config_file, sizeof(default_paths.config_file), "%s/retroarch.cfg", default_paths.port_dir); snprintf(default_paths.config_file, sizeof(default_paths.config_file), "%s/retroarch.cfg", default_paths.port_dir);
snprintf(default_paths.system_dir, sizeof(default_paths.system_dir), "%s/system", default_paths.port_dir); snprintf(default_paths.system_dir, sizeof(default_paths.system_dir), "%s/system", default_paths.port_dir);
snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.port_dir); snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.port_dir);
@ -364,6 +366,7 @@ static void make_directories(void)
int main(void) int main(void)
{ {
#ifdef HW_RVL #ifdef HW_RVL
IOS_ReloadIOS(IOS_GetVersion());
L2Enhance(); L2Enhance();
#endif #endif

16
gx/salamander/main.c
View File

@ -18,6 +18,7 @@
#include "../../boolean.h" #include "../../boolean.h"
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <sys/stat.h>
#include <sdcard/wiisd_io.h> #include <sdcard/wiisd_io.h>
#include <sdcard/gcsd.h> #include <sdcard/gcsd.h>
@ -67,7 +68,7 @@ static void find_and_set_first_file(void)
static void init_settings(void) static void init_settings(void)
{ {
char tmp_str[512]; char tmp_str[512] = {0};
bool config_file_exists; bool config_file_exists;
if(!path_file_exists(default_paths.config_file)) if(!path_file_exists(default_paths.config_file))
@ -108,21 +109,15 @@ static void init_settings(void)
{ {
RARCH_LOG("Start [%s] found in retroarch.cfg.\n", libretro_path); RARCH_LOG("Start [%s] found in retroarch.cfg.\n", libretro_path);
} }
if (!config_file_exists)
{
config_file_t *new_conf = config_file_new(NULL);
config_set_string(new_conf, "libretro_path", libretro_path);
config_file_write(new_conf, default_paths.config_file);
config_file_free(new_conf);
}
} }
} }
static void get_environment_settings(void) static void get_environment_settings(void)
{ {
snprintf(default_paths.port_dir, sizeof(default_paths.port_dir), "/retroarch");
getcwd(default_paths.core_dir, MAXPATHLEN); getcwd(default_paths.core_dir, MAXPATHLEN);
*(strrchr(default_paths.core_dir, '/')) = 0;
char *device_end = strchr(default_paths.core_dir, '/');
snprintf(default_paths.port_dir, sizeof(default_paths.port_dir), "%.*s/retroarch", device_end - default_paths.core_dir, default_paths.core_dir);
snprintf(default_paths.config_file, sizeof(default_paths.config_file), "%s/retroarch.cfg", default_paths.port_dir); snprintf(default_paths.config_file, sizeof(default_paths.config_file), "%s/retroarch.cfg", default_paths.port_dir);
snprintf(default_paths.system_dir, sizeof(default_paths.system_dir), "%s/system", default_paths.port_dir); snprintf(default_paths.system_dir, sizeof(default_paths.system_dir), "%s/system", default_paths.port_dir);
snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.port_dir); snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.port_dir);
@ -137,6 +132,7 @@ static void get_environment_settings(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef HW_RVL #ifdef HW_RVL
IOS_ReloadIOS(IOS_GetVersion());
L2Enhance(); L2Enhance();
#endif #endif