X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=1c7d1b7cc60d6472921b3cec1e33583973c109d6;hb=053bef765a5dba9d5a050c0944676e96412e293d;hp=2535abe57ecad1029c21afe35eb26903bfbdac0d;hpb=93c18cb44bf9794c7c9bc93411c68880723320d1;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index 2535abe..1c7d1b7 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -86,15 +86,15 @@ static void get_ext(char *file, char *ext)
 	strlwr_(ext);
 }
 
-char *biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };
-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_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };
+static const char *biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303"   };
+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];
 	int i, count;
-	char **files;
+	const char **files;
 	FILE *f = NULL;
 
 	if (region == 4) { // US
@@ -112,8 +112,7 @@ int emu_findBios(int region, char **bios_file)
 
 	for (i = 0; i < count; i++)
 	{
-		plat_get_root_dir(bios_path, sizeof(bios_path));
-		strcat(bios_path, files[i]);
+		emu_make_path(bios_path, files[i], sizeof(bios_path) - 4);
 		strcat(bios_path, ".bin");
 		f = fopen(bios_path, "rb");
 		if (f) break;
@@ -156,7 +155,7 @@ static unsigned char id_header[0x100];
 
 /* checks if fname points to valid MegaCD image
  * 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];
 	pm_file *cd_f;
@@ -253,7 +252,7 @@ static int extract_text(char *dest, const unsigned char *src, int len, int swab)
 	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];
 	int pos, swab = 1;
@@ -276,7 +275,7 @@ char *emu_makeRomId(void)
 }
 
 // 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;
 	char *s, *d;
@@ -292,8 +291,15 @@ void emu_getGameName(char *str150)
 	*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
-int emu_ReloadRom(char *rom_fname)
+int emu_reload_rom(char *rom_fname)
 {
 	unsigned int rom_size = 0;
 	char *used_rom_name = rom_fname;
@@ -368,26 +374,25 @@ int emu_ReloadRom(char *rom_fname)
 		get_ext(rom_fname, ext);
 	}
 
-	emu_shutdownMCD();
+	shutdown_MCD();
 
 	// 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)
 	{
 		PicoAHW |= PAHW_MCD;
 		// valid CD image, check for BIOS..
 
 		// we need to have config loaded at this point
-		ret = emu_ReadConfig(1, 1);
-		if (!ret) emu_ReadConfig(0, 1);
+		ret = emu_read_config(1, 1);
+		if (!ret) emu_read_config(0, 1);
 		cfg_loaded = 1;
 
 		if (PicoRegionOverride) {
 			cd_region = PicoRegionOverride;
 			lprintf("overrided region to %s\n", cd_region != 4 ? (cd_region == 8 ? "EU" : "JAP") : "USA");
 		}
-		if (!emu_findBios(cd_region, &used_rom_name)) {
-			// bios_help() ?
+		if (!find_bios(cd_region, &used_rom_name)) {
 			PicoAHW &= ~PAHW_MCD;
 			return 0;
 		}
@@ -437,8 +442,8 @@ int emu_ReloadRom(char *rom_fname)
 	if (!(PicoAHW & PAHW_MCD))
 		memcpy(id_header, rom_data + 0x100, sizeof(id_header));
 	if (!cfg_loaded) {
-		ret = emu_ReadConfig(1, 1);
-		if (!ret) emu_ReadConfig(0, 1);
+		ret = emu_read_config(1, 1);
+		if (!ret) emu_read_config(0, 1);
 	}
 
 	lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
@@ -489,8 +494,8 @@ int emu_ReloadRom(char *rom_fname)
 	}
 
 	// load SRAM for this ROM
-	if (currentConfig.EmuOpt & EOPT_USE_SRAM)
-		emu_SaveLoadGame(1, 1);
+	if (currentConfig.EmuOpt & EOPT_EN_SRAM)
+		emu_save_load_game(1, 1);
 
 	strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);
 	rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;
@@ -504,14 +509,6 @@ fail:
 	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)
 {
 	char *p;
@@ -535,32 +532,34 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
 	if (ext) strcat(dst, ext);
 }
 
+void emu_make_path(char *buff, const char *end, int size)
+{
+	int pos, end_len;
+
+	end_len = strlen(end);
+	pos = plat_get_root_dir(buff, size);
+	strncpy(buff + pos, end, size - pos);
+	buff[size - 1] = 0;
+	if (pos + end_len > size - 1)
+		lprintf("Warning: path truncated: %s\n", buff);
+}
 
-static void make_config_cfg(char *cfg)
+static void make_config_cfg(char *cfg_buff_512)
 {
-	int len;
-	len = plat_get_root_dir(cfg, 512);
-	strncpy(cfg + len, PicoConfigFile, 512-6-1-len);
+	emu_make_path(cfg_buff_512, PicoConfigFile, 512-6);
 	if (config_slot != 0)
 	{
-		char *p = strrchr(cfg, '.');
-		if (p == NULL) p = cfg + strlen(cfg);
+		char *p = strrchr(cfg_buff_512, '.');
+		if (p == NULL)
+			p = cfg_buff_512 + strlen(cfg_buff_512);
 		sprintf(p, ".%i.cfg", config_slot);
 	}
-	cfg[511] = 0;
+	cfg_buff_512[511] = 0;
 }
 
-void emu_packConfig(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)
+void emu_set_defconfig(void)
 {
+	memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
 	PicoOpt = currentConfig.s_PicoOpt;
 	PsndRate = currentConfig.s_PsndRate;
 	PicoRegionOverride = currentConfig.s_PicoRegion;
@@ -568,14 +567,7 @@ void emu_unpackConfig(void)
 	PicoCDBuffers = currentConfig.s_PicoCDBuffers;
 }
 
-static void emu_setDefaultConfig(void)
-{
-	memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
-	emu_unpackConfig();
-}
-
-
-int emu_ReadConfig(int game, int no_defaults)
+int emu_read_config(int game, int no_defaults)
 {
 	char cfg[512];
 	int ret;
@@ -583,13 +575,13 @@ int emu_ReadConfig(int game, int no_defaults)
 	if (!game)
 	{
 		if (!no_defaults)
-			emu_setDefaultConfig();
+			emu_set_defconfig();
 		make_config_cfg(cfg);
 		ret = config_readsect(cfg, NULL);
 	}
 	else
 	{
-		char *sect = emu_makeRomId();
+		char *sect = emu_make_rom_id();
 
 		// try new .cfg way
 		if (config_slot != 0)
@@ -601,7 +593,7 @@ int emu_ReadConfig(int game, int no_defaults)
 		{
 			// read user's config
 			int vol = currentConfig.volume;
-			emu_setDefaultConfig();
+			emu_set_defconfig();
 			ret = config_readsect(cfg, sect);
 			currentConfig.volume = vol; // make vol global (bah)
 		}
@@ -638,7 +630,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;
 	int ret, write_lrom = 0;
@@ -651,11 +643,11 @@ int emu_WriteConfig(int is_game)
 		if (config_slot != 0)
 		     sprintf(cfg, "game.%i.cfg", config_slot);
 		else strcpy(cfg,  "game.cfg");
-		game_sect = emu_makeRomId();
-		lprintf("emu_WriteConfig: sect \"%s\"\n", game_sect);
+		game_sect = emu_make_rom_id();
+		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);
 	if (write_lrom) config_writelrom(cfg);
 #ifndef NO_SYNC
@@ -668,44 +660,38 @@ int emu_WriteConfig(int is_game)
 }
 
 
-void emu_writelrom(void)
-{
-	char cfg[512];
-	make_config_cfg(cfg);
-	config_writelrom(cfg);
-#ifndef NO_SYNC
-	sync();
-#endif
-}
-
 /* always using built-in font */
 
-#define mk_text_out(name, type, val) \
+#define mk_text_out(name, type, val, topleft, step_x, step_y) \
 void name(int x, int y, const char *text)				\
 {									\
 	int i, l, len = strlen(text);					\
-	type *screen = (type *)g_screen_ptr + x + y * g_screen_width;	\
+	type *screen = (type *)(topleft) + x * step_x + y * step_y;	\
 									\
-	for (i = 0; i < len; i++, screen += 8)				\
+	for (i = 0; i < len; i++, screen += 8 * step_x)			\
 	{								\
 		for (l = 0; l < 8; l++)					\
 		{							\
 			unsigned char fd = fontdata8x8[text[i] * 8 + l];\
-			type *s = screen + l * g_screen_width;		\
-			if (fd&0x80) s[0] = val;			\
-			if (fd&0x40) s[1] = val;			\
-			if (fd&0x20) s[2] = val;			\
-			if (fd&0x10) s[3] = val;			\
-			if (fd&0x08) s[4] = val;			\
-			if (fd&0x04) s[5] = val;			\
-			if (fd&0x02) s[6] = val;			\
-			if (fd&0x01) s[7] = val;			\
+			type *s = screen + l * step_y;			\
+			if (fd&0x80) s[step_x * 0] = val;		\
+			if (fd&0x40) s[step_x * 1] = val;		\
+			if (fd&0x20) s[step_x * 2] = val;		\
+			if (fd&0x10) s[step_x * 3] = val;		\
+			if (fd&0x08) s[step_x * 4] = val;		\
+			if (fd&0x04) s[step_x * 5] = val;		\
+			if (fd&0x02) s[step_x * 6] = val;		\
+			if (fd&0x01) s[step_x * 7] = val;		\
 		}							\
 	}								\
 }
 
-mk_text_out(emu_textOut8, unsigned char, 0xf0)
-mk_text_out(emu_textOut16, unsigned short, 0xffff)
+mk_text_out(emu_text_out8,      unsigned char,    0xf0, g_screen_ptr, 1, g_screen_width)
+mk_text_out(emu_text_out16,     unsigned short, 0xffff, g_screen_ptr, 1, g_screen_width)
+mk_text_out(emu_text_out8_rot,  unsigned char,    0xf0,
+	(char *)g_screen_ptr  + (g_screen_width - 1) * g_screen_height, -g_screen_height, 1)
+mk_text_out(emu_text_out16_rot, unsigned short, 0xffff,
+	(short *)g_screen_ptr + (g_screen_width - 1) * g_screen_height, -g_screen_height, 1)
 
 #undef mk_text_out
 
@@ -761,7 +747,7 @@ static int try_ropen_file(const char *fname)
 	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];
 	char ext[16];
@@ -807,9 +793,9 @@ char *emu_GetSaveFName(int load, int is_sram, int slot)
 	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)
@@ -829,13 +815,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;
 	char *saveFname;
 
 	// make save filename
-	saveFname = emu_GetSaveFName(load, sram, state_slot);
+	saveFname = emu_get_save_fname(load, sram, state_slot);
 	if (saveFname == NULL) {
 		if (!sram)
 			plat_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED");
@@ -935,7 +921,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 int set_Frameskip, set_EmuOpt, is_on = 0;
@@ -1056,7 +1042,7 @@ static void run_events_ui(unsigned int which)
 	if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE))
 	{
 		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_SAVE) && (currentConfig.EmuOpt & EOPT_CONFIRM_SAVE))) )
 		{
@@ -1088,13 +1074,13 @@ static void run_events_ui(unsigned int which)
 		if (do_it) {
 			plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING GAME" : "SAVING GAME");
 			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;
 		}
 	}
 	if (which & PEV_SWITCH_RND)
 	{
-		plat_video_toggle_renderer();
+		plat_video_toggle_renderer(1, 0);
 	}
 	if (which & (PEV_SSLOT_PREV|PEV_SSLOT_NEXT))
 	{
@@ -1109,7 +1095,7 @@ static void run_events_ui(unsigned int which)
 		}
 
 		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)
 		engineState = PGS_Menu;
@@ -1117,31 +1103,37 @@ static void run_events_ui(unsigned int which)
 
 void emu_update_input(void)
 {
-	unsigned int allActions[2] = { 0, 0 }, events;
-	static unsigned int prevEvents = 0;
+	static int prev_events = 0;
+	int actions[IN_BINDTYPE_COUNT] = { 0, };
+	int pl_actions[2];
+	int events;
 
-	/* FIXME: player2 */
-	allActions[0] = in_update();
+	in_update(actions);
 
-	PicoPad[0] = allActions[0] & 0xfff;
-	PicoPad[1] = allActions[1] & 0xfff;
+	pl_actions[0] = actions[IN_BINDTYPE_PLAYER12];
+	pl_actions[1] = actions[IN_BINDTYPE_PLAYER12] >> 16;
 
-	if (allActions[0] & 0x7000) do_turbo(&PicoPad[0], allActions[0]);
-	if (allActions[1] & 0x7000) do_turbo(&PicoPad[1], allActions[1]);
+	PicoPad[0] = pl_actions[0] & 0xfff;
+	PicoPad[1] = pl_actions[1] & 0xfff;
 
-	events = (allActions[0] | allActions[1]) & PEV_MASK;
+	if (pl_actions[0] & 0x7000)
+		do_turbo(&PicoPad[0], pl_actions[0]);
+	if (pl_actions[1] & 0x7000)
+		do_turbo(&PicoPad[1], pl_actions[1]);
+
+	events = actions[IN_BINDTYPE_EMU] & PEV_MASK;
 
 	// volume is treated in special way and triggered every frame
 	if (events & (PEV_VOL_DOWN|PEV_VOL_UP))
 		plat_update_volume(1, events & PEV_VOL_UP);
 
-	if ((events ^ prevEvents) & PEV_FF) {
-		emu_changeFastForward(events & PEV_FF);
+	if ((events ^ prev_events) & PEV_FF) {
+		emu_set_fastforward(events & PEV_FF);
 		plat_update_volume(0, 0);
 		reset_timing = 1;
 	}
 
-	events &= ~prevEvents;
+	events &= ~prev_events;
 
 	if (PicoAHW == PAHW_PICO)
 		run_events_pico(events);
@@ -1150,7 +1142,7 @@ void emu_update_input(void)
 	if (movie_data)
 		update_movie();
 
-	prevEvents = (allActions[0] | allActions[1]) & PEV_MASK;
+	prev_events = actions[IN_BINDTYPE_EMU] & PEV_MASK;
 }
 
 static void mkdir_path(char *path_with_reserve, int pos, const char *name)
@@ -1164,14 +1156,17 @@ static void mkdir_path(char *path_with_reserve, int pos, const char *name)
 
 void emu_init(void)
 {
-	char dir[256];
+	char path[512];
 	int pos;
 
 	/* make dirs for saves */
-	pos = plat_get_root_dir(dir, sizeof(dir) - 4);
-	mkdir_path(dir, pos, "mds");
-	mkdir_path(dir, pos, "srm");
-	mkdir_path(dir, pos, "brm");
+	pos = plat_get_root_dir(path, sizeof(path) - 4);
+	mkdir_path(path, pos, "mds");
+	mkdir_path(path, pos, "srm");
+	mkdir_path(path, pos, "brm");
+
+	make_config_cfg(path);
+	config_readlrom(path);
 
 	PicoInit();
 	PicoMessage = plat_status_msg_busy_next;
@@ -1182,13 +1177,19 @@ void emu_init(void)
 void emu_finish(void)
 {
 	// save SRAM
-	if ((currentConfig.EmuOpt & EOPT_USE_SRAM) && SRam.changed) {
-		emu_SaveLoadGame(0, 1);
+	if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
+		emu_save_load_game(0, 1);
 		SRam.changed = 0;
 	}
 
-	if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG))
-		emu_writelrom();
+	if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG)) {
+		char cfg[512];
+		make_config_cfg(cfg);
+		config_writelrom(cfg);
+#ifndef NO_SYNC
+		sync();
+#endif
+	}
 
 	PicoExit();
 }