RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-05 06:47:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

get rid of some CamelCase names

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@712 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-07-23 21:02:16 +00:00
parent 0114ccc43b
commit ee0f881e9f
8 changed files with 80 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

108
common/emu.c
View file

@ -86,15 +86,15 @@ static void get_ext(char *file, char *ext)
strlwr_(ext); strlwr_(ext);
} }
char *biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" }; static const char *biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };
char *biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303" }; static const char *biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303" };
char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" }; static const char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };
int emu_findBios(int region, char **bios_file) static int find_bios(int region, char **bios_file)
{ {
static char bios_path[1024]; static char bios_path[1024];
int i, count; int i, count;
char **files; const char **files;
FILE *f = NULL; FILE *f = NULL;
if (region == 4) { // US if (region == 4) { // US
@ -156,7 +156,7 @@ static unsigned char id_header[0x100];
/* checks if fname points to valid MegaCD image /* checks if fname points to valid MegaCD image
* if so, checks for suitable BIOS */ * if so, checks for suitable BIOS */
int emu_cdCheck(int *pregion, char *fname_in) int emu_cd_check(int *pregion, char *fname_in)
{ {
unsigned char buf[32]; unsigned char buf[32];
pm_file *cd_f; pm_file *cd_f;
@ -253,7 +253,7 @@ static int extract_text(char *dest, const unsigned char *src, int len, int swab)
return p - dest; return p - dest;
} }
char *emu_makeRomId(void) static char *emu_make_rom_id(void)
{ {
static char id_string[3+0xe*3+0x3*3+0x30*3+3]; static char id_string[3+0xe*3+0x3*3+0x30*3+3];
int pos, swab = 1; int pos, swab = 1;
@ -276,7 +276,7 @@ char *emu_makeRomId(void)
} }
// buffer must be at least 150 byte long // buffer must be at least 150 byte long
void emu_getGameName(char *str150) void emu_get_game_name(char *str150)
{ {
int ret, swab = (PicoAHW & PAHW_MCD) ? 0 : 1; int ret, swab = (PicoAHW & PAHW_MCD) ? 0 : 1;
char *s, *d; char *s, *d;
@ -292,8 +292,15 @@ void emu_getGameName(char *str150)
*d = 0; *d = 0;
} }
static void shutdown_MCD(void)
{
if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)
Stop_CD();
PicoAHW &= ~PAHW_MCD;
}
// note: this function might mangle rom_fname // note: this function might mangle rom_fname
int emu_ReloadRom(char *rom_fname) int emu_reload_rom(char *rom_fname)
{ {
unsigned int rom_size = 0; unsigned int rom_size = 0;
char *used_rom_name = rom_fname; char *used_rom_name = rom_fname;
@ -368,26 +375,25 @@ int emu_ReloadRom(char *rom_fname)
get_ext(rom_fname, ext); get_ext(rom_fname, ext);
} }
emu_shutdownMCD(); shutdown_MCD();
// check for MegaCD image // check for MegaCD image
cd_state = emu_cdCheck(&cd_region, rom_fname); cd_state = emu_cd_check(&cd_region, rom_fname);
if (cd_state >= 0 && cd_state != CIT_NOT_CD) if (cd_state >= 0 && cd_state != CIT_NOT_CD)
{ {
PicoAHW |= PAHW_MCD; PicoAHW |= PAHW_MCD;
// valid CD image, check for BIOS.. // valid CD image, check for BIOS..
// we need to have config loaded at this point // we need to have config loaded at this point
ret = emu_ReadConfig(1, 1); ret = emu_read_config(1, 1);
if (!ret) emu_ReadConfig(0, 1); if (!ret) emu_read_config(0, 1);
cfg_loaded = 1; cfg_loaded = 1;
if (PicoRegionOverride) { if (PicoRegionOverride) {
cd_region = PicoRegionOverride; cd_region = PicoRegionOverride;
lprintf("overrided region to %s\n", cd_region != 4 ? (cd_region == 8 ? "EU" : "JAP") : "USA"); lprintf("overrided region to %s\n", cd_region != 4 ? (cd_region == 8 ? "EU" : "JAP") : "USA");
} }
if (!emu_findBios(cd_region, &used_rom_name)) { if (!find_bios(cd_region, &used_rom_name)) {
// bios_help() ?
PicoAHW &= ~PAHW_MCD; PicoAHW &= ~PAHW_MCD;
return 0; return 0;
} }
@ -437,8 +443,8 @@ int emu_ReloadRom(char *rom_fname)
if (!(PicoAHW & PAHW_MCD)) if (!(PicoAHW & PAHW_MCD))
memcpy(id_header, rom_data + 0x100, sizeof(id_header)); memcpy(id_header, rom_data + 0x100, sizeof(id_header));
if (!cfg_loaded) { if (!cfg_loaded) {
ret = emu_ReadConfig(1, 1); ret = emu_read_config(1, 1);
if (!ret) emu_ReadConfig(0, 1); if (!ret) emu_read_config(0, 1);
} }
lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size); lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
@ -489,8 +495,8 @@ int emu_ReloadRom(char *rom_fname)
} }
// load SRAM for this ROM // load SRAM for this ROM
if (currentConfig.EmuOpt & EOPT_USE_SRAM) if (currentConfig.EmuOpt & EOPT_EN_SRAM)
emu_SaveLoadGame(1, 1); emu_save_load_game(1, 1);
strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1); strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);
rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0; rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;
@ -504,14 +510,6 @@ fail:
return 0; return 0;
} }
void emu_shutdownMCD(void)
{
if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)
Stop_CD();
PicoAHW &= ~PAHW_MCD;
}
static void romfname_ext(char *dst, const char *prefix, const char *ext) static void romfname_ext(char *dst, const char *prefix, const char *ext)
{ {
char *p; char *p;
@ -535,7 +533,6 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
if (ext) strcat(dst, ext); if (ext) strcat(dst, ext);
} }
static void make_config_cfg(char *cfg) static void make_config_cfg(char *cfg)
{ {
int len; int len;
@ -550,17 +547,9 @@ static void make_config_cfg(char *cfg)
cfg[511] = 0; cfg[511] = 0;
} }
void emu_packConfig(void) static void emu_setDefaultConfig(void)
{
currentConfig.s_PicoOpt = PicoOpt;
currentConfig.s_PsndRate = PsndRate;
currentConfig.s_PicoRegion = PicoRegionOverride;
currentConfig.s_PicoAutoRgnOrder = PicoAutoRgnOrder;
currentConfig.s_PicoCDBuffers = PicoCDBuffers;
}
void emu_unpackConfig(void)
{ {
memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
PicoOpt = currentConfig.s_PicoOpt; PicoOpt = currentConfig.s_PicoOpt;
PsndRate = currentConfig.s_PsndRate; PsndRate = currentConfig.s_PsndRate;
PicoRegionOverride = currentConfig.s_PicoRegion; PicoRegionOverride = currentConfig.s_PicoRegion;
@ -568,14 +557,7 @@ void emu_unpackConfig(void)
PicoCDBuffers = currentConfig.s_PicoCDBuffers; PicoCDBuffers = currentConfig.s_PicoCDBuffers;
} }
static void emu_setDefaultConfig(void) int emu_read_config(int game, int no_defaults)
{
memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
emu_unpackConfig();
}
int emu_ReadConfig(int game, int no_defaults)
{ {
char cfg[512]; char cfg[512];
int ret; int ret;
@ -589,7 +571,7 @@ int emu_ReadConfig(int game, int no_defaults)
} }
else else
{ {
char *sect = emu_makeRomId(); char *sect = emu_make_rom_id();
// try new .cfg way // try new .cfg way
if (config_slot != 0) if (config_slot != 0)
@ -638,7 +620,7 @@ int emu_ReadConfig(int game, int no_defaults)
} }
int emu_WriteConfig(int is_game) int emu_write_config(int is_game)
{ {
char cfg[512], *game_sect = NULL; char cfg[512], *game_sect = NULL;
int ret, write_lrom = 0; int ret, write_lrom = 0;
@ -651,11 +633,11 @@ int emu_WriteConfig(int is_game)
if (config_slot != 0) if (config_slot != 0)
sprintf(cfg, "game.%i.cfg", config_slot); sprintf(cfg, "game.%i.cfg", config_slot);
else strcpy(cfg, "game.cfg"); else strcpy(cfg, "game.cfg");
game_sect = emu_makeRomId(); game_sect = emu_make_rom_id();
lprintf("emu_WriteConfig: sect \"%s\"\n", game_sect); lprintf("emu_write_config: sect \"%s\"\n", game_sect);
} }
lprintf("emu_WriteConfig: %s ", cfg); lprintf("emu_write_config: %s ", cfg);
ret = config_writesect(cfg, game_sect); ret = config_writesect(cfg, game_sect);
if (write_lrom) config_writelrom(cfg); if (write_lrom) config_writelrom(cfg);
#ifndef NO_SYNC #ifndef NO_SYNC
@ -761,7 +743,7 @@ static int try_ropen_file(const char *fname)
return 0; return 0;
} }
char *emu_GetSaveFName(int load, int is_sram, int slot) char *emu_get_save_fname(int load, int is_sram, int slot)
{ {
static char saveFname[512]; static char saveFname[512];
char ext[16]; char ext[16];
@ -807,9 +789,9 @@ char *emu_GetSaveFName(int load, int is_sram, int slot)
return saveFname; return saveFname;
} }
int emu_checkSaveFile(int slot) int emu_check_save_file(int slot)
{ {
return emu_GetSaveFName(1, 0, slot) ? 1 : 0; return emu_get_save_fname(1, 0, slot) ? 1 : 0;
} }
void emu_setSaveStateCbs(int gz) void emu_setSaveStateCbs(int gz)
@ -829,13 +811,13 @@ void emu_setSaveStateCbs(int gz)
} }
} }
int emu_SaveLoadGame(int load, int sram) int emu_save_load_game(int load, int sram)
{ {
int ret = 0; int ret = 0;
char *saveFname; char *saveFname;
// make save filename // make save filename
saveFname = emu_GetSaveFName(load, sram, state_slot); saveFname = emu_get_save_fname(load, sram, state_slot);
if (saveFname == NULL) { if (saveFname == NULL) {
if (!sram) if (!sram)
plat_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED"); plat_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED");
@ -935,7 +917,7 @@ int emu_SaveLoadGame(int load, int sram)
} }
} }
void emu_changeFastForward(int set_on) void emu_set_fastforward(int set_on)
{ {
static void *set_PsndOut = NULL; static void *set_PsndOut = NULL;
static int set_Frameskip, set_EmuOpt, is_on = 0; static int set_Frameskip, set_EmuOpt, is_on = 0;
@ -1056,7 +1038,7 @@ static void run_events_ui(unsigned int which)
if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE)) if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE))
{ {
int do_it = 1; int do_it = 1;
if ( emu_checkSaveFile(state_slot) && if ( emu_check_save_file(state_slot) &&
(((which & PEV_STATE_LOAD) && (currentConfig.EmuOpt & EOPT_CONFIRM_LOAD)) || (((which & PEV_STATE_LOAD) && (currentConfig.EmuOpt & EOPT_CONFIRM_LOAD)) ||
((which & PEV_STATE_SAVE) && (currentConfig.EmuOpt & EOPT_CONFIRM_SAVE))) ) ((which & PEV_STATE_SAVE) && (currentConfig.EmuOpt & EOPT_CONFIRM_SAVE))) )
{ {
@ -1088,7 +1070,7 @@ static void run_events_ui(unsigned int which)
if (do_it) { if (do_it) {
plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING GAME" : "SAVING GAME"); plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING GAME" : "SAVING GAME");
PicoStateProgressCB = plat_status_msg_busy_next; PicoStateProgressCB = plat_status_msg_busy_next;
emu_SaveLoadGame((which & PEV_STATE_LOAD) ? 1 : 0, 0); emu_save_load_game((which & PEV_STATE_LOAD) ? 1 : 0, 0);
PicoStateProgressCB = NULL; PicoStateProgressCB = NULL;
} }
} }
@ -1109,7 +1091,7 @@ static void run_events_ui(unsigned int which)
} }
plat_status_msg("SAVE SLOT %i [%s]", state_slot, plat_status_msg("SAVE SLOT %i [%s]", state_slot,
emu_checkSaveFile(state_slot) ? "USED" : "FREE"); emu_check_save_file(state_slot) ? "USED" : "FREE");
} }
if (which & PEV_MENU) if (which & PEV_MENU)
engineState = PGS_Menu; engineState = PGS_Menu;
@ -1136,7 +1118,7 @@ void emu_update_input(void)
plat_update_volume(1, events & PEV_VOL_UP); plat_update_volume(1, events & PEV_VOL_UP);
if ((events ^ prevEvents) & PEV_FF) { if ((events ^ prevEvents) & PEV_FF) {
emu_changeFastForward(events & PEV_FF); emu_set_fastforward(events & PEV_FF);
plat_update_volume(0, 0); plat_update_volume(0, 0);
reset_timing = 1; reset_timing = 1;
} }
@ -1182,8 +1164,8 @@ void emu_init(void)
void emu_finish(void) void emu_finish(void)
{ {
// save SRAM // save SRAM
if ((currentConfig.EmuOpt & EOPT_USE_SRAM) && SRam.changed) { if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
emu_SaveLoadGame(0, 1); emu_save_load_game(0, 1);
SRam.changed = 0; SRam.changed = 0;
} }

26
common/emu.h
View file

@ -20,7 +20,7 @@ extern int g_screen_height;
#endif #endif
#define EOPT_USE_SRAM (1<<0) #define EOPT_EN_SRAM (1<<0)
#define EOPT_SHOW_FPS (1<<1) #define EOPT_SHOW_FPS (1<<1)
#define EOPT_EN_SOUND (1<<2) #define EOPT_EN_SOUND (1<<2)
#define EOPT_GZIP_SAVES (1<<3) #define EOPT_GZIP_SAVES (1<<3)
@ -99,30 +99,24 @@ enum TPicoGameState {
void emu_init(void); void emu_init(void);
void emu_finish(void); void emu_finish(void);
int emu_ReloadRom(char *rom_fname); int emu_reload_rom(char *rom_fname);
int emu_SaveLoadGame(int load, int sram); int emu_save_load_game(int load, int sram);
void emu_reset_game(void); void emu_reset_game(void);
int emu_ReadConfig(int game, int no_defaults); int emu_read_config(int game, int no_defaults);
int emu_WriteConfig(int game); int emu_write_config(int game);
void emu_packConfig(void);
void emu_unpackConfig(void);
void emu_writelrom(void); void emu_writelrom(void);
char *emu_GetSaveFName(int load, int is_sram, int slot); char *emu_get_save_fname(int load, int is_sram, int slot);
int emu_checkSaveFile(int slot); int emu_check_save_file(int slot);
void emu_setSaveStateCbs(int gz); void emu_setSaveStateCbs(int gz);
void emu_update_input(void); void emu_update_input(void);
int emu_findBios(int region, char **bios_file);
void emu_textOut8 (int x, int y, const char *text); void emu_textOut8 (int x, int y, const char *text);
void emu_textOut16(int x, int y, const char *text); void emu_textOut16(int x, int y, const char *text);
char *emu_makeRomId(void); void emu_get_game_name(char *str150);
void emu_getGameName(char *str150); void emu_set_fastforward(int set_on);
void emu_changeFastForward(int set_on); int emu_cd_check(int *pregion, char *fname_in);
void emu_RunEventsPico(unsigned int events);
void emu_shutdownMCD(void);
int emu_cdCheck(int *pregion, char *fname_in);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

8
common/main.c
View file

@ -70,7 +70,7 @@ int main(int argc, char *argv[])
/* in_init() must go before config, config accesses in_ fwk */ /* in_init() must go before config, config accesses in_ fwk */
in_init(); in_init();
pemu_prep_defconfig(); pemu_prep_defconfig();
emu_ReadConfig(0, 0); emu_read_config(0, 0);
config_readlrom(PicoConfigFile); config_readlrom(PicoConfigFile);
plat_init(); plat_init();
@ -87,11 +87,11 @@ int main(int argc, char *argv[])
if (engineState == PGS_ReloadRom) if (engineState == PGS_ReloadRom)
{ {
if (emu_ReloadRom(rom_fname_reload)) { if (emu_reload_rom(rom_fname_reload)) {
engineState = PGS_Running; engineState = PGS_Running;
if (load_state_slot >= 0) { if (load_state_slot >= 0) {
state_slot = load_state_slot; state_slot = load_state_slot;
emu_SaveLoadGame(1, 0); emu_save_load_game(1, 0);
} }
} }
} }
@ -105,7 +105,7 @@ int main(int argc, char *argv[])
break; break;
case PGS_ReloadRom: case PGS_ReloadRom:
if (emu_ReloadRom(rom_fname_reload)) if (emu_reload_rom(rom_fname_reload))
engineState = PGS_Running; engineState = PGS_Running;
else { else {
printf("PGS_ReloadRom == 0\n"); printf("PGS_ReloadRom == 0\n");

16
common/menu.c
View file

@ -949,7 +949,7 @@ static void state_check_slots(void)
state_slot_flags = 0; state_slot_flags = 0;
for (slot = 0; slot < 10; slot++) { for (slot = 0; slot < 10; slot++) {
if (emu_checkSaveFile(slot)) if (emu_check_save_file(slot))
state_slot_flags |= 1 << slot; state_slot_flags |= 1 << slot;
} }
} }
@ -962,7 +962,7 @@ static void draw_savestate_bg(int slot)
void *tmp_vram, *file; void *tmp_vram, *file;
char *fname; char *fname;
fname = emu_GetSaveFName(1, 0, slot); fname = emu_get_save_fname(1, 0, slot);
if (!fname) return; if (!fname) return;
tmp_vram = malloc(sizeof(Pico.vram)); tmp_vram = malloc(sizeof(Pico.vram));
@ -1067,7 +1067,7 @@ static int menu_loop_savestate(int is_loading)
if (inp & PBTN_MOK) { // save/load if (inp & PBTN_MOK) { // save/load
if (menu_sel < 10) { if (menu_sel < 10) {
state_slot = menu_sel; state_slot = menu_sel;
if (emu_SaveLoadGame(is_loading, 0)) { if (emu_save_load_game(is_loading, 0)) {
me_update_msg(is_loading ? "Load failed" : "Save failed"); me_update_msg(is_loading ? "Load failed" : "Save failed");
return 0; return 0;
} }
@ -1418,7 +1418,7 @@ static int menu_loop_cd_options(menu_id id, int keys)
static menu_entry e_menu_adv_options[] = static menu_entry e_menu_adv_options[] =
{ {
mee_onoff ("SRAM/BRAM saves", MA_OPT_SRAM_STATES, currentConfig.EmuOpt, EOPT_USE_SRAM), mee_onoff ("SRAM/BRAM saves", MA_OPT_SRAM_STATES, currentConfig.EmuOpt, EOPT_EN_SRAM),
mee_onoff ("Disable sprite limit", MA_OPT2_NO_SPRITE_LIM, PicoOpt, POPT_DIS_SPRITE_LIM), mee_onoff ("Disable sprite limit", MA_OPT2_NO_SPRITE_LIM, PicoOpt, POPT_DIS_SPRITE_LIM),
mee_onoff ("Use second CPU for sound", MA_OPT_ARM940_SOUND, PicoOpt, POPT_EXT_FM), mee_onoff ("Use second CPU for sound", MA_OPT_ARM940_SOUND, PicoOpt, POPT_EXT_FM),
mee_onoff ("Emulate Z80", MA_OPT2_ENABLE_Z80, PicoOpt, POPT_EN_Z80), mee_onoff ("Emulate Z80", MA_OPT2_ENABLE_Z80, PicoOpt, POPT_EN_Z80),
@ -1587,14 +1587,14 @@ static int mh_saveloadcfg(menu_id id, int keys)
switch (id) { switch (id) {
case MA_OPT_SAVECFG: case MA_OPT_SAVECFG:
case MA_OPT_SAVECFG_GAME: case MA_OPT_SAVECFG_GAME:
if (emu_WriteConfig(id == MA_OPT_SAVECFG_GAME ? 1 : 0)) if (emu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0))
me_update_msg("config saved"); me_update_msg("config saved");
else else
me_update_msg("failed to write config"); me_update_msg("failed to write config");
break; break;
case MA_OPT_LOADCFG: case MA_OPT_LOADCFG:
ret = emu_ReadConfig(1, 1); ret = emu_read_config(1, 1);
if (!ret) ret = emu_ReadConfig(0, 1); if (!ret) ret = emu_read_config(0, 1);
if (ret) me_update_msg("config loaded"); if (ret) me_update_msg("config loaded");
else me_update_msg("failed to load config"); else me_update_msg("failed to load config");
break; break;
@ -1985,7 +1985,7 @@ static int mh_tray_load_cd(menu_id id, int keys)
if (ret_name == NULL) if (ret_name == NULL)
return 0; return 0;
cd_type = emu_cdCheck(NULL, ret_name); cd_type = emu_cd_check(NULL, ret_name);
if (cd_type != CIT_NOT_CD) if (cd_type != CIT_NOT_CD)
ret = Insert_CD(ret_name, cd_type); ret = Insert_CD(ret_name, cd_type);
if (ret != 0) { if (ret != 0) {

6
gp2x/emu.c
View file

@ -830,15 +830,15 @@ void pemu_loop(void)
frames_done++; frames_shown++; frames_done++; frames_shown++;
} }
emu_changeFastForward(0); emu_set_fastforward(0);
if (PicoAHW & PAHW_MCD) if (PicoAHW & PAHW_MCD)
PicoCDBufferFree(); PicoCDBufferFree();
// save SRAM // save SRAM
if ((currentConfig.EmuOpt & EOPT_USE_SRAM) && SRam.changed) { if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
plat_status_msg_busy_first("Writing SRAM/BRAM..."); plat_status_msg_busy_first("Writing SRAM/BRAM...");
emu_SaveLoadGame(0, 1); emu_save_load_game(0, 1);
SRam.changed = 0; SRam.changed = 0;
} }

6
pandora/emu.c
View file

@ -727,15 +727,15 @@ void pemu_loop(void)
frames_done++; frames_shown++; frames_done++; frames_shown++;
} }
emu_changeFastForward(0); emu_set_fastforward(0);
if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
// save SRAM // save SRAM
if((currentConfig.EmuOpt & 1) && SRam.changed) { if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
/* FIXME: plat_status_msg_busy_first */ /* FIXME: plat_status_msg_busy_first */
emu_state_cb("Writing SRAM/BRAM.."); emu_state_cb("Writing SRAM/BRAM..");
emu_SaveLoadGame(0, 1); emu_save_load_game(0, 1);
SRam.changed = 0; SRam.changed = 0;
} }

12
psp/emu.c
View file

@ -748,7 +748,7 @@ static void RunEvents(unsigned int which)
{ {
int do_it = 1; int do_it = 1;
if ( emu_checkSaveFile(state_slot) && if ( emu_check_save_file(state_slot) &&
(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
(!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
{ {
@ -767,7 +767,7 @@ static void RunEvents(unsigned int which)
{ {
osd_text(4, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME", 1, 0); osd_text(4, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME", 1, 0);
PicoStateProgressCB = emu_msg_cb; PicoStateProgressCB = emu_msg_cb;
emu_SaveLoadGame((which & 0x1000) >> 12, 0); emu_save_load_game((which & 0x1000) >> 12, 0);
PicoStateProgressCB = NULL; PicoStateProgressCB = NULL;
psp_msleep(0); psp_msleep(0);
} }
@ -796,7 +796,7 @@ static void RunEvents(unsigned int which)
if(state_slot > 9) state_slot = 0; if(state_slot > 9) state_slot = 0;
} }
plat_status_msg("SAVE SLOT %i [%s]", state_slot, plat_status_msg("SAVE SLOT %i [%s]", state_slot,
emu_checkSaveFile(state_slot) ? "USED" : "FREE"); emu_check_save_file(state_slot) ? "USED" : "FREE");
} }
} }
@ -825,7 +825,7 @@ static void updateKeys(void)
events = (allActions[0] | allActions[1]) >> 16; events = (allActions[0] | allActions[1]) >> 16;
if ((events ^ prevEvents) & 0x40) { if ((events ^ prevEvents) & 0x40) {
emu_changeFastForward(events & 0x40); emu_set_fastforward(events & 0x40);
reset_timing = 1; reset_timing = 1;
} }
@ -1039,7 +1039,7 @@ void pemu_loop(void)
} }
emu_changeFastForward(0); emu_set_fastforward(0);
if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
@ -1051,7 +1051,7 @@ void pemu_loop(void)
// save SRAM // save SRAM
if ((currentConfig.EmuOpt & 1) && SRam.changed) { if ((currentConfig.EmuOpt & 1) && SRam.changed) {
emu_msg_cb("Writing SRAM/BRAM.."); emu_msg_cb("Writing SRAM/BRAM..");
emu_SaveLoadGame(0, 1); emu_save_load_game(0, 1);
SRam.changed = 0; SRam.changed = 0;
} }

2
psp/main.c
View file

@ -58,7 +58,7 @@ int pico_main(void)
break; break;
case PGS_ReloadRom: case PGS_ReloadRom:
if (emu_ReloadRom(rom_fname_reload)) { if (emu_reload_rom(rom_fname_reload)) {
engineState = PGS_Running; engineState = PGS_Running;
if (mp3_last_error != 0) if (mp3_last_error != 0)
engineState = PGS_Menu; // send to menu to display mp3 error engineState = PGS_Menu; // send to menu to display mp3 error