mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

(SSNES_CONSOLE) Numerous cleanups, indenting cleanups, include header file fixes,

Browse Source 
etc.
This commit is contained in:
Twinaphex 2012-04-11 02:42:27 +02:00
parent 1cdba6b0c5
commit 726fa479fa
8 changed files with 667 additions and 672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.xenon
View File

@ -18,9 +18,9 @@ PPU_TARGET_ADJUSTED := ssnes-libxenon.elf32
LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32 LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
INCDIRS = -I. -I$(DEVKITXENON)/usr/include INCDIRS = -I. -I$(DEVKITXENON)/usr/include
OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o gfx/gfx_common.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o
LIBS = -lsnes -lxenon -lm -lc LIBS = -lretro -lxenon -lm -lc
DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.5\" -DSSNES_CONSOLE -DHAVE_GETOPT_LONG=1 -Dmain=ssnes_main DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.5\" -DSSNES_CONSOLE -DHAVE_GETOPT_LONG=1 -Dmain=ssnes_main
DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS) DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS)
DEFINES += -u read -u _start -u exc_base DEFINES += -u read -u _start -u exc_base
@ -52,4 +52,3 @@ clean:
rm -f $(OBJ) rm -f $(OBJ)
.PHONY: clean .PHONY: clean

42
console/console_ext.h
View File

@ -19,27 +19,27 @@
enum enum
{ {
ASPECT_RATIO_4_3, ASPECT_RATIO_4_3,
ASPECT_RATIO_4_4, ASPECT_RATIO_4_4,
ASPECT_RATIO_4_1, ASPECT_RATIO_4_1,
ASPECT_RATIO_5_4, ASPECT_RATIO_5_4,
ASPECT_RATIO_6_5, ASPECT_RATIO_6_5,
ASPECT_RATIO_7_9, ASPECT_RATIO_7_9,
ASPECT_RATIO_8_3, ASPECT_RATIO_8_3,
ASPECT_RATIO_8_7, ASPECT_RATIO_8_7,
ASPECT_RATIO_16_9, ASPECT_RATIO_16_9,
ASPECT_RATIO_16_10, ASPECT_RATIO_16_10,
ASPECT_RATIO_16_15, ASPECT_RATIO_16_15,
ASPECT_RATIO_19_12, ASPECT_RATIO_19_12,
ASPECT_RATIO_19_14, ASPECT_RATIO_19_14,
ASPECT_RATIO_30_17, ASPECT_RATIO_30_17,
ASPECT_RATIO_32_9, ASPECT_RATIO_32_9,
ASPECT_RATIO_2_1, ASPECT_RATIO_2_1,
ASPECT_RATIO_3_2, ASPECT_RATIO_3_2,
ASPECT_RATIO_3_4, ASPECT_RATIO_3_4,
ASPECT_RATIO_1_1, ASPECT_RATIO_1_1,
ASPECT_RATIO_AUTO, ASPECT_RATIO_AUTO,
ASPECT_RATIO_CUSTOM ASPECT_RATIO_CUSTOM
}; };
#define LAST_ASPECT_RATIO ASPECT_RATIO_CUSTOM #define LAST_ASPECT_RATIO ASPECT_RATIO_CUSTOM

22
console/fileio/file_browser.c
View File

@ -33,7 +33,7 @@ static int less_than_key(const void * a, const void * b)
return strcasecmp(a_dir->d_name, b_dir->d_name); return strcasecmp(a_dir->d_name, b_dir->d_name);
#else #else
return 0; return 0;
#endif #endif
} }
@ -101,16 +101,16 @@ const char * path, const char * extensions)
if(current_extension) if(current_extension)
{ {
char * pch = strtok(tmp_extensions, "|"); char * pch = strtok(tmp_extensions, "|");
while (pch != NULL) while (pch != NULL)
{ {
if(strcmp(current_extension, pch) == 0) if(strcmp(current_extension, pch) == 0)
{ {
found_rom = true; found_rom = true;
break; break;
} }
pch = strtok(NULL, "|"); pch = strtok(NULL, "|");
} }
} }
if(!found_rom) if(!found_rom)

871
ps3/main.c
View File

@ -85,170 +85,170 @@ SYS_PROCESS_PARAM(1001, 0x100000)
static void set_default_settings(void) static void set_default_settings(void)
{ {
// g_settings // g_settings
strlcpy(g_settings.cheat_database, usrDirPath, sizeof(g_settings.cheat_database)); strlcpy(g_settings.cheat_database, usrDirPath, sizeof(g_settings.cheat_database));
g_settings.rewind_enable = false; g_settings.rewind_enable = false;
strlcpy(g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE, sizeof(g_settings.video.cg_shader_path)); strlcpy(g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE, sizeof(g_settings.video.cg_shader_path));
g_settings.video.fbo_scale_x = 2.0f; g_settings.video.fbo_scale_x = 2.0f;
g_settings.video.fbo_scale_y = 2.0f; g_settings.video.fbo_scale_y = 2.0f;
g_settings.video.render_to_texture = true; g_settings.video.render_to_texture = true;
strlcpy(g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE, sizeof(g_settings.video.second_pass_shader)); strlcpy(g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE, sizeof(g_settings.video.second_pass_shader));
g_settings.video.second_pass_smooth = true; g_settings.video.second_pass_smooth = true;
g_settings.video.smooth = true; g_settings.video.smooth = true;
g_settings.video.vsync = true; g_settings.video.vsync = true;
strlcpy(g_settings.cheat_database, usrDirPath, sizeof(g_settings.cheat_database)); strlcpy(g_settings.cheat_database, usrDirPath, sizeof(g_settings.cheat_database));
g_settings.video.msg_pos_x = 0.05f; g_settings.video.msg_pos_x = 0.05f;
g_settings.video.msg_pos_y = 0.90f; g_settings.video.msg_pos_y = 0.90f;
g_settings.video.aspect_ratio = -1.0f; g_settings.video.aspect_ratio = -1.0f;
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_CROSS];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_SQUARE];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_SELECT];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_START];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_UP];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_DOWN];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_LEFT];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_RIGHT];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_CIRCLE];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_TRIANGLE];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_L1];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_R1];
for(uint32_t x = 0; x < MAX_PLAYERS; x++) ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_CROSS];
{ ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_SQUARE];
for(uint32_t y = 0; y < SSNES_FIRST_META_KEY; y++) ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_SELECT];
{ ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_START];
g_settings.input.binds[x][y].id = y; ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_UP];
g_settings.input.binds[x][y].joykey = ssnes_default_keybind_lut[y]; ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_DOWN];
} ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_LEFT];
g_settings.input.dpad_emulation[x] = DPAD_EMULATION_LSTICK; ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_RIGHT];
} ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_CIRCLE];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_TRIANGLE];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_L1];
ssnes_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = ssnes_platform_keybind_lut[PS3_DEVICE_ID_JOYPAD_R1];
// g_console for(uint32_t x = 0; x < MAX_PLAYERS; x++)
g_console.block_config_read = true; {
g_console.frame_advance_enable = false; for(uint32_t y = 0; y < SSNES_FIRST_META_KEY; y++)
g_console.emulator_initialized = 0; {
g_console.screenshots_enable = true; g_settings.input.binds[x][y].id = y;
g_console.throttle_enable = true; g_settings.input.binds[x][y].joykey = ssnes_default_keybind_lut[y];
g_console.initialize_ssnes_enable = false; }
g_console.triple_buffering_enable = true; g_settings.input.dpad_emulation[x] = DPAD_EMULATION_LSTICK;
g_console.default_savestate_dir_enable = false; }
g_console.default_sram_dir_enable = false;
g_console.mode_switch = MODE_MENU; // g_console
g_console.screen_orientation = ORIENTATION_NORMAL; g_console.block_config_read = true;
g_console.current_resolution_id = CELL_VIDEO_OUT_RESOLUTION_UNDEFINED; g_console.frame_advance_enable = false;
strlcpy(g_console.default_rom_startup_dir, "/", sizeof(g_console.default_rom_startup_dir)); g_console.emulator_initialized = 0;
strlcpy(g_console.default_savestate_dir, usrDirPath, sizeof(g_console.default_savestate_dir)); g_console.screenshots_enable = true;
strlcpy(g_console.default_sram_dir, usrDirPath, sizeof(g_console.default_sram_dir)); g_console.throttle_enable = true;
g_console.aspect_ratio_index = 0; g_console.initialize_ssnes_enable = false;
strlcpy(g_console.aspect_ratio_name, "4:3", sizeof(g_console.aspect_ratio_name)); g_console.triple_buffering_enable = true;
g_console.menu_font_size = 1.0f; g_console.default_savestate_dir_enable = false;
g_console.overscan_enable = false; g_console.default_sram_dir_enable = false;
g_console.overscan_amount = 0.0f; g_console.mode_switch = MODE_MENU;
g_console.sound_mode = SOUND_MODE_NORMAL; g_console.screen_orientation = ORIENTATION_NORMAL;
g_console.custom_viewport_width = 0; g_console.current_resolution_id = CELL_VIDEO_OUT_RESOLUTION_UNDEFINED;
g_console.custom_viewport_height = 0; strlcpy(g_console.default_rom_startup_dir, "/", sizeof(g_console.default_rom_startup_dir));
g_console.custom_viewport_x = 0; strlcpy(g_console.default_savestate_dir, usrDirPath, sizeof(g_console.default_savestate_dir));
g_console.custom_viewport_y = 0; strlcpy(g_console.default_sram_dir, usrDirPath, sizeof(g_console.default_sram_dir));
strlcpy(g_console.rsound_ip_address, "0.0.0.0", sizeof(g_console.rsound_ip_address)); g_console.aspect_ratio_index = 0;
g_console.custom_bgm_enable = true; strlcpy(g_console.aspect_ratio_name, "4:3", sizeof(g_console.aspect_ratio_name));
g_console.menu_font_size = 1.0f;
// g_extern g_console.overscan_enable = false;
g_extern.state_slot = 0; g_console.overscan_amount = 0.0f;
g_extern.audio_data.mute = 0; g_console.sound_mode = SOUND_MODE_NORMAL;
g_extern.verbose = true; g_console.custom_viewport_width = 0;
g_console.custom_viewport_height = 0;
g_console.custom_viewport_x = 0;
g_console.custom_viewport_y = 0;
strlcpy(g_console.rsound_ip_address, "0.0.0.0", sizeof(g_console.rsound_ip_address));
g_console.custom_bgm_enable = true;
// g_extern
g_extern.state_slot = 0;
g_extern.audio_data.mute = 0;
g_extern.verbose = true;
} }
static void init_settings(bool load_libretro_path) static void init_settings(bool load_libretro_path)
{ {
if(!path_file_exists(SYS_CONFIG_FILE)) if(!path_file_exists(SYS_CONFIG_FILE))
{ {
SSNES_ERR("Config file \"%s\" doesn't exist. Creating...\n", SYS_CONFIG_FILE); SSNES_ERR("Config file \"%s\" doesn't exist. Creating...\n", SYS_CONFIG_FILE);
FILE * f; FILE * f;
f = fopen(SYS_CONFIG_FILE, "w"); f = fopen(SYS_CONFIG_FILE, "w");
fclose(f); fclose(f);
} }
else else
{ {
config_file_t * conf = config_file_new(SYS_CONFIG_FILE);
config_file_t * conf = config_file_new(SYS_CONFIG_FILE); // g_settings
// g_settings if(load_libretro_path)
{
CONFIG_GET_STRING(libretro, "libretro_path");
if(load_libretro_path) if(!strcmp(g_settings.libretro, ""))
{ {
CONFIG_GET_STRING(libretro, "libretro_path"); //We need to set libretro to the first entry in the cores
//directory so that it will be saved to the config file
char ** dir_list = dir_list_new(LIBSNES_DIR_PATH, ".SELF");
if(!strcmp(g_settings.libretro, "")) if (!dir_list)
{ {
//We need to set libretro to the first entry in the cores SSNES_ERR("Couldn't read %s directory.\n", EMULATOR_CORE_DIR);
//directory so that it will be saved to the config file return;
char ** dir_list = dir_list_new(LIBSNES_DIR_PATH, ".SELF"); }
if (!dir_list)
{
SSNES_ERR("Couldn't read %s directory.\n", EMULATOR_CORE_DIR);
return;
}
const char * first_self = dir_list[0]; const char * first_self = dir_list[0];
if(first_self) if(first_self)
{ {
SSNES_LOG("Set first entry in libretro %s dir: [%s] to libretro path.\n", EMULATOR_CORE_DIR, first_self); SSNES_LOG("Set first entry in libretro %s dir: [%s] to libretro path.\n", EMULATOR_CORE_DIR, first_self);
strlcpy(g_settings.libretro, first_self, sizeof(g_settings.libretro)); strlcpy(g_settings.libretro, first_self, sizeof(g_settings.libretro));
} }
else else
{ {
SSNES_ERR("Failed to set first entry in libretro %s dir to libretro path.\n", EMULATOR_CORE_DIR); SSNES_ERR("Failed to set first entry in libretro %s dir to libretro path.\n", EMULATOR_CORE_DIR);
} }
dir_list_free(dir_list); dir_list_free(dir_list);
} }
} }
CONFIG_GET_STRING(cheat_database, "cheat_database"); CONFIG_GET_STRING(cheat_database, "cheat_database");
CONFIG_GET_BOOL(rewind_enable, "rewind_enable"); CONFIG_GET_BOOL(rewind_enable, "rewind_enable");
CONFIG_GET_STRING(video.cg_shader_path, "video_cg_shader"); CONFIG_GET_STRING(video.cg_shader_path, "video_cg_shader");
CONFIG_GET_STRING(video.second_pass_shader, "video_second_pass_shader"); CONFIG_GET_STRING(video.second_pass_shader, "video_second_pass_shader");
CONFIG_GET_FLOAT(video.fbo_scale_x, "video_fbo_scale_x"); CONFIG_GET_FLOAT(video.fbo_scale_x, "video_fbo_scale_x");
CONFIG_GET_FLOAT(video.fbo_scale_y, "video_fbo_scale_y"); CONFIG_GET_FLOAT(video.fbo_scale_y, "video_fbo_scale_y");
CONFIG_GET_BOOL(video.render_to_texture, "video_render_to_texture"); CONFIG_GET_BOOL(video.render_to_texture, "video_render_to_texture");
CONFIG_GET_BOOL(video.second_pass_smooth, "video_second_pass_smooth"); CONFIG_GET_BOOL(video.second_pass_smooth, "video_second_pass_smooth");
CONFIG_GET_BOOL(video.smooth, "video_smooth"); CONFIG_GET_BOOL(video.smooth, "video_smooth");
CONFIG_GET_BOOL(video.vsync, "video_vsync"); CONFIG_GET_BOOL(video.vsync, "video_vsync");
CONFIG_GET_FLOAT(video.aspect_ratio, "video_aspect_ratio"); CONFIG_GET_FLOAT(video.aspect_ratio, "video_aspect_ratio");
for (unsigned i = 0; i < 7; i++) for (unsigned i = 0; i < 7; i++)
{ {
char cfg[64]; char cfg[64];
snprintf(cfg, sizeof(cfg), "input_dpad_emulation_p%u", i + 1); snprintf(cfg, sizeof(cfg), "input_dpad_emulation_p%u", i + 1);
CONFIG_GET_INT(input.dpad_emulation[i], cfg); CONFIG_GET_INT(input.dpad_emulation[i], cfg);
} }
// g_console // g_console
CONFIG_GET_BOOL_CONSOLE(custom_bgm_enable, "custom_bgm_enable"); CONFIG_GET_BOOL_CONSOLE(custom_bgm_enable, "custom_bgm_enable");
CONFIG_GET_BOOL_CONSOLE(overscan_enable, "overscan_enable"); CONFIG_GET_BOOL_CONSOLE(overscan_enable, "overscan_enable");
CONFIG_GET_BOOL_CONSOLE(screenshots_enable, "screenshots_enable"); CONFIG_GET_BOOL_CONSOLE(screenshots_enable, "screenshots_enable");
CONFIG_GET_BOOL_CONSOLE(throttle_enable, "throttle_enable"); CONFIG_GET_BOOL_CONSOLE(throttle_enable, "throttle_enable");
CONFIG_GET_BOOL_CONSOLE(triple_buffering_enable, "triple_buffering_enable"); CONFIG_GET_BOOL_CONSOLE(triple_buffering_enable, "triple_buffering_enable");
CONFIG_GET_INT_CONSOLE(aspect_ratio_index, "aspect_ratio_index"); CONFIG_GET_INT_CONSOLE(aspect_ratio_index, "aspect_ratio_index");
CONFIG_GET_INT_CONSOLE(current_resolution_id, "current_resolution_id"); CONFIG_GET_INT_CONSOLE(current_resolution_id, "current_resolution_id");
CONFIG_GET_INT_CONSOLE(custom_viewport_x, "custom_viewport_x"); CONFIG_GET_INT_CONSOLE(custom_viewport_x, "custom_viewport_x");
CONFIG_GET_INT_CONSOLE(custom_viewport_y, "custom_viewport_y"); CONFIG_GET_INT_CONSOLE(custom_viewport_y, "custom_viewport_y");
CONFIG_GET_INT_CONSOLE(custom_viewport_width, "custom_viewport_width"); CONFIG_GET_INT_CONSOLE(custom_viewport_width, "custom_viewport_width");
CONFIG_GET_INT_CONSOLE(custom_viewport_height, "custom_viewport_height"); CONFIG_GET_INT_CONSOLE(custom_viewport_height, "custom_viewport_height");
CONFIG_GET_INT_CONSOLE(screen_orientation, "screen_orientation"); CONFIG_GET_INT_CONSOLE(screen_orientation, "screen_orientation");
CONFIG_GET_INT_CONSOLE(sound_mode, "sound_mode"); CONFIG_GET_INT_CONSOLE(sound_mode, "sound_mode");
CONFIG_GET_STRING_CONSOLE(aspect_ratio_name, "aspect_ratio_name"); CONFIG_GET_STRING_CONSOLE(aspect_ratio_name, "aspect_ratio_name");
CONFIG_GET_STRING_CONSOLE(default_rom_startup_dir, "default_rom_startup_dir"); CONFIG_GET_STRING_CONSOLE(default_rom_startup_dir, "default_rom_startup_dir");
CONFIG_GET_FLOAT_CONSOLE(menu_font_size, "menu_font_size"); CONFIG_GET_FLOAT_CONSOLE(menu_font_size, "menu_font_size");
CONFIG_GET_FLOAT_CONSOLE(overscan_amount, "overscan_amount"); CONFIG_GET_FLOAT_CONSOLE(overscan_amount, "overscan_amount");
// g_extern // g_extern
CONFIG_GET_INT_EXTERN(state_slot, "state_slot"); CONFIG_GET_INT_EXTERN(state_slot, "state_slot");
CONFIG_GET_INT_EXTERN(audio_data.mute, "audio_mute"); CONFIG_GET_INT_EXTERN(audio_data.mute, "audio_mute");
} }
} }
static void save_settings(void) static void save_settings(void)
@ -321,371 +321,372 @@ static void save_settings(void)
static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdata) static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdata)
{ {
(void) param; (void) param;
(void) userdata; (void) userdata;
switch (status) switch (status)
{ {
case CELL_SYSUTIL_REQUEST_EXITGAME: case CELL_SYSUTIL_REQUEST_EXITGAME:
g_console.menu_enable = false; g_console.menu_enable = false;
g_quitting = true; g_quitting = true;
g_console.ingame_menu_enable = false; g_console.ingame_menu_enable = false;
g_console.mode_switch = MODE_EXIT; g_console.mode_switch = MODE_EXIT;
break; break;
case CELL_SYSUTIL_OSKDIALOG_FINISHED: case CELL_SYSUTIL_OSKDIALOG_FINISHED:
oskutil_close(&g_console.oskutil_handle); oskutil_close(&g_console.oskutil_handle);
oskutil_finished(&g_console.oskutil_handle); oskutil_finished(&g_console.oskutil_handle);
break; break;
case CELL_SYSUTIL_OSKDIALOG_UNLOADED: case CELL_SYSUTIL_OSKDIALOG_UNLOADED:
oskutil_unload(&g_console.oskutil_handle); oskutil_unload(&g_console.oskutil_handle);
break; break;
} }
} }
static void get_environment_settings(int argc, char *argv[]) static void get_environment_settings(int argc, char *argv[])
{ {
g_extern.verbose = true; g_extern.verbose = true;
int ret; int ret;
unsigned int get_type; unsigned int get_type;
unsigned int get_attributes; unsigned int get_attributes;
CellGameContentSize size; CellGameContentSize size;
char dirName[CELL_GAME_DIRNAME_SIZE]; char dirName[CELL_GAME_DIRNAME_SIZE];
CellSysCacheParam param; CellSysCacheParam param;
memset(&param, 0x00, sizeof(CellSysCacheParam)); memset(&param, 0x00, sizeof(CellSysCacheParam));
strncpy(param.cacheId,CACHE_ID, sizeof(CellSysCacheParam)); strncpy(param.cacheId,CACHE_ID, sizeof(CellSysCacheParam));
ret = cellSysCacheMount(&param); ret = cellSysCacheMount(&param);
if(ret != CELL_SYSCACHE_RET_OK_CLEARED) if(ret != CELL_SYSCACHE_RET_OK_CLEARED)
{ {
SSNES_ERR("System cache partition could not be mounted, it might be already mounted.\n"); SSNES_ERR("System cache partition could not be mounted, it might be already mounted.\n");
} }
if(argc > 1) if(argc > 1)
{ {
/* launched from external launcher */ /* launched from external launcher */
strncpy(MULTIMAN_EXECUTABLE, argv[2], sizeof(MULTIMAN_EXECUTABLE)); strncpy(MULTIMAN_EXECUTABLE, argv[2], sizeof(MULTIMAN_EXECUTABLE));
} }
else else
{ {
/* not launched from external launcher, set default path */ /* not launched from external launcher, set default path */
strncpy(MULTIMAN_EXECUTABLE, "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF", strncpy(MULTIMAN_EXECUTABLE, "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF",
sizeof(MULTIMAN_EXECUTABLE)); sizeof(MULTIMAN_EXECUTABLE));
} }
if(path_file_exists(MULTIMAN_EXECUTABLE) && argc > 1 && path_file_exists(argv[1])) if(path_file_exists(MULTIMAN_EXECUTABLE) && argc > 1 && path_file_exists(argv[1]))
{ {
g_console.external_launcher_support = EXTERN_LAUNCHER_MULTIMAN; g_console.external_launcher_support = EXTERN_LAUNCHER_MULTIMAN;
SSNES_LOG("Started from multiMAN, auto-game start enabled.\n"); SSNES_LOG("Started from multiMAN, auto-game start enabled.\n");
} }
else else
{ {
g_console.external_launcher_support = EXTERN_LAUNCHER_SALAMANDER; g_console.external_launcher_support = EXTERN_LAUNCHER_SALAMANDER;
SSNES_WARN("Not started from multiMAN, auto-game start disabled.\n"); SSNES_WARN("Not started from multiMAN, auto-game start disabled.\n");
} }
memset(&size, 0x00, sizeof(CellGameContentSize)); memset(&size, 0x00, sizeof(CellGameContentSize));
ret = cellGameBootCheck(&get_type, &get_attributes, &size, dirName); ret = cellGameBootCheck(&get_type, &get_attributes, &size, dirName);
if(ret < 0) if(ret < 0)
{ {
SSNES_ERR("cellGameBootCheck() Error: 0x%x.\n", ret); SSNES_ERR("cellGameBootCheck() Error: 0x%x.\n", ret);
} }
else else
{ {
SSNES_LOG("cellGameBootCheck() OK.\n"); SSNES_LOG("cellGameBootCheck() OK.\n");
SSNES_LOG("Directory name: [%s].\n", dirName); SSNES_LOG("Directory name: [%s].\n", dirName);
SSNES_LOG(" HDD Free Size (in KB) = [%d] Size (in KB) = [%d] System Size (in KB) = [%d].\n", size.hddFreeSizeKB, size.sizeKB, size.sysSizeKB); SSNES_LOG(" HDD Free Size (in KB) = [%d] Size (in KB) = [%d] System Size (in KB) = [%d].\n", size.hddFreeSizeKB, size.sizeKB, size.sysSizeKB);
switch(get_type) switch(get_type)
{ {
case CELL_GAME_GAMETYPE_DISC: case CELL_GAME_GAMETYPE_DISC:
SSNES_LOG("SSNES was launched on Optical Disc Drive.\n"); SSNES_LOG("SSNES was launched on Optical Disc Drive.\n");
break; break;
case CELL_GAME_GAMETYPE_HDD: case CELL_GAME_GAMETYPE_HDD:
SSNES_LOG("SSNES was launched on HDD.\n"); SSNES_LOG("SSNES was launched on HDD.\n");
break; break;
} }
if((get_attributes & CELL_GAME_ATTRIBUTE_APP_HOME) == CELL_GAME_ATTRIBUTE_APP_HOME) if((get_attributes & CELL_GAME_ATTRIBUTE_APP_HOME) == CELL_GAME_ATTRIBUTE_APP_HOME)
SSNES_LOG("SSNES was launched from host machine (APP_HOME).\n"); SSNES_LOG("SSNES was launched from host machine (APP_HOME).\n");
ret = cellGameContentPermit(contentInfoPath, usrDirPath); ret = cellGameContentPermit(contentInfoPath, usrDirPath);
if(g_console.external_launcher_support == EXTERN_LAUNCHER_MULTIMAN) if(g_console.external_launcher_support == EXTERN_LAUNCHER_MULTIMAN)
{ {
snprintf(contentInfoPath, sizeof(contentInfoPath), "/dev_hdd0/game/%s", EMULATOR_CONTENT_DIR); snprintf(contentInfoPath, sizeof(contentInfoPath), "/dev_hdd0/game/%s", EMULATOR_CONTENT_DIR);
snprintf(usrDirPath, sizeof(usrDirPath), "/dev_hdd0/game/%s/USRDIR", EMULATOR_CONTENT_DIR); snprintf(usrDirPath, sizeof(usrDirPath), "/dev_hdd0/game/%s/USRDIR", EMULATOR_CONTENT_DIR);
} }
if(ret < 0) if(ret < 0)
{ {
SSNES_ERR("cellGameContentPermit() Error: 0x%x\n", ret); SSNES_ERR("cellGameContentPermit() Error: 0x%x\n", ret);
} }
else else
{ {
SSNES_LOG("cellGameContentPermit() OK.\n"); SSNES_LOG("cellGameContentPermit() OK.\n");
SSNES_LOG("contentInfoPath : [%s].\n", contentInfoPath); SSNES_LOG("contentInfoPath : [%s].\n", contentInfoPath);
SSNES_LOG("usrDirPath : [%s].\n", usrDirPath); SSNES_LOG("usrDirPath : [%s].\n", usrDirPath);
} }
/* now we fill in all the variables */ /* now we fill in all the variables */
snprintf(DEFAULT_PRESET_FILE, sizeof(DEFAULT_PRESET_FILE), "%s/%s/presets/stock.conf", usrDirPath, EMULATOR_CORE_DIR); snprintf(DEFAULT_PRESET_FILE, sizeof(DEFAULT_PRESET_FILE), "%s/%s/presets/stock.conf", usrDirPath, EMULATOR_CORE_DIR);
snprintf(DEFAULT_BORDER_FILE, sizeof(DEFAULT_BORDER_FILE), "%s/%s/borders/Centered-1080p/mega-man-2.png", usrDirPath, EMULATOR_CORE_DIR); snprintf(DEFAULT_BORDER_FILE, sizeof(DEFAULT_BORDER_FILE), "%s/%s/borders/Centered-1080p/mega-man-2.png", usrDirPath, EMULATOR_CORE_DIR);
snprintf(DEFAULT_MENU_BORDER_FILE, sizeof(DEFAULT_MENU_BORDER_FILE), "%s/%s/borders/Menu/main-menu.png", usrDirPath, EMULATOR_CORE_DIR); snprintf(DEFAULT_MENU_BORDER_FILE, sizeof(DEFAULT_MENU_BORDER_FILE), "%s/%s/borders/Menu/main-menu.png", usrDirPath, EMULATOR_CORE_DIR);
snprintf(PRESETS_DIR_PATH, sizeof(PRESETS_DIR_PATH), "%s/%s/presets", usrDirPath, EMULATOR_CORE_DIR); snprintf(PRESETS_DIR_PATH, sizeof(PRESETS_DIR_PATH), "%s/%s/presets", usrDirPath, EMULATOR_CORE_DIR);
snprintf(INPUT_PRESETS_DIR_PATH, sizeof(INPUT_PRESETS_DIR_PATH), "%s/input", PRESETS_DIR_PATH); snprintf(INPUT_PRESETS_DIR_PATH, sizeof(INPUT_PRESETS_DIR_PATH), "%s/input", PRESETS_DIR_PATH);
snprintf(LIBSNES_DIR_PATH, sizeof(LIBSNES_DIR_PATH), "%s/%s", usrDirPath, EMULATOR_CORE_DIR); snprintf(LIBSNES_DIR_PATH, sizeof(LIBSNES_DIR_PATH), "%s/%s", usrDirPath, EMULATOR_CORE_DIR);
snprintf(BORDERS_DIR_PATH, sizeof(BORDERS_DIR_PATH), "%s/%s/borders", usrDirPath, EMULATOR_CORE_DIR); snprintf(BORDERS_DIR_PATH, sizeof(BORDERS_DIR_PATH), "%s/%s/borders", usrDirPath, EMULATOR_CORE_DIR);
snprintf(SHADERS_DIR_PATH, sizeof(SHADERS_DIR_PATH), "%s/%s/shaders", usrDirPath, EMULATOR_CORE_DIR); snprintf(SHADERS_DIR_PATH, sizeof(SHADERS_DIR_PATH), "%s/%s/shaders", usrDirPath, EMULATOR_CORE_DIR);
snprintf(DEFAULT_SHADER_FILE, sizeof(DEFAULT_SHADER_FILE), "%s/%s/shaders/stock.cg", usrDirPath, EMULATOR_CORE_DIR); snprintf(DEFAULT_SHADER_FILE, sizeof(DEFAULT_SHADER_FILE), "%s/%s/shaders/stock.cg", usrDirPath, EMULATOR_CORE_DIR);
snprintf(DEFAULT_MENU_SHADER_FILE, sizeof(DEFAULT_MENU_SHADER_FILE), "%s/%s/shaders/Borders/Menu/border-only-ssnes.cg", usrDirPath, EMULATOR_CORE_DIR); snprintf(DEFAULT_MENU_SHADER_FILE, sizeof(DEFAULT_MENU_SHADER_FILE), "%s/%s/shaders/Borders/Menu/border-only-ssnes.cg", usrDirPath, EMULATOR_CORE_DIR);
snprintf(SYS_CONFIG_FILE, sizeof(SYS_CONFIG_FILE), "%s/ssnes.cfg", usrDirPath); snprintf(SYS_CONFIG_FILE, sizeof(SYS_CONFIG_FILE), "%s/ssnes.cfg", usrDirPath);
} }
g_extern.verbose = false; g_extern.verbose = false;
} }
static void startup_ssnes(void) static void startup_ssnes(void)
{ {
if(g_console.initialize_ssnes_enable) if(g_console.initialize_ssnes_enable)
{ {
if(g_console.emulator_initialized) if(g_console.emulator_initialized)
ssnes_main_deinit(); ssnes_main_deinit();
struct ssnes_main_wrap args = { struct ssnes_main_wrap args = {
.verbose = g_extern.verbose, .verbose = g_extern.verbose,
.config_path = SYS_CONFIG_FILE, .config_path = SYS_CONFIG_FILE,
.sram_path = g_console.default_sram_dir_enable ? g_console.default_sram_dir : NULL, .sram_path = g_console.default_sram_dir_enable ? g_console.default_sram_dir : NULL,
.state_path = g_console.default_savestate_dir_enable ? g_console.default_savestate_dir : NULL, .state_path = g_console.default_savestate_dir_enable ? g_console.default_savestate_dir : NULL,
.rom_path = g_console.rom_path .rom_path = g_console.rom_path
}; };
int init_ret = ssnes_main_init_wrap(&args); int init_ret = ssnes_main_init_wrap(&args);
g_console.emulator_initialized = 1; g_console.emulator_initialized = 1;
g_console.initialize_ssnes_enable = 0; g_console.initialize_ssnes_enable = 0;
} }
} }
static bool manage_libretro_core(void) static bool manage_libretro_core(void)
{ {
g_extern.verbose = true; g_extern.verbose = true;
bool return_code; bool return_code;
bool set_libretro_path = false; bool set_libretro_path = false;
char tmp_path[1024], tmp_path2[1024], tmp_pathnewfile[1024]; char tmp_path[1024], tmp_path2[1024], tmp_pathnewfile[1024];
snprintf(tmp_path, sizeof(tmp_path), "%s/%s/CORE.SELF", usrDirPath, EMULATOR_CORE_DIR); snprintf(tmp_path, sizeof(tmp_path), "%s/%s/CORE.SELF", usrDirPath, EMULATOR_CORE_DIR);
SSNES_LOG("Assumed path of CORE.SELF: [%s]\n", tmp_path); SSNES_LOG("Assumed path of CORE.SELF: [%s]\n", tmp_path);
if(path_file_exists(tmp_path))
{
//if CORE.SELF exists, this indicates we have just installed
//a new libretro port and that we need to change it to a more
//sane name.
CellFsErrno ret; if(path_file_exists(tmp_path))
{
//if CORE.SELF exists, this indicates we have just installed
//a new libretro port and that we need to change it to a more
//sane name.
ssnes_console_name_from_id(tmp_path2, sizeof(tmp_path2)); CellFsErrno ret;
strlcat(tmp_path2, ".SELF", sizeof(tmp_path2));
snprintf(tmp_pathnewfile, sizeof(tmp_pathnewfile), "%s/%s/%s", usrDirPath, EMULATOR_CORE_DIR, tmp_path2);
if(path_file_exists(tmp_pathnewfile)) ssnes_console_name_from_id(tmp_path2, sizeof(tmp_path2));
{ strlcat(tmp_path2, ".SELF", sizeof(tmp_path2));
SSNES_LOG("Upgrading emulator core...\n"); snprintf(tmp_pathnewfile, sizeof(tmp_pathnewfile), "%s/%s/%s", usrDirPath, EMULATOR_CORE_DIR, tmp_path2);
//if libretro core already exists, then that means we are
//upgrading the libretro core - so delete pre-existing
//file first
ret = cellFsUnlink(tmp_pathnewfile);
if(ret == CELL_FS_SUCCEEDED)
{
SSNES_LOG("Succeeded in removing pre-existing libretro core: [%s].\n", tmp_pathnewfile);
}
else
{
SSNES_LOG("Failed to remove pre-existing libretro core: [%s].\n", tmp_pathnewfile);
}
}
//now attempt the renaming if(path_file_exists(tmp_pathnewfile))
ret = cellFsRename(tmp_path, tmp_pathnewfile); {
if(ret != CELL_FS_SUCCEEDED) SSNES_LOG("Upgrading emulator core...\n");
{ //if libretro core already exists, then that means we are
SSNES_ERR("Failed to rename CORE.SELF.\n"); //upgrading the libretro core - so delete pre-existing
} //file first
else ret = cellFsUnlink(tmp_pathnewfile);
{ if(ret == CELL_FS_SUCCEEDED)
SSNES_LOG("Libsnes core [%s] renamed to: [%s].\n", tmp_path, tmp_pathnewfile); {
set_libretro_path = true; SSNES_LOG("Succeeded in removing pre-existing libretro core: [%s].\n", tmp_pathnewfile);
} }
} else
else {
{ SSNES_LOG("Failed to remove pre-existing libretro core: [%s].\n", tmp_pathnewfile);
SSNES_LOG("CORE.SELF was not found, libretro core path will be loaded from config file.\n"); }
} }
if(set_libretro_path) //now attempt the renaming
{ ret = cellFsRename(tmp_path, tmp_pathnewfile);
//CORE.BIN has been renamed, libretro path will now be set to the recently if(ret != CELL_FS_SUCCEEDED)
//renamed new libretro core {
strlcpy(g_settings.libretro, tmp_pathnewfile, sizeof(g_settings.libretro)); SSNES_ERR("Failed to rename CORE.SELF.\n");
return_code = 0; }
} else
else {
{ SSNES_LOG("Libsnes core [%s] renamed to: [%s].\n", tmp_path, tmp_pathnewfile);
//There was no CORE.BIN present, or the CORE.BIN file was not renamed. set_libretro_path = true;
//The libretro core path will still be loaded from the config file }
return_code = 1; }
} else
{
SSNES_LOG("CORE.SELF was not found, libretro core path will be loaded from config file.\n");
}
g_extern.verbose = false; if(set_libretro_path)
{
//CORE.BIN has been renamed, libretro path will now be set to the recently
//renamed new libretro core
strlcpy(g_settings.libretro, tmp_pathnewfile, sizeof(g_settings.libretro));
return_code = 0;
}
else
{
//There was no CORE.BIN present, or the CORE.BIN file was not renamed.
//The libretro core path will still be loaded from the config file
return_code = 1;
}
return return_code; g_extern.verbose = false;
return return_code;
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
SSNES_LOG("Registering system utility callback...\n"); SSNES_LOG("Registering system utility callback...\n");
cellSysutilRegisterCallback(0, callback_sysutil_exit, NULL); cellSysutilRegisterCallback(0, callback_sysutil_exit, NULL);
cellSysmoduleLoadModule(CELL_SYSMODULE_IO); cellSysmoduleLoadModule(CELL_SYSMODULE_IO);
cellSysmoduleLoadModule(CELL_SYSMODULE_FS); cellSysmoduleLoadModule(CELL_SYSMODULE_FS);
cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_GAME); cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_GAME);
cellSysmoduleLoadModule(CELL_SYSMODULE_AVCONF_EXT); cellSysmoduleLoadModule(CELL_SYSMODULE_AVCONF_EXT);
cellSysmoduleLoadModule(CELL_SYSMODULE_PNGDEC); cellSysmoduleLoadModule(CELL_SYSMODULE_PNGDEC);
cellSysmoduleLoadModule(CELL_SYSMODULE_JPGDEC); cellSysmoduleLoadModule(CELL_SYSMODULE_JPGDEC);
cellSysmoduleLoadModule(CELL_SYSMODULE_NET); cellSysmoduleLoadModule(CELL_SYSMODULE_NET);
cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_NP); cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_NP);
sys_net_initialize_network(); sys_net_initialize_network();
#ifdef HAVE_LOGGER #ifdef HAVE_LOGGER
logger_init(); logger_init();
#endif #endif
sceNpInit(NP_POOL_SIZE, np_pool); sceNpInit(NP_POOL_SIZE, np_pool);
ssnes_main_clear_state(); ssnes_main_clear_state();
get_environment_settings(argc, argv); get_environment_settings(argc, argv);
config_set_defaults(); config_set_defaults();
bool load_libretro_path = manage_libretro_core(); bool load_libretro_path = manage_libretro_core();
set_default_settings(); set_default_settings();
init_settings(load_libretro_path); init_settings(load_libretro_path);
init_libretro_sym(); init_libretro_sym();
#if(CELL_SDK_VERSION > 0x340000) #if(CELL_SDK_VERSION > 0x340000)
if (g_console.screenshots_enable) if (g_console.screenshots_enable)
{ {
cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT);
CellScreenShotSetParam screenshot_param = {0, 0, 0, 0}; CellScreenShotSetParam screenshot_param = {0, 0, 0, 0};
screenshot_param.photo_title = "SSNES PS3"; screenshot_param.photo_title = "SSNES PS3";
screenshot_param.game_title = "SSNES PS3"; screenshot_param.game_title = "SSNES PS3";
cellScreenShotSetParameter (&screenshot_param); cellScreenShotSetParameter (&screenshot_param);
cellScreenShotEnable(); cellScreenShotEnable();
} }
if (g_console.custom_bgm_enable) if (g_console.custom_bgm_enable)
cellSysutilEnableBgmPlayback(); cellSysutilEnableBgmPlayback();
#endif #endif
ps3graphics_video_init(true); ps3graphics_video_init(true);
ps3_input_init(); ps3_input_init();
oskutil_init(&g_console.oskutil_handle, 0); oskutil_init(&g_console.oskutil_handle, 0);
ssnes_input_set_default_keybind_names_for_emulator(); ssnes_input_set_default_keybind_names_for_emulator();
menu_init(); menu_init();
switch(g_console.external_launcher_support) switch(g_console.external_launcher_support)
{ {
case EXTERN_LAUNCHER_SALAMANDER: case EXTERN_LAUNCHER_SALAMANDER:
g_console.mode_switch = MODE_MENU; g_console.mode_switch = MODE_MENU;
break; break;
case EXTERN_LAUNCHER_MULTIMAN: case EXTERN_LAUNCHER_MULTIMAN:
SSNES_LOG("Started from multiMAN, will auto-start game.\n"); SSNES_LOG("Started from multiMAN, will auto-start game.\n");
strncpy(g_console.rom_path, argv[1], sizeof(g_console.rom_path)); strncpy(g_console.rom_path, argv[1], sizeof(g_console.rom_path));
g_console.initialize_ssnes_enable = 1; g_console.initialize_ssnes_enable = 1;
g_console.mode_switch = MODE_EMULATION; g_console.mode_switch = MODE_EMULATION;
startup_ssnes(); startup_ssnes();
break; break;
} }
begin_loop: begin_loop:
if(g_console.mode_switch == MODE_EMULATION) if(g_console.mode_switch == MODE_EMULATION)
{ {
bool repeat = false; bool repeat = false;
input_ps3.poll(NULL); input_ps3.poll(NULL);
do{ do{
repeat = ssnes_main_iterate(); repeat = ssnes_main_iterate();
}while(repeat && !g_console.frame_advance_enable); }while(repeat && !g_console.frame_advance_enable);
} }
else if(g_console.mode_switch == MODE_MENU) else if(g_console.mode_switch == MODE_MENU)
{ {
menu_loop(); menu_loop();
startup_ssnes(); startup_ssnes();
} }
else else
goto begin_shutdown; goto begin_shutdown;
goto begin_loop; goto begin_loop;
begin_shutdown: begin_shutdown:
if(path_file_exists(SYS_CONFIG_FILE)) if(path_file_exists(SYS_CONFIG_FILE))
save_settings(); save_settings();
if(g_console.emulator_initialized) if(g_console.emulator_initialized)
ssnes_main_deinit(); ssnes_main_deinit();
cell_pad_input_deinit(); cell_pad_input_deinit();
ps3_video_deinit(); ps3_video_deinit();
if(g_console.oskutil_handle.is_running) if(g_console.oskutil_handle.is_running)
oskutil_unload(&g_console.oskutil_handle); oskutil_unload(&g_console.oskutil_handle);
#ifdef HAVE_LOGGER #ifdef HAVE_LOGGER
logger_shutdown(); logger_shutdown();
#endif #endif
if(g_console.screenshots_enable) if(g_console.screenshots_enable)
cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT);
cellSysmoduleUnloadModule(CELL_SYSMODULE_JPGDEC); cellSysmoduleUnloadModule(CELL_SYSMODULE_JPGDEC);
cellSysmoduleUnloadModule(CELL_SYSMODULE_PNGDEC); cellSysmoduleUnloadModule(CELL_SYSMODULE_PNGDEC);
cellSysmoduleUnloadModule(CELL_SYSMODULE_AVCONF_EXT); cellSysmoduleUnloadModule(CELL_SYSMODULE_AVCONF_EXT);
cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_GAME); cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_GAME);
int ret = cellSysCacheClear(); int ret = cellSysCacheClear();
if(ret != CELL_SYSCACHE_RET_OK_CLEARED) if(ret != CELL_SYSCACHE_RET_OK_CLEARED)
{ {
SSNES_ERR("System cache partition could not be cleared on exit.\n"); SSNES_ERR("System cache partition could not be cleared on exit.\n");
} }
if(g_console.return_to_launcher) if(g_console.return_to_launcher)
{ {
char spawn_data[256]; char spawn_data[256];
for(unsigned int i = 0; i < sizeof(spawn_data); ++i) for(unsigned int i = 0; i < sizeof(spawn_data); ++i)
spawn_data[i] = i & 0xff; spawn_data[i] = i & 0xff;
char spawn_data_size[16]; char spawn_data_size[16];
sprintf(spawn_data_size, "%d", 256); sprintf(spawn_data_size, "%d", 256);
const char * const spawn_argv[] = { const char * const spawn_argv[] = {
spawn_data_size, spawn_data_size,
"test argv for", "test argv for",
"sceNpDrmProcessExitSpawn2()", "sceNpDrmProcessExitSpawn2()",
NULL NULL
}; };
SceNpDrmKey * k_licensee = NULL; SceNpDrmKey * k_licensee = NULL;
int ret = sceNpDrmProcessExitSpawn2(k_licensee, g_console.launch_app_on_exit, (const char** const)spawn_argv, NULL, (sys_addr_t)spawn_data, 256, 1000, SYS_PROCESS_PRIMARY_STACK_SIZE_1M); int ret = sceNpDrmProcessExitSpawn2(k_licensee, g_console.launch_app_on_exit, (const char** const)spawn_argv, NULL, (sys_addr_t)spawn_data, 256, 1000, SYS_PROCESS_PRIMARY_STACK_SIZE_1M);
SSNES_LOG("Attempt to load SELF: [%s] (return code: [%x]).\n", g_console.launch_app_on_exit, ret); SSNES_LOG("Attempt to load SELF: [%s] (return code: [%x]).\n", g_console.launch_app_on_exit, ret);
if(ret < 0) if(ret < 0)
{ {
SSNES_WARN("SELF file is not of NPDRM type, trying another approach to boot it...\n"); SSNES_WARN("SELF file is not of NPDRM type, trying another approach to boot it...\n");
sys_game_process_exitspawn(g_console.launch_app_on_exit, NULL, NULL, NULL, 0, 1000, SYS_PROCESS_PRIMARY_STACK_SIZE_1M); sys_game_process_exitspawn(g_console.launch_app_on_exit, NULL, NULL, NULL, 0, 1000, SYS_PROCESS_PRIMARY_STACK_SIZE_1M);
} }
sceNpTerm(); sceNpTerm();
cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_NP); cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_NP);
cellSysmoduleUnloadModule(CELL_SYSMODULE_NET); cellSysmoduleUnloadModule(CELL_SYSMODULE_NET);
} }
return 1; return 1;
} }

395
ps3/menu.c
View File

@ -172,30 +172,30 @@ static uint64_t old_state = 0;
static void set_delay_speed(unsigned delaymode) static void set_delay_speed(unsigned delaymode)
{ {
unsigned speed; unsigned speed;
speed = 0; speed = 0;
switch(delaymode) switch(delaymode)
{ {
case DELAY_NONE: case DELAY_NONE:
break; break;
case DELAY_SMALLEST: case DELAY_SMALLEST:
speed = 4; speed = 4;
break; break;
case DELAY_SMALL: case DELAY_SMALL:
speed = 7; speed = 7;
break; break;
case DELAY_MEDIUM: case DELAY_MEDIUM:
speed = 14; speed = 14;
break; break;
case DELAY_LONG: case DELAY_LONG:
speed = 30; speed = 30;
break; break;
} }
strlcpy(special_action_msg, "", sizeof(special_action_msg)); strlcpy(special_action_msg, "", sizeof(special_action_msg));
SET_TIMER_EXPIRATION(g_console.control_timer_expiration_frame_count, speed); SET_TIMER_EXPIRATION(g_console.control_timer_expiration_frame_count, speed);
} }
static void browser_update(filebrowser_t * b) static void browser_update(filebrowser_t * b)
@ -351,29 +351,27 @@ static void browser_update(filebrowser_t * b)
static void browser_render(filebrowser_t * b) static void browser_render(filebrowser_t * b)
{ {
uint32_t file_count = b->file_count; uint32_t file_count = b->file_count;
int current_index, page_number, page_base, i; int current_index, page_number, page_base, i;
float currentX, currentY, ySpacing; float currentX, currentY, ySpacing;
current_index = b->currently_selected; current_index = b->currently_selected;
page_number = current_index / NUM_ENTRY_PER_PAGE; page_number = current_index / NUM_ENTRY_PER_PAGE;
page_base = page_number * NUM_ENTRY_PER_PAGE; page_base = page_number * NUM_ENTRY_PER_PAGE;
currentX = 0.09f; currentX = 0.09f;
currentY = 0.10f; currentY = 0.10f;
ySpacing = 0.035f; ySpacing = 0.035f;
for ( i = page_base; i < file_count && i < page_base + NUM_ENTRY_PER_PAGE; ++i) for ( i = page_base; i < file_count && i < page_base + NUM_ENTRY_PER_PAGE; ++i)
{ {
currentY = currentY + ySpacing; currentY = currentY + ySpacing;
cellDbgFontPuts(currentX, currentY, FONT_SIZE, i == current_index ? RED : b->cur[i].d_type == CELL_FS_TYPE_DIRECTORY ? GREEN : WHITE, b->cur[i].d_name); cellDbgFontPuts(currentX, currentY, FONT_SIZE, i == current_index ? RED : b->cur[i].d_type == CELL_FS_TYPE_DIRECTORY ? GREEN : WHITE, b->cur[i].d_name);
cellDbgFontDraw(); cellDbgFontDraw();
} }
cellDbgFontDraw(); cellDbgFontDraw();
} }
static void set_setting_label(menu * menu_obj, uint64_t currentsetting) static void set_setting_label(menu * menu_obj, uint64_t currentsetting)
{ {
switch(currentsetting) switch(currentsetting)
@ -763,62 +761,62 @@ static void set_setting_label(menu * menu_obj, uint64_t currentsetting)
static void menu_init_settings_pages(menu * menu_obj) static void menu_init_settings_pages(menu * menu_obj)
{ {
int page, i, j; int page, i, j;
float increment; float increment;
page = 0; page = 0;
j = 0; j = 0;
increment = 0.16f; increment = 0.16f;
for(i = menu_obj->first_setting; i < menu_obj->max_settings; i++) for(i = menu_obj->first_setting; i < menu_obj->max_settings; i++)
{ {
if(!(j < (NUM_ENTRY_PER_PAGE))) if(!(j < (NUM_ENTRY_PER_PAGE)))
{ {
j = 0; j = 0;
increment = 0.16f; increment = 0.16f;
page++; page++;
} }
menu_obj->items[i].text_xpos = 0.09f; menu_obj->items[i].text_xpos = 0.09f;
menu_obj->items[i].text_ypos = increment; menu_obj->items[i].text_ypos = increment;
menu_obj->items[i].page = page; menu_obj->items[i].page = page;
set_setting_label(menu_obj, i); set_setting_label(menu_obj, i);
increment += 0.03f; increment += 0.03f;
j++; j++;
} }
menu_obj->refreshpage = 0; menu_obj->refreshpage = 0;
} }
static void menu_reinit_settings (void) static void menu_reinit_settings (void)
{ {
menu_init_settings_pages(&menu_generalvideosettings); menu_init_settings_pages(&menu_generalvideosettings);
menu_init_settings_pages(&menu_generalaudiosettings); menu_init_settings_pages(&menu_generalaudiosettings);
menu_init_settings_pages(&menu_emu_settings); menu_init_settings_pages(&menu_emu_settings);
menu_init_settings_pages(&menu_emu_videosettings); menu_init_settings_pages(&menu_emu_videosettings);
menu_init_settings_pages(&menu_emu_audiosettings); menu_init_settings_pages(&menu_emu_audiosettings);
menu_init_settings_pages(&menu_pathsettings); menu_init_settings_pages(&menu_pathsettings);
menu_init_settings_pages(&menu_controlssettings); menu_init_settings_pages(&menu_controlssettings);
} }
#define INPUT_SCALE 2 #define INPUT_SCALE 2
static void apply_scaling (unsigned init_mode) static void apply_scaling (unsigned init_mode)
{ {
switch(init_mode) switch(init_mode)
{ {
case FBO_DEINIT: case FBO_DEINIT:
gl_deinit_fbo(g_gl); gl_deinit_fbo(g_gl);
break; break;
case FBO_INIT: case FBO_INIT:
gl_init_fbo(g_gl, SSNES_SCALE_BASE * INPUT_SCALE, gl_init_fbo(g_gl, SSNES_SCALE_BASE * INPUT_SCALE,
SSNES_SCALE_BASE * INPUT_SCALE); SSNES_SCALE_BASE * INPUT_SCALE);
break; break;
case FBO_REINIT: case FBO_REINIT:
gl_deinit_fbo(g_gl); gl_deinit_fbo(g_gl);
gl_init_fbo(g_gl, SSNES_SCALE_BASE * INPUT_SCALE, gl_init_fbo(g_gl, SSNES_SCALE_BASE * INPUT_SCALE,
SSNES_SCALE_BASE * INPUT_SCALE); SSNES_SCALE_BASE * INPUT_SCALE);
break; break;
} }
} }
static void select_file(uint32_t menu_id) static void select_file(uint32_t menu_id)
@ -1067,31 +1065,28 @@ static void select_directory(uint32_t menu_id)
static void set_keybind_digital(uint64_t state, uint64_t system_joypad_id, uint64_t default_snes_joypad_id) static void set_keybind_digital(uint64_t state, uint64_t system_joypad_id, uint64_t default_snes_joypad_id)
{ {
uint64_t new_key; uint64_t new_key;
if(CTRL_LEFT(state) | CTRL_LSTICK_LEFT(state)) if(CTRL_LEFT(state) | CTRL_LSTICK_LEFT(state))
{ {
new_key = ssnes_input_find_previous_platform_key(g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey); new_key = ssnes_input_find_previous_platform_key(g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey);
g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey = new_key;
set_delay = DELAY_MEDIUM;
}
g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey = new_key; if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state))
set_delay = DELAY_MEDIUM; {
} new_key = ssnes_input_find_next_platform_key(g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey);
g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey = new_key;
set_delay = DELAY_MEDIUM;
}
if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state)) if(CTRL_START(state))
{ {
new_key = ssnes_input_find_next_platform_key(g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey); g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].id = default_snes_joypad_id;
g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey = ssnes_default_keybind_lut[default_snes_joypad_id];
g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey = new_key; set_delay = DELAY_MEDIUM;
}
set_delay = DELAY_MEDIUM;
}
if(CTRL_START(state))
{
g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].id = default_snes_joypad_id;
g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey = ssnes_default_keybind_lut[default_snes_joypad_id];
set_delay = DELAY_MEDIUM;
}
} }
static void ssnes_filename_input_and_save (unsigned filename_type) static void ssnes_filename_input_and_save (unsigned filename_type)
@ -2038,10 +2033,10 @@ static void select_rom(void)
static void return_to_game (void) static void return_to_game (void)
{ {
g_console.frame_advance_enable = false; g_console.frame_advance_enable = false;
g_console.ingame_menu_item = 0; g_console.ingame_menu_item = 0;
g_console.menu_enable = false; g_console.menu_enable = false;
g_console.mode_switch = MODE_EMULATION; g_console.mode_switch = MODE_EMULATION;
} }
static void ingame_menu(uint32_t menu_id) static void ingame_menu(uint32_t menu_id)
@ -2553,115 +2548,115 @@ static void ingame_menu(uint32_t menu_id)
void menu_init (void) void menu_init (void)
{ {
filebrowser_new(&browser, g_console.default_rom_startup_dir, ssnes_console_get_rom_ext()); filebrowser_new(&browser, g_console.default_rom_startup_dir, ssnes_console_get_rom_ext());
} }
void menu_loop(void) void menu_loop(void)
{ {
menuStack[0] = menu_filebrowser; menuStack[0] = menu_filebrowser;
menuStack[0].enum_id = FILE_BROWSER_MENU; menuStack[0].enum_id = FILE_BROWSER_MENU;
g_console.menu_enable = true; g_console.menu_enable = true;
menu_reinit_settings(); menu_reinit_settings();
if(g_console.emulator_initialized) if(g_console.emulator_initialized)
video_gl.set_swap_block_state(NULL, true); video_gl.set_swap_block_state(NULL, true);
if(g_console.ingame_menu_enable) if(g_console.ingame_menu_enable)
{ {
menuStackindex++; menuStackindex++;
menuStack[menuStackindex] = menu_filebrowser; menuStack[menuStackindex] = menu_filebrowser;
menuStack[menuStackindex].enum_id = INGAME_MENU; menuStack[menuStackindex].enum_id = INGAME_MENU;
} }
do do
{ {
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND); glEnable(GL_BLEND);
if(g_console.emulator_initialized) if(g_console.emulator_initialized)
{ {
ssnes_render_cached_frame(); ssnes_render_cached_frame();
} }
gl_frame_menu(); gl_frame_menu();
switch(menuStack[menuStackindex].enum_id) switch(menuStack[menuStackindex].enum_id)
{ {
case FILE_BROWSER_MENU: case FILE_BROWSER_MENU:
select_rom(); select_rom();
break; break;
case GENERAL_VIDEO_MENU: case GENERAL_VIDEO_MENU:
case GENERAL_AUDIO_MENU: case GENERAL_AUDIO_MENU:
case EMU_GENERAL_MENU: case EMU_GENERAL_MENU:
case EMU_VIDEO_MENU: case EMU_VIDEO_MENU:
case EMU_AUDIO_MENU: case EMU_AUDIO_MENU:
case PATH_MENU: case PATH_MENU:
case CONTROLS_MENU: case CONTROLS_MENU:
select_setting(&menuStack[menuStackindex]); select_setting(&menuStack[menuStackindex]);
break; break;
case SHADER_CHOICE: case SHADER_CHOICE:
case PRESET_CHOICE: case PRESET_CHOICE:
case BORDER_CHOICE: case BORDER_CHOICE:
case LIBSNES_CHOICE: case LIBSNES_CHOICE:
case INPUT_PRESET_CHOICE: case INPUT_PRESET_CHOICE:
select_file(menuStack[menuStackindex].enum_id); select_file(menuStack[menuStackindex].enum_id);
break; break;
case PATH_SAVESTATES_DIR_CHOICE: case PATH_SAVESTATES_DIR_CHOICE:
case PATH_DEFAULT_ROM_DIR_CHOICE: case PATH_DEFAULT_ROM_DIR_CHOICE:
case PATH_CHEATS_DIR_CHOICE: case PATH_CHEATS_DIR_CHOICE:
case PATH_SRAM_DIR_CHOICE: case PATH_SRAM_DIR_CHOICE:
select_directory(menuStack[menuStackindex].enum_id); select_directory(menuStack[menuStackindex].enum_id);
break; break;
case INGAME_MENU: case INGAME_MENU:
if(g_console.ingame_menu_enable) if(g_console.ingame_menu_enable)
ingame_menu(menuStack[menuStackindex].enum_id); ingame_menu(menuStack[menuStackindex].enum_id);
break; break;
} }
if(IS_TIMER_EXPIRED(g_console.control_timer_expiration_frame_count)) if(IS_TIMER_EXPIRED(g_console.control_timer_expiration_frame_count))
{ {
// if we want to force goto the emulation loop, skip this // if we want to force goto the emulation loop, skip this
if(g_console.mode_switch != MODE_EMULATION) if(g_console.mode_switch != MODE_EMULATION)
{ {
// for ingame menu, we need a different precondition because menu_enable // for ingame menu, we need a different precondition because menu_enable
// can be set to false when going back from ingame menu to menu // can be set to false when going back from ingame menu to menu
if(g_console.ingame_menu_enable == true) if(g_console.ingame_menu_enable == true)
{ {
//we want to force exit when mode_switch is set to MODE_EXIT //we want to force exit when mode_switch is set to MODE_EXIT
if(g_console.mode_switch != MODE_EXIT) if(g_console.mode_switch != MODE_EXIT)
g_console.mode_switch = ((CTRL_L3(old_state) && CTRL_R3(old_state) && g_console.emulator_initialized)) ? MODE_EMULATION : MODE_MENU; g_console.mode_switch = ((CTRL_L3(old_state) && CTRL_R3(old_state) && g_console.emulator_initialized)) ? MODE_EMULATION : MODE_MENU;
} }
else else
{ {
g_console.menu_enable = !((CTRL_L3(old_state) && CTRL_R3(old_state) && g_console.emulator_initialized)); g_console.menu_enable = !((CTRL_L3(old_state) && CTRL_R3(old_state) && g_console.emulator_initialized));
g_console.mode_switch = g_console.menu_enable ? MODE_MENU : MODE_EMULATION; g_console.mode_switch = g_console.menu_enable ? MODE_MENU : MODE_EMULATION;
} }
} }
//set new timer delay after previous one has expired //set new timer delay after previous one has expired
if(set_delay != DELAY_NONE) if(set_delay != DELAY_NONE)
set_delay_speed(set_delay); set_delay_speed(set_delay);
} }
// set a timer delay so that we don't instantly switch back to the menu when // set a timer delay so that we don't instantly switch back to the menu when
// press and holding L3 + R3 in the emulation loop (lasts for 30 frame ticks) // press and holding L3 + R3 in the emulation loop (lasts for 30 frame ticks)
if(g_console.mode_switch == MODE_EMULATION && !g_console.frame_advance_enable) if(g_console.mode_switch == MODE_EMULATION && !g_console.frame_advance_enable)
{ {
SET_TIMER_EXPIRATION(g_console.timer_expiration_frame_count, 30); SET_TIMER_EXPIRATION(g_console.timer_expiration_frame_count, 30);
} }
video_gl.swap(NULL); video_gl.swap(NULL);
glDisable(GL_BLEND); glDisable(GL_BLEND);
}while (g_console.menu_enable); }while (g_console.menu_enable);
if(g_console.ingame_menu_enable) if(g_console.ingame_menu_enable)
menuStackindex--; // pop ingame menu from stack menuStackindex--; // pop ingame menu from stack
if(g_console.emulator_initialized) if(g_console.emulator_initialized)
video_gl.set_swap_block_state(NULL, false); video_gl.set_swap_block_state(NULL, false);
g_console.ingame_menu_enable = false; g_console.ingame_menu_enable = false;
} }

1
xenon/cond.c
View File

@ -1,5 +1,6 @@
/* SSNES - A frontend for libretro. /* SSNES - A frontend for libretro.
* Copyright (C) 2010-2012 - Hans-Kristian Arntzen * Copyright (C) 2010-2012 - Hans-Kristian Arntzen
* Copyright (C) 2011-2012 - Daniel De Matteis
* *
* SSNES is free software: you can redistribute it and/or modify it under the terms * SSNES is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found- * of the GNU General Public License as published by the Free Software Found-

2
xenon/xenon360_input.c
View File

@ -19,7 +19,7 @@
#include <string.h> #include <string.h>
#include "../driver.h" #include "../driver.h"
#include "../libsnes.hpp" #include "../libretro.h"
#include <input/input.h> #include <input/input.h>
#include <usb/usbmain.h> #include <usb/usbmain.h>

1
xenon/xenon360_video.c
View File

@ -13,7 +13,6 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>