summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a505b5f)
#if defined(EMU_C68K)\r
void cyclone_crashed(u32 pc, struct Cyclone *context)\r
{\r
#if defined(EMU_C68K)\r
void cyclone_crashed(u32 pc, struct Cyclone *context)\r
{\r
- elprintf(EL_STATUS|EL_ANOMALY, "%c68k crash detected @ %06x\n",\r
+ elprintf(EL_STATUS|EL_ANOMALY, "%c68k crash detected @ %06x",\r
context == &PicoCpuCM68k ? 'm' : 's', pc);\r
context->membase = (u32)Pico.rom;\r
context->pc = (u32)Pico.rom + Pico.romsize;\r
context == &PicoCpuCM68k ? 'm' : 's', pc);\r
context->membase = (u32)Pico.rom;\r
context->pc = (u32)Pico.rom + Pico.romsize;\r
void plat_video_menu_begin(void)\r
{\r
memcpy32(g_screen_ptr, g_menubg_ptr, g_screen_width * g_screen_height * 2 / 4);\r
void plat_video_menu_begin(void)\r
{\r
memcpy32(g_screen_ptr, g_menubg_ptr, g_screen_width * g_screen_height * 2 / 4);\r
- g_menubg_ptr = g_screen_ptr;\r
+ g_menuscreen_ptr = g_screen_ptr;\r
}\r
\r
void plat_video_menu_end(void)\r
}\r
\r
void plat_video_menu_end(void)\r
\r
void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
\r
void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
- if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
- if (notice)\r
- osd_text(2, g_osd_y, notice);\r
- if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
- osd_text(g_osd_fps_x, g_osd_y, fps);\r
- }\r
+ if (notice && notice[0])\r
+ osd_text(2, g_osd_y, notice);\r
+ if (fps && fps[0] && (currentConfig.EmuOpt & EOPT_SHOW_FPS))\r
+ osd_text(g_osd_fps_x, g_osd_y, fps);\r
if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
}\r
if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
}\r
pnd_setup_layer(1, g_layer_x, g_layer_y, g_layer_w, g_layer_h);\r
vout_fbdev_resize(layer_fb, fb_w, fb_h, fb_left, fb_right, fb_top, fb_bottom, 0);\r
vout_fbdev_clear(layer_fb);\r
pnd_setup_layer(1, g_layer_x, g_layer_y, g_layer_w, g_layer_h);\r
vout_fbdev_resize(layer_fb, fb_w, fb_h, fb_left, fb_right, fb_top, fb_bottom, 0);\r
vout_fbdev_clear(layer_fb);\r
}\r
\r
static void make_bg(void)\r
}\r
\r
static void make_bg(void)\r