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
\r
for (i = 0; i < count; i++)\r
{\r
- plat_get_root_dir(bios_path, sizeof(bios_path));\r
- strcat(bios_path, files[i]);\r
+ emu_make_path(bios_path, files[i], sizeof(bios_path) - 4);\r
strcat(bios_path, ".bin");\r
f = fopen(bios_path, "rb");\r
if (f) break;\r
\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
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
}\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
*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
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
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
}\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
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
if (ext) strcat(dst, ext);\r
}\r
\r
+void emu_make_path(char *buff, const char *end, int size)\r
+{\r
+ int pos, end_len;\r
+\r
+ end_len = strlen(end);\r
+ pos = plat_get_root_dir(buff, size);\r
+ strncpy(buff + pos, end, size - pos);\r
+ buff[size - 1] = 0;\r
+ if (pos + end_len > size - 1)\r
+ lprintf("Warning: path truncated: %s\n", buff);\r
+}\r
\r
-static void make_config_cfg(char *cfg)\r
+static void make_config_cfg(char *cfg_buff_512)\r
{\r
- int len;\r
- len = plat_get_root_dir(cfg, 512);\r
- strncpy(cfg + len, PicoConfigFile, 512-6-1-len);\r
+ emu_make_path(cfg_buff_512, PicoConfigFile, 512-6);\r
if (config_slot != 0)\r
{\r
- char *p = strrchr(cfg, '.');\r
- if (p == NULL) p = cfg + strlen(cfg);\r
+ char *p = strrchr(cfg_buff_512, '.');\r
+ if (p == NULL)\r
+ p = cfg_buff_512 + strlen(cfg_buff_512);\r
sprintf(p, ".%i.cfg", config_slot);\r
}\r
- cfg[511] = 0;\r
+ cfg_buff_512[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
+void emu_set_defconfig(void)\r
{\r
+ memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig));\r
PicoOpt = currentConfig.s_PicoOpt;\r
PsndRate = currentConfig.s_PsndRate;\r
PicoRegionOverride = currentConfig.s_PicoRegion;\r
PicoCDBuffers = currentConfig.s_PicoCDBuffers;\r
}\r
\r
-static void emu_setDefaultConfig(void)\r
-{\r
- memcpy(¤tConfig, &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
if (!game)\r
{\r
if (!no_defaults)\r
- emu_setDefaultConfig();\r
+ emu_set_defconfig();\r
make_config_cfg(cfg);\r
ret = config_readsect(cfg, NULL);\r
}\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
{\r
// read user's config\r
int vol = currentConfig.volume;\r
- emu_setDefaultConfig();\r
+ emu_set_defconfig();\r
ret = config_readsect(cfg, sect);\r
currentConfig.volume = vol; // make vol global (bah)\r
}\r
}\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
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
}\r
\r
\r
-void emu_writelrom(void)\r
-{\r
- char cfg[512];\r
- make_config_cfg(cfg);\r
- config_writelrom(cfg);\r
-#ifndef NO_SYNC\r
- sync();\r
-#endif\r
-}\r
-\r
/* always using built-in font */\r
\r
-#define mk_text_out(name, type, val) \\r
+#define mk_text_out(name, type, val, topleft, step_x, step_y) \\r
void name(int x, int y, const char *text) \\r
{ \\r
int i, l, len = strlen(text); \\r
- type *screen = (type *)g_screen_ptr + x + y * g_screen_width; \\r
+ type *screen = (type *)(topleft) + x * step_x + y * step_y; \\r
\\r
- for (i = 0; i < len; i++, screen += 8) \\r
+ for (i = 0; i < len; i++, screen += 8 * step_x) \\r
{ \\r
for (l = 0; l < 8; l++) \\r
{ \\r
unsigned char fd = fontdata8x8[text[i] * 8 + l];\\r
- type *s = screen + l * g_screen_width; \\r
- if (fd&0x80) s[0] = val; \\r
- if (fd&0x40) s[1] = val; \\r
- if (fd&0x20) s[2] = val; \\r
- if (fd&0x10) s[3] = val; \\r
- if (fd&0x08) s[4] = val; \\r
- if (fd&0x04) s[5] = val; \\r
- if (fd&0x02) s[6] = val; \\r
- if (fd&0x01) s[7] = val; \\r
+ type *s = screen + l * step_y; \\r
+ if (fd&0x80) s[step_x * 0] = val; \\r
+ if (fd&0x40) s[step_x * 1] = val; \\r
+ if (fd&0x20) s[step_x * 2] = val; \\r
+ if (fd&0x10) s[step_x * 3] = val; \\r
+ if (fd&0x08) s[step_x * 4] = val; \\r
+ if (fd&0x04) s[step_x * 5] = val; \\r
+ if (fd&0x02) s[step_x * 6] = val; \\r
+ if (fd&0x01) s[step_x * 7] = val; \\r
} \\r
} \\r
}\r
\r
-mk_text_out(emu_textOut8, unsigned char, 0xf0)\r
-mk_text_out(emu_textOut16, unsigned short, 0xffff)\r
+mk_text_out(emu_text_out8, unsigned char, 0xf0, g_screen_ptr, 1, g_screen_width)\r
+mk_text_out(emu_text_out16, unsigned short, 0xffff, g_screen_ptr, 1, g_screen_width)\r
+mk_text_out(emu_text_out8_rot, unsigned char, 0xf0,\r
+ (char *)g_screen_ptr + (g_screen_width - 1) * g_screen_height, -g_screen_height, 1)\r
+mk_text_out(emu_text_out16_rot, unsigned short, 0xffff,\r
+ (short *)g_screen_ptr + (g_screen_width - 1) * g_screen_height, -g_screen_height, 1)\r
\r
#undef mk_text_out\r
\r
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
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
}\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
}\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
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
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
if (which & PEV_SWITCH_RND)\r
{\r
- plat_video_toggle_renderer();\r
+ plat_video_toggle_renderer(1, 0);\r
}\r
if (which & (PEV_SSLOT_PREV|PEV_SSLOT_NEXT))\r
{\r
}\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
\r
void emu_update_input(void)\r
{\r
- unsigned int allActions[2] = { 0, 0 }, events;\r
- static unsigned int prevEvents = 0;\r
+ static int prev_events = 0;\r
+ int actions[IN_BINDTYPE_COUNT] = { 0, };\r
+ int pl_actions[2];\r
+ int events;\r
\r
- /* FIXME: player2 */\r
- allActions[0] = in_update();\r
+ in_update(actions);\r
\r
- PicoPad[0] = allActions[0] & 0xfff;\r
- PicoPad[1] = allActions[1] & 0xfff;\r
+ pl_actions[0] = actions[IN_BINDTYPE_PLAYER12];\r
+ pl_actions[1] = actions[IN_BINDTYPE_PLAYER12] >> 16;\r
\r
- if (allActions[0] & 0x7000) do_turbo(&PicoPad[0], allActions[0]);\r
- if (allActions[1] & 0x7000) do_turbo(&PicoPad[1], allActions[1]);\r
+ PicoPad[0] = pl_actions[0] & 0xfff;\r
+ PicoPad[1] = pl_actions[1] & 0xfff;\r
\r
- events = (allActions[0] | allActions[1]) & PEV_MASK;\r
+ if (pl_actions[0] & 0x7000)\r
+ do_turbo(&PicoPad[0], pl_actions[0]);\r
+ if (pl_actions[1] & 0x7000)\r
+ do_turbo(&PicoPad[1], pl_actions[1]);\r
+\r
+ events = actions[IN_BINDTYPE_EMU] & PEV_MASK;\r
\r
// volume is treated in special way and triggered every frame\r
if (events & (PEV_VOL_DOWN|PEV_VOL_UP))\r
plat_update_volume(1, events & PEV_VOL_UP);\r
\r
- if ((events ^ prevEvents) & PEV_FF) {\r
- emu_changeFastForward(events & PEV_FF);\r
+ if ((events ^ prev_events) & PEV_FF) {\r
+ emu_set_fastforward(events & PEV_FF);\r
plat_update_volume(0, 0);\r
reset_timing = 1;\r
}\r
\r
- events &= ~prevEvents;\r
+ events &= ~prev_events;\r
\r
if (PicoAHW == PAHW_PICO)\r
run_events_pico(events);\r
if (movie_data)\r
update_movie();\r
\r
- prevEvents = (allActions[0] | allActions[1]) & PEV_MASK;\r
+ prev_events = actions[IN_BINDTYPE_EMU] & PEV_MASK;\r
}\r
\r
static void mkdir_path(char *path_with_reserve, int pos, const char *name)\r
\r
void emu_init(void)\r
{\r
- char dir[256];\r
+ char path[512];\r
int pos;\r
\r
/* make dirs for saves */\r
- pos = plat_get_root_dir(dir, sizeof(dir) - 4);\r
- mkdir_path(dir, pos, "mds");\r
- mkdir_path(dir, pos, "srm");\r
- mkdir_path(dir, pos, "brm");\r
+ pos = plat_get_root_dir(path, sizeof(path) - 4);\r
+ mkdir_path(path, pos, "mds");\r
+ mkdir_path(path, pos, "srm");\r
+ mkdir_path(path, pos, "brm");\r
+\r
+ make_config_cfg(path);\r
+ config_readlrom(path);\r
\r
PicoInit();\r
PicoMessage = plat_status_msg_busy_next;\r
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
- if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG))\r
- emu_writelrom();\r
+ if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG)) {\r
+ char cfg[512];\r
+ make_config_cfg(cfg);\r
+ config_writelrom(cfg);\r
+#ifndef NO_SYNC\r
+ sync();\r
+#endif\r
+ }\r
\r
PicoExit();\r
}\r
notaz.gp2x.de / libpicofe.git / blobdiff