X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=8548bdcf268bc2a50397dfad0a06c136f03b4e05;hb=9ecdd73ae7f2666068d5bd8d6c2abde3040aa998;hp=ff17e3be0cfd442ef061c57efed00517fce0952c;hpb=388947f33d88ce3de0d9cb3e873244fbb5162a59;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index ff17e3b..8548bdc 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -16,6 +16,7 @@
 #include "config.h"
 #include "plat.h"
 #include "input.h"
+#include "posix.h"
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
@@ -34,6 +35,7 @@ char *PicoConfigFile = "config.cfg";
 currentConfig_t currentConfig, defaultConfig;
 int state_slot = 0;
 int config_slot = 0, config_slot_current = 0;
+int pico_pen_x = 320/2, pico_pen_y = 240/2;
 int pico_inp_mode = 0;
 int engineState = PGS_Menu;
 
@@ -41,6 +43,7 @@ int engineState = PGS_Menu;
 char rom_fname_reload[512] = { 0, };
 char rom_fname_loaded[512] = { 0, };
 int rom_loaded = 0;
+int reset_timing = 0;
 
 unsigned char *movie_data = NULL;
 static int movie_size = 0;
@@ -83,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
@@ -109,8 +112,7 @@ int emu_findBios(int region, char **bios_file)
 
 	for (i = 0; i < count; i++)
 	{
-		emu_getMainDir(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;
@@ -153,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;
@@ -250,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;
@@ -273,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;
@@ -289,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;
@@ -365,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;
 		}
@@ -434,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);
@@ -486,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;
@@ -501,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;
@@ -519,7 +519,7 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
 	for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++;
 	*dst = 0;
 	if (prefix) {
-		int len = emu_getMainDir(dst, 512);
+		int len = plat_get_root_dir(dst, 512);
 		strcpy(dst + len, prefix);
 		prefix_len = len + strlen(prefix);
 	}
@@ -532,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 = emu_getMainDir(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;
-}
-
-void emu_packConfig(void)
-{
-	currentConfig.s_PicoOpt = PicoOpt;
-	currentConfig.s_PsndRate = PsndRate;
-	currentConfig.s_PicoRegion = PicoRegionOverride;
-	currentConfig.s_PicoAutoRgnOrder = PicoAutoRgnOrder;
-	currentConfig.s_PicoCDBuffers = PicoCDBuffers;
+	cfg_buff_512[511] = 0;
 }
 
-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;
@@ -565,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;
@@ -580,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)
@@ -598,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)
 		}
@@ -635,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;
@@ -648,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
@@ -665,16 +660,6 @@ 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) \
@@ -758,7 +743,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];
@@ -804,9 +789,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)
@@ -826,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;
 	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");
@@ -932,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 int set_Frameskip, set_EmuOpt, is_on = 0;
@@ -957,9 +942,22 @@ void emu_changeFastForward(int set_on)
 	}
 }
 
-void emu_RunEventsPico(unsigned int events)
+static void emu_msg_tray_open(void)
+{
+	plat_status_msg("CD tray opened");
+}
+
+void emu_reset_game(void)
+{
+	PicoReset();
+	reset_timing = 1;
+}
+
+void run_events_pico(unsigned int events)
 {
-	if (events & (1 << 3)) {
+	int lim_x;
+
+	if (events & PEV_PICO_SWINP) {
 		pico_inp_mode++;
 		if (pico_inp_mode > 2)
 			pico_inp_mode = 0;
@@ -971,18 +969,44 @@ void emu_RunEventsPico(unsigned int events)
 				break;
 		}
 	}
-	if (events & (1 << 4)) {
+	if (events & PEV_PICO_PPREV) {
 		PicoPicohw.page--;
 		if (PicoPicohw.page < 0)
 			PicoPicohw.page = 0;
 		plat_status_msg("Page %i", PicoPicohw.page);
 	}
-	if (events & (1 << 5)) {
+	if (events & PEV_PICO_PNEXT) {
 		PicoPicohw.page++;
 		if (PicoPicohw.page > 6)
 			PicoPicohw.page = 6;
 		plat_status_msg("Page %i", PicoPicohw.page);
 	}
+
+	if (pico_inp_mode == 0)
+		return;
+
+	/* handle other input modes */
+	if (PicoPad[0] & 1) pico_pen_y--;
+	if (PicoPad[0] & 2) pico_pen_y++;
+	if (PicoPad[0] & 4) pico_pen_x--;
+	if (PicoPad[0] & 8) pico_pen_x++;
+	PicoPad[0] &= ~0x0f; // release UDLR
+
+	lim_x = (Pico.video.reg[12]&1) ? 319 : 255;
+	if (pico_pen_y < 8)
+		pico_pen_y = 8;
+	if (pico_pen_y > 224 - PICO_PEN_ADJUST_Y)
+		pico_pen_y = 224 - PICO_PEN_ADJUST_Y;
+	if (pico_pen_x < 0)
+		pico_pen_x = 0;
+	if (pico_pen_x > lim_x - PICO_PEN_ADJUST_X)
+		pico_pen_x = lim_x - PICO_PEN_ADJUST_X;
+
+	PicoPicohw.pen_pos[0] = pico_pen_x;
+	if (!(Pico.video.reg[12] & 1))
+		PicoPicohw.pen_pos[0] += pico_pen_x / 4;
+	PicoPicohw.pen_pos[0] += 0x3c;
+	PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);
 }
 
 static void do_turbo(int *pad, int acts)
@@ -1009,12 +1033,12 @@ static void do_turbo(int *pad, int acts)
 	*pad |= turbo_pad & (acts >> 8);
 }
 
-static void run_ui_events(unsigned int which)
+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))) )
 		{
@@ -1046,13 +1070,13 @@ static void run_ui_events(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))
 	{
@@ -1067,7 +1091,7 @@ static void run_ui_events(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;
@@ -1075,39 +1099,94 @@ static void run_ui_events(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;
+		reset_timing = 1;
 	}
 
-	events &= ~prevEvents;
+	events &= ~prev_events;
 
-// TODO	if (PicoAHW == PAHW_PICO)
-//		RunEventsPico(events);
+	if (PicoAHW == PAHW_PICO)
+		run_events_pico(events);
 	if (events)
-		run_ui_events(events);
+		run_events_ui(events);
 	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)
+{
+	strcpy(path_with_reserve + pos, name);
+	if (plat_is_dir(path_with_reserve))
+		return;
+	if (mkdir(path_with_reserve, 0777) < 0)
+		lprintf("failed to create: %s\n", path_with_reserve);
+}
+
+void emu_init(void)
+{
+	char path[512];
+	int pos;
+
+	/* make dirs for saves */
+	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;
+	PicoMCDopenTray = emu_msg_tray_open;
+	PicoMCDcloseTray = menu_loop_tray;
+}
+
+void emu_finish(void)
+{
+	// save SRAM
+	if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
+		emu_save_load_game(0, 1);
+		SRam.changed = 0;
+	}
+
+	if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG)) {
+		char cfg[512];
+		make_config_cfg(cfg);
+		config_writelrom(cfg);
+#ifndef NO_SYNC
+		sync();
+#endif
+	}
+
+	PicoExit();
 }