get rid of some CamelCase names

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@712 be3aeb3a-fb24-0410-a615-afba39da0efa

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

diff --git a/platform/common/emu.h b/platform/common/emu.h
index b503d96..56b7597 100644 (file)
--- a/platform/common/emu.h
+++ b/platform/common/emu.h
@@ -20,7 +20,7 @@ extern int g_screen_height;
 #endif
 
 
-#define EOPT_USE_SRAM     (1<<0)
+#define EOPT_EN_SRAM      (1<<0)
 #define EOPT_SHOW_FPS     (1<<1)
 #define EOPT_EN_SOUND     (1<<2)
 #define EOPT_GZIP_SAVES   (1<<3)
@@ -99,30 +99,24 @@ enum TPicoGameState {
 void  emu_init(void);
 void  emu_finish(void);
 
-int   emu_ReloadRom(char *rom_fname);
-int   emu_SaveLoadGame(int load, int sram);
+int   emu_reload_rom(char *rom_fname);
+int   emu_save_load_game(int load, int sram);
 void  emu_reset_game(void);
 
-int   emu_ReadConfig(int game, int no_defaults);
-int   emu_WriteConfig(int game);
-void  emu_packConfig(void);
-void  emu_unpackConfig(void);
+int   emu_read_config(int game, int no_defaults);
+int   emu_write_config(int game);
 void  emu_writelrom(void);
 
-char *emu_GetSaveFName(int load, int is_sram, int slot);
-int   emu_checkSaveFile(int slot);
+char *emu_get_save_fname(int load, int is_sram, int slot);
+int   emu_check_save_file(int slot);
 void  emu_setSaveStateCbs(int gz);
 
 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_textOut16(int x, int y, const char *text);
-char *emu_makeRomId(void);
-void  emu_getGameName(char *str150);
-void  emu_changeFastForward(int set_on);
-void  emu_RunEventsPico(unsigned int events);
-void  emu_shutdownMCD(void);
-int   emu_cdCheck(int *pregion, char *fname_in);
+void  emu_get_game_name(char *str150);
+void  emu_set_fastforward(int set_on);
+int   emu_cd_check(int *pregion, char *fname_in);
 
 #ifdef __cplusplus
 } // extern "C"

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

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

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index e628f06..df2092a 100644 (file)
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -346,7 +346,7 @@ static void RunEvents(unsigned int which)
                        FrameworkAudio_SetPause(1);
                if (giz_screen == NULL)
                        giz_screen = fb_lock(1);
-               if ( emu_checkSaveFile(state_slot) &&
+               if ( emu_check_save_file(state_slot) &&
                                (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
                                 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
                {
@@ -364,7 +364,7 @@ static void RunEvents(unsigned int which)
                {
                        osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
                        PicoStateProgressCB = emu_stateCb;
-                       emu_SaveLoadGame((which & 0x1000) >> 12, 0);
+                       emu_save_load_game((which & 0x1000) >> 12, 0);
                        PicoStateProgressCB = NULL;
                        Sleep(0);
                }
@@ -399,7 +399,7 @@ static void RunEvents(unsigned int which)
                        state_slot += 1;
                        if(state_slot > 9) state_slot = 0;
                }
-               sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");
+               sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_check_save_file(state_slot) ? "USED" : "FREE");
                noticeMsgTime = GetTickCount();
        }
 }
@@ -709,7 +709,7 @@ void pemu_loop(void)
        // save SRAM
        if ((currentConfig.EmuOpt & 1) && SRam.changed) {
                emu_stateCb("Writing SRAM/BRAM..");
-               emu_SaveLoadGame(0, 1);
+               emu_save_load_game(0, 1);
                SRam.changed = 0;
        }
 }

diff --git a/platform/gizmondo/main.c b/platform/gizmondo/main.c
index cd678f0..766f7b4 100644 (file)
--- a/platform/gizmondo/main.c
+++ b/platform/gizmondo/main.c
@@ -34,7 +34,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdL
                                break;\r
 \r
                        case PGS_ReloadRom:\r
-                               if (emu_ReloadRom(romFileName))\r
+                               if (emu_reload_rom(romFileName))\r
                                        engineState = PGS_Running;\r
                                else {\r
                                        lprintf("PGS_ReloadRom == 0\n");\r

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index ea0c67a..e7993ec 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -830,15 +830,15 @@ void pemu_loop(void)
                 frames_done++;  frames_shown++;\r
        }\r
 \r
-       emu_changeFastForward(0);\r
+       emu_set_fastforward(0);\r
 \r
        if (PicoAHW & PAHW_MCD)\r
                PicoCDBufferFree();\r
 \r
        // save SRAM\r
-       if ((currentConfig.EmuOpt & EOPT_USE_SRAM) && SRam.changed) {\r
+       if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {\r
                plat_status_msg_busy_first("Writing SRAM/BRAM...");\r
-               emu_SaveLoadGame(0, 1);\r
+               emu_save_load_game(0, 1);\r
                SRam.changed = 0;\r
        }\r
 \r

diff --git a/platform/pandora/emu.c b/platform/pandora/emu.c
index bb4b30a..0425075 100644 (file)
--- a/platform/pandora/emu.c
+++ b/platform/pandora/emu.c
@@ -727,15 +727,15 @@ void pemu_loop(void)
                 frames_done++;  frames_shown++;\r
        }\r
 \r
-       emu_changeFastForward(0);\r
+       emu_set_fastforward(0);\r
 \r
        if (PicoAHW & PAHW_MCD) PicoCDBufferFree();\r
 \r
        // save SRAM\r
-       if((currentConfig.EmuOpt & 1) && SRam.changed) {\r
+       if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {\r
                /* FIXME: plat_status_msg_busy_first */\r
                emu_state_cb("Writing SRAM/BRAM..");\r
-               emu_SaveLoadGame(0, 1);\r
+               emu_save_load_game(0, 1);\r
                SRam.changed = 0;\r
        }\r
 \r

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index 9e299ea..21abfca 100644 (file)
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -748,7 +748,7 @@ static void RunEvents(unsigned int which)
        {
                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 & 0x200))) ) // save
                {
@@ -767,7 +767,7 @@ static void RunEvents(unsigned int which)
                {
                        osd_text(4, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME", 1, 0);
                        PicoStateProgressCB = emu_msg_cb;
-                       emu_SaveLoadGame((which & 0x1000) >> 12, 0);
+                       emu_save_load_game((which & 0x1000) >> 12, 0);
                        PicoStateProgressCB = NULL;
                        psp_msleep(0);
                }
@@ -796,7 +796,7 @@ static void RunEvents(unsigned int which)
                        if(state_slot > 9) state_slot = 0;
                }
                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;
 
        if ((events ^ prevEvents) & 0x40) {
-               emu_changeFastForward(events & 0x40);
+               emu_set_fastforward(events & 0x40);
                reset_timing = 1;
        }
 
@@ -1039,7 +1039,7 @@ void pemu_loop(void)
        }
 
 
-       emu_changeFastForward(0);
+       emu_set_fastforward(0);
 
        if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
@@ -1051,7 +1051,7 @@ void pemu_loop(void)
        // save SRAM
        if ((currentConfig.EmuOpt & 1) && SRam.changed) {
                emu_msg_cb("Writing SRAM/BRAM..");
-               emu_SaveLoadGame(0, 1);
+               emu_save_load_game(0, 1);
                SRam.changed = 0;
        }
 

diff --git a/platform/psp/main.c b/platform/psp/main.c
index 4984115..952d104 100644 (file)
--- a/platform/psp/main.c
+++ b/platform/psp/main.c
@@ -58,7 +58,7 @@ int pico_main(void)
                                break;
 
                        case PGS_ReloadRom:
-                               if (emu_ReloadRom(rom_fname_reload)) {
+                               if (emu_reload_rom(rom_fname_reload)) {
                                        engineState = PGS_Running;
                                        if (mp3_last_error != 0)
                                                engineState = PGS_Menu; // send to menu to display mp3 error

diff --git a/platform/uiq3/App.cpp b/platform/uiq3/App.cpp
index 4eaee3a..d1be510 100644 (file)
--- a/platform/uiq3/App.cpp
+++ b/platform/uiq3/App.cpp
@@ -164,32 +164,32 @@ void CPicolAppView::HandleCommandL(CQikCommand& aCommand)
 \r
                case EEikCmdPicoFrameskipAuto:\r
                        currentConfig.Frameskip = -1;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip0:\r
                        currentConfig.Frameskip = 0;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip1:\r
                        currentConfig.Frameskip = 1;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip2:\r
                        currentConfig.Frameskip = 2;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip4:\r
                        currentConfig.Frameskip = 4;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip8:\r
                        currentConfig.Frameskip = 8;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdExit:\r
@@ -285,10 +285,10 @@ void CPicolAppView::DisplayOpenROMDialogL()
 void CPicolAppView::DisplayConfigDialogL()\r
 {\r
        CPicoConfigDialog* configDialog = new(ELeave)CPicoConfigDialog(currentConfig);\r
-       emu_packConfig();\r
+       emu_pack_config();\r
        configDialog->ExecuteLD(R_PICO_CONFIG);\r
-       emu_unpackConfig();\r
-       emu_WriteConfig(0);\r
+       emu_unpack_config();\r
+       emu_write_config(0);\r
 \r
        CPicoGameSession::Do(PicoMsgConfigChange, &currentConfig);\r
 }\r

diff --git a/platform/uiq3/Engine.cpp b/platform/uiq3/Engine.cpp
index a5205b8..adb32b4 100644 (file)
--- a/platform/uiq3/Engine.cpp
+++ b/platform/uiq3/Engine.cpp
@@ -46,11 +46,11 @@ TInt CPicoGameSession::Do(const TPicoServRqst what, TAny *param)
        {\r
                case PicoMsgLoadState: \r
                        if(!rom_loaded) return -1; // no ROM\r
-                       return emu_SaveLoadGame(1, 0);\r
+                       return emu_save_load_game(1, 0);\r
 \r
                case PicoMsgSaveState:\r
                        if(!rom_loaded) return -1;\r
-                       return emu_SaveLoadGame(0, 0);\r
+                       return emu_save_load_game(0, 0);\r
 \r
                case PicoMsgLoadROM:\r
                        return loadROM((TPtrC16 *)param);\r
@@ -188,7 +188,7 @@ TInt CPicoGameSession::loadROM(TPtrC16 *pptr)
        if (loadrom_result == 0)\r
                return PicoErrRomOpenFailed;\r
 \r
-       emu_getGameName(buff);\r
+       emu_get_game_name(buff);\r
        TPtrC8 buff8((TUint8*) buff);\r
        iRomInternalName.Copy(buff8);\r
 \r

diff --git a/platform/uiq3/emu.c b/platform/uiq3/emu.c
index dc6ac41..22b2143 100644 (file)
--- a/platform/uiq3/emu.c
+++ b/platform/uiq3/emu.c
@@ -34,7 +34,7 @@ void emu_Init(void)
 
        emu_prepareDefaultConfig();
        config_readlrom("D:\\other\\PicoDrive\\config.cfg");
-       emu_ReadConfig(0, 0);
+       emu_read_config(0, 0);
        //PicoInit();
 }
 
@@ -68,6 +68,24 @@ void emu_prepareDefaultConfig(void)
        defaultConfig.KeyBinds[0xd5] = 1<<26; // back
 }
 
+void emu_pack_config(void)
+{
+       currentConfig.s_PicoOpt = PicoOpt;
+       currentConfig.s_PsndRate = PsndRate;
+       currentConfig.s_PicoRegion = PicoRegionOverride;
+       currentConfig.s_PicoAutoRgnOrder = PicoAutoRgnOrder;
+       currentConfig.s_PicoCDBuffers = PicoCDBuffers;
+}
+
+void emu_unpack_config(void)
+{
+       PicoOpt = currentConfig.s_PicoOpt;
+       PsndRate = currentConfig.s_PsndRate;
+       PicoRegionOverride = currentConfig.s_PicoRegion;
+       PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
+       PicoCDBuffers = currentConfig.s_PicoCDBuffers;
+}
+
 /* used by config engine only, not actual menus */
 menu_entry opt_entries[] =
 {

diff --git a/platform/uiq3/engine/main.cpp b/platform/uiq3/engine/main.cpp
index 1aa4b02..66fee33 100644 (file)
--- a/platform/uiq3/engine/main.cpp
+++ b/platform/uiq3/engine/main.cpp
@@ -331,8 +331,8 @@ static void TargetEpocGameL()
                        if (PicoAHW & PAHW_MCD) PicoCDBufferFree();\r
 \r
                        // save SRAM\r
-                       if ((currentConfig.EmuOpt & EOPT_USE_SRAM) && SRam.changed) {\r
-                               emu_SaveLoadGame(0, 1);\r
+                       if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {\r
+                               emu_save_load_game(0, 1);\r
                                SRam.changed = 0;\r
                        }\r
                        CPolledActiveScheduler::Instance()->Schedule();\r
@@ -346,7 +346,7 @@ static void TargetEpocGameL()
                }\r
                else if(gamestate == PGS_ReloadRom)\r
                {\r
-                       loadrom_result = emu_ReloadRom(loadrom_fname);\r
+                       loadrom_result = emu_reload_rom(loadrom_fname);\r
                        pico_was_reset = 1;\r
                        if (loadrom_result)\r
                                gamestate = PGS_Running;\r
@@ -379,7 +379,7 @@ static void TargetEpocGameL()
                                User::After(150000);\r
                        }\r
 \r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        CGameWindow::FreeResources();\r
                } else if(gamestate == PGS_Quit) {\r
                        break;\r
@@ -853,7 +853,7 @@ void CGameWindow::RunEvents(TUint32 which)
                if(PsndOut) gameAudio->Pause(); // this may take a while, so we pause sound output\r
 \r
                vidDrawNotice((which & 0x1000) ? "LOADING@GAME" : "SAVING@GAME");\r
-               emu_SaveLoadGame(which & 0x1000, 0);\r
+               emu_save_load_game(which & 0x1000, 0);\r
 \r
                if(PsndOut) PsndOut = gameAudio->ResumeL();\r
                reset_timing = 1;\r