\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
if (ext) strcat(dst, ext);\r
}\r
\r
-static void make_config_cfg(char *cfg)\r
+void emu_make_path(char *buff, const char *end, int size)\r
{\r
- int len;\r
- len = plat_get_root_dir(cfg, 512);\r
- strncpy(cfg + len, PicoConfigFile, 512-6-1-len);\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_buff_512)\r
+{\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
-static void emu_setDefaultConfig(void)\r
+void emu_set_defconfig(void)\r
{\r
memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig));\r
PicoOpt = currentConfig.s_PicoOpt;\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
{\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
-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
}\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
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
+ 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
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