From bf61bea0f2e94206a79fecc83b719f24cfc951c2 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 10 Sep 2010 13:38:36 +0000 Subject: [PATCH] random minor fixes git-svn-id: file:///home/notaz/opt/svn/PicoDrive@892 be3aeb3a-fb24-0410-a615-afba39da0efa --- pico/memory.c | 2 +- platform/linux/emu.c | 2 +- platform/pandora/plat.c | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pico/memory.c b/pico/memory.c index 2fff489..ac4b31f 100644 --- a/pico/memory.c +++ b/pico/memory.c @@ -166,7 +166,7 @@ void log_io(unsigned int addr, int bits, int rw); #if defined(EMU_C68K) void cyclone_crashed(u32 pc, struct Cyclone *context) { - elprintf(EL_STATUS|EL_ANOMALY, "%c68k crash detected @ %06x\n", + elprintf(EL_STATUS|EL_ANOMALY, "%c68k crash detected @ %06x", context == &PicoCpuCM68k ? 'm' : 's', pc); context->membase = (u32)Pico.rom; context->pc = (u32)Pico.rom + Pico.romsize; diff --git a/platform/linux/emu.c b/platform/linux/emu.c index b582072..db5d6be 100644 --- a/platform/linux/emu.c +++ b/platform/linux/emu.c @@ -179,7 +179,7 @@ void plat_video_menu_enter(int is_rom_loaded) void plat_video_menu_begin(void) { memcpy32(g_screen_ptr, g_menubg_ptr, g_screen_width * g_screen_height * 2 / 4); - g_menubg_ptr = g_screen_ptr; + g_menuscreen_ptr = g_screen_ptr; } void plat_video_menu_end(void) diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c index e857bcc..e259f85 100644 --- a/platform/pandora/plat.c +++ b/platform/pandora/plat.c @@ -115,12 +115,10 @@ static int emuscan(unsigned int num) void pemu_finalize_frame(const char *fps, const char *notice) { - if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) { - if (notice) - osd_text(2, g_osd_y, notice); - if (currentConfig.EmuOpt & EOPT_SHOW_FPS) - osd_text(g_osd_fps_x, g_osd_y, fps); - } + if (notice && notice[0]) + osd_text(2, g_osd_y, notice); + if (fps && fps[0] && (currentConfig.EmuOpt & EOPT_SHOW_FPS)) + osd_text(g_osd_fps_x, g_osd_y, fps); if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS)) draw_cd_leds(); } @@ -426,6 +424,7 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols) pnd_setup_layer(1, g_layer_x, g_layer_y, g_layer_w, g_layer_h); vout_fbdev_resize(layer_fb, fb_w, fb_h, fb_left, fb_right, fb_top, fb_bottom, 0); vout_fbdev_clear(layer_fb); + plat_video_flip(); } static void make_bg(void) -- 2.39.2