X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=df9faac8d6fc8bb5f20e08e5b53c5620e256aaf2;hb=ca69c3e5a0ecf407c02dc85c6f3282ebb1efc5a2;hp=ccb5e87d5aa2ab36bdf9730c87e6284ac53b125d;hpb=9cfdd2d2e94daaeb85ab7f1675312dec80659ec3;p=libpicofe.git diff --git a/gp2x/emu.c b/gp2x/emu.c index ccb5e87..df9faac 100644 --- a/gp2x/emu.c +++ b/gp2x/emu.c @@ -13,15 +13,18 @@ #include #include +#include #include "plat_gp2x.h" #include "soc.h" +#include "soc_pollux.h" #include "../common/plat.h" #include "../common/menu.h" #include "../common/arm_utils.h" #include "../common/fonts.h" #include "../common/emu.h" #include "../common/config.h" +#include "../common/input.h" #include "../linux/sndout_oss.h" #include "version.h" @@ -42,30 +45,15 @@ extern int crashed_940; static short __attribute__((aligned(4))) sndBuffer[2*(44100+100)/50]; static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)]; unsigned char *PicoDraw2FB = PicoDraw2FB_; -static int osd_fps_x, osd_y; -const char *renderer_names_[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL }; -const char *renderer_names32x_[] = { "accurate", "faster ", "fastest ", NULL }; -const char **renderer_names = renderer_names_; -const char **renderer_names32x = renderer_names32x_; +static int osd_fps_x, osd_y, doing_bg_frame; +const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL }; +const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL }; enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT }; -extern void *gp2x_screens[4]; - +static int (*emu_scan_begin)(unsigned int num) = NULL; +static int (*emu_scan_end)(unsigned int num) = NULL; -static void scaling_update(void) -{ - PicoOpt &= ~(POPT_DIS_32C_BORDER|POPT_EN_SOFTSCALE); - switch (currentConfig.scaling) { - default:break; - case EOPT_SCALE_HW_H: - case EOPT_SCALE_HW_HV: - PicoOpt |= POPT_DIS_32C_BORDER; - break; - case EOPT_SCALE_SW_H: - PicoOpt |= POPT_EN_SOFTSCALE; - break; - } -} +extern void *gp2x_screens[4]; void pemu_prep_defconfig(void) @@ -74,22 +62,22 @@ void pemu_prep_defconfig(void) defaultConfig.CPUclock = default_cpu_clock; defaultConfig.renderer32x = RT_8BIT_FAST; + defaultConfig.analog_deadzone = 50; soc = soc_detect(); if (soc == SOCID_MMSP2) defaultConfig.s_PicoOpt |= POPT_EXT_FM; - else if (soc == SOCID_POLLUX) + else if (soc == SOCID_POLLUX) { defaultConfig.EmuOpt |= EOPT_WIZ_TEAR_FIX|EOPT_SHOW_RTC; + defaultConfig.s_PicoOpt |= POPT_EN_MCD_GFX; + } } void pemu_validate_config(void) { - gp2x_soc_t soc; - - soc = soc_detect(); - if (soc != SOCID_MMSP2) + if (gp2x_dev_id != GP2X_DEV_GP2X) PicoOpt &= ~POPT_EXT_FM; - if (soc != SOCID_POLLUX) + if (gp2x_dev_id != GP2X_DEV_WIZ) currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX; if (currentConfig.gamma < 10 || currentConfig.gamma > 300) @@ -115,6 +103,11 @@ static void change_renderer(int diff) else r = ¤tConfig.renderer; *r += diff; + + // 8bpp fast is not there (yet?) + if ((PicoAHW & PAHW_SMS) && *r == RT_8BIT_FAST) + (*r)++; + if (*r >= RT_COUNT) *r = 0; else if (*r < 0) @@ -278,6 +271,46 @@ static int EmuScanEnd8_rot(unsigned int num) return 0; } +/* line doublers */ +static unsigned int ld_counter; +static int ld_left, ld_lines; + +static int EmuScanBegin16_ld(unsigned int num) +{ + if ((signed int)(ld_counter - num) > 100) + ld_counter = 0; + + if (emu_scan_begin) + return emu_scan_begin(ld_counter); + else + DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8; + + return 0; +} + +static int EmuScanEnd16_ld(unsigned int num) +{ + void *oldline = DrawLineDest; + + if (emu_scan_end) + emu_scan_end(ld_counter); + + ld_counter++; + ld_left--; + if (ld_left <= 0) { + ld_left = ld_lines; + + EmuScanBegin16_ld(num); + memcpy32(DrawLineDest, oldline, 320 * gp2x_current_bpp / 8 / 4); + if (emu_scan_end) + emu_scan_end(ld_counter); + + ld_counter++; + } + + return 0; +} + static int localPal[0x100]; static void (*vidcpyM2)(void *dest, void *src, int m32col, int with_32c_border); static int (*make_local_pal)(int fast_mode); @@ -359,12 +392,10 @@ void pemu_finalize_frame(const char *fps, const char *notice) } } - if (notice || (emu_opt & EOPT_SHOW_FPS)) { - if (notice) - osd_text(4, osd_y, notice); - if (emu_opt & 2) - osd_text(osd_fps_x, osd_y, fps); - } + if (notice) + osd_text(4, osd_y, notice); + if (emu_opt & EOPT_SHOW_FPS) + osd_text(osd_fps_x, osd_y, fps); if ((PicoAHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS)) draw_cd_leds(); if (PicoAHW & PAHW_PICO) @@ -459,79 +490,71 @@ void plat_status_msg_busy_first(const char *msg) plat_status_msg_busy_next(msg); } -static void vidResetMode(void) +static void vid_reset_mode(void) { int gp2x_mode = 16; int renderer = get_renderer(); - PicoScanBegin = NULL; - PicoScanEnd = NULL; + PicoOpt &= ~POPT_ALT_RENDERER; + emu_scan_begin = NULL; + emu_scan_end = NULL; switch (renderer) { case RT_16BIT: - PicoOpt &= ~POPT_ALT_RENDERER; PicoDrawSetOutFormat(PDF_RGB555, 0); PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2); - if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) { - PicoScanBegin = EmuScanBegin16_rot; - PicoScanEnd = EmuScanEnd16_rot; - } break; case RT_8BIT_ACC: - PicoOpt &= ~POPT_ALT_RENDERER; PicoDrawSetOutFormat(PDF_8BIT, 0); PicoDrawSetOutBuf(g_screen_ptr, g_screen_width); - if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) { - PicoScanBegin = EmuScanBegin8_rot; - PicoScanEnd = EmuScanEnd8_rot; - } gp2x_mode = 8; break; case RT_8BIT_FAST: - PicoOpt |= POPT_ALT_RENDERER; + PicoOpt |= POPT_ALT_RENDERER; PicoDrawSetOutFormat(PDF_NONE, 0); - if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) - vidcpyM2 = vidcpy_m2_rot; - else - vidcpyM2 = vidcpy_m2; + vidcpyM2 = vidcpy_m2; gp2x_mode = 8; break; + default: + printf("bad renderer\n"); + break; } - if (is_16bit_mode()) - osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16; - else - osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8; - if (PicoAHW & PAHW_32X) { - // rules change in 32X world - if (renderer != RT_16BIT) { - PicoDrawSetOutFormat(PDF_NONE, 0); - PicoScanBegin = NULL; - PicoScanEnd = NULL; - } - PicoScan32xBegin = NULL; - PicoScan32xEnd = NULL; - if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) { - PicoScan32xBegin = EmuScanBegin16_rot; - PicoScan32xEnd = EmuScanEnd16_rot; - } // Wiz 16bit is an exception, uses line rendering due to rotation mess if (renderer == RT_16BIT && (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)) { PicoDrawSetOutFormat(PDF_RGB555, 1); PicoDraw32xSetFrameMode(0, 0); } else { - PicoDraw32xSetFrameMode(1, (renderer == RT_16BIT) ? 1 : 0); + PicoDrawSetOutFormat(PDF_NONE, 0); + PicoDraw32xSetFrameMode(1, 0); } PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2); gp2x_mode = 16; } - if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) - gp2x_mode = -gp2x_mode; - gp2x_video_changemode(gp2x_mode); + if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) { + if ((PicoAHW & PAHW_32X) || renderer == RT_16BIT) { + emu_scan_begin = EmuScanBegin16_rot; + emu_scan_end = EmuScanEnd16_rot; + } + else if (renderer == RT_8BIT_ACC) { + emu_scan_begin = EmuScanBegin8_rot; + emu_scan_end = EmuScanEnd8_rot; + } + else if (renderer == RT_8BIT_FAST) + vidcpyM2 = vidcpy_m2_rot; + } + + PicoDrawSetCallbacks(emu_scan_begin, emu_scan_end); + if (is_16bit_mode()) + osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16; + else + osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8; + + gp2x_video_wait_vsync(); if (!is_16bit_mode()) { // setup pal for 8-bit modes localPal[0xc0] = 0x0000c000; // MCD LEDs @@ -540,19 +563,65 @@ static void vidResetMode(void) localPal[0xf0] = 0x00ffffff; gp2x_video_setpalette(localPal, 0x100); gp2x_memset_all_buffers(0, 0xe0, 320*240); - gp2x_video_flip(); } + else + gp2x_memset_all_buffers(0, 0, 320*240*2); + + if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) + gp2x_mode = -gp2x_mode; + + gp2x_video_changemode(gp2x_mode); + Pico.m.dirtyPal = 1; - // reset scaling - if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(Pico.video.reg[1]&8)) - gp2x_video_RGB_setscaling(8, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 224); - else gp2x_video_RGB_setscaling(0, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240); + PicoOpt &= ~POPT_EN_SOFTSCALE; + if (currentConfig.scaling == EOPT_SCALE_SW) + PicoOpt |= POPT_EN_SOFTSCALE; // palette converters for 8bit modes make_local_pal = (PicoAHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md; } +void emu_video_mode_change(int start_line, int line_count, int is_32cols) +{ + int scalex = 320, scaley = 240; + int ln_offs = 0; + + if (doing_bg_frame) + return; + + osd_fps_x = OSD_FPS_X; + osd_y = 232; + + /* set up hwscaling here */ + PicoOpt &= ~POPT_DIS_32C_BORDER; + if (is_32cols && currentConfig.scaling == EOPT_SCALE_HW) { + scalex = 256; + PicoOpt |= POPT_DIS_32C_BORDER; + osd_fps_x = OSD_FPS_X - 64; + } + + if (currentConfig.vscaling == EOPT_SCALE_HW) { + ln_offs = start_line; + scaley = line_count; + osd_y = start_line + line_count - 8; + } + + gp2x_video_RGB_setscaling(ln_offs, scalex, scaley); + + /* line doubling */ + if (currentConfig.vscaling == EOPT_SCALE_SW && line_count < 240) { + ld_lines = ld_left = line_count / (240 - line_count); + PicoDrawSetCallbacks(EmuScanBegin16_ld, EmuScanEnd16_ld); + } + + // clear whole screen in all buffers + if (!is_16bit_mode()) + gp2x_memset_all_buffers(0, 0xe0, 320*240); + else + gp2x_memset_all_buffers(0, 0, 320*240*2); +} + void plat_video_toggle_renderer(int change, int is_menu_call) { change_renderer(change); @@ -560,7 +629,7 @@ void plat_video_toggle_renderer(int change, int is_menu_call) if (is_menu_call) return; - vidResetMode(); + vid_reset_mode(); rendstatus_old = -1; if (PicoAHW & PAHW_32X) @@ -643,18 +712,13 @@ void plat_update_volume(int has_changed, int is_up) } } -static void updateSound(int len) +static void oss_write_nonblocking(int len) { - len <<= 1; - if (PicoOpt & POPT_EN_STEREO) - len <<= 1; - + // sndout_oss_can_write() is not reliable, only use with no_frmlimit if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len)) return; - /* avoid writing audio when lagging behind to prevent audio lag */ - if (PicoSkipFrame != 2) - sndout_oss_write(PsndOut, len); + sndout_oss_write_nb(PsndOut, len); } void pemu_sound_start(void) @@ -667,21 +731,22 @@ void pemu_sound_start(void) if (currentConfig.EmuOpt & EOPT_EN_SOUND) { int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0; - int target_fps = Pico.m.pal ? 50 : 60; - int frame_samples, snd_excess_add; int snd_rate_oss = PsndRate; gp2x_soc_t soc; + memset(sndBuffer, 0, sizeof(sndBuffer)); + PsndOut = sndBuffer; + PicoWriteSound = oss_write_nonblocking; + plat_update_volume(0, 0); + + printf("starting audio: %i len: %i stereo: %i, pal: %i\n", + PsndRate, PsndLen, is_stereo, Pico.m.pal); + sndout_oss_start(snd_rate_oss, is_stereo, 1); + sndout_oss_setvol(currentConfig.volume, currentConfig.volume); + soc = soc_detect(); - if (soc == SOCID_POLLUX) { - /* POLLUX pain: DPLL1 / mclk_div / bitclk_div / 4 */ - switch (PsndRate) { - case 44100: PsndRate = 44171; break; // 44170.673077 - case 22050: PsndRate = 22086; break; // 22085.336538 - case 11025: PsndRate = 11043; break; // 11042.668269 - default: break; - } - } + if (soc == SOCID_POLLUX) + PsndRate = pollux_get_real_snd_rate(PsndRate); #define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA) if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) || @@ -689,40 +754,25 @@ void pemu_sound_start(void) PsndRerate(Pico.m.frame_count ? 1 : 0); } - memset(sndBuffer, 0, sizeof(sndBuffer)); - PsndOut = sndBuffer; - PicoWriteSound = updateSound; PsndRate_old = PsndRate; PicoOpt_old = PicoOpt; pal_old = Pico.m.pal; - plat_update_volume(0, 0); - - frame_samples = PsndLen; - snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps; - if (snd_excess_add != 0) - frame_samples++; - if (soc == SOCID_POLLUX) - frame_samples *= 2; /* force larger buffer */ - - printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", - PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal); - sndout_oss_setvol(currentConfig.volume, currentConfig.volume); - sndout_oss_start(snd_rate_oss, frame_samples, is_stereo); - - /* Wiz's sound hardware needs more prebuffer */ - if (soc == SOCID_POLLUX) - updateSound(frame_samples); } } +static const int sound_rates[] = { 44100, 32000, 22050, 16000, 11025, 8000 }; + void pemu_sound_stop(void) { - /* get back from Wiz pain */ - switch (PsndRate) { - case 44171: PsndRate = 44100; break; - case 22086: PsndRate = 22050; break; - case 11043: PsndRate = 11025; break; - default: break; + int i; + + /* get back from Pollux pain */ + PsndRate += 1000; + for (i = 0; i < ARRAY_SIZE(sound_rates); i++) { + if (PsndRate >= sound_rates[i]) { + PsndRate = sound_rates[i]; + break; + } } } @@ -731,53 +781,24 @@ void pemu_sound_wait(void) // don't need to do anything, writes will block by themselves } - -void pemu_forced_frame(int opts) +void pemu_forced_frame(int no_scale, int do_emu) { - int po_old = PicoOpt; - - PicoOpt &= ~POPT_ALT_RENDERER; - PicoOpt |= opts|POPT_ACC_SPRITES; - - PicoDrawSetOutFormat(PDF_RGB555, 1); + doing_bg_frame = 1; PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2); PicoDraw32xSetFrameMode(0, 0); - PicoScanBegin = NULL; - PicoScanEnd = NULL; + PicoDrawSetCallbacks(NULL, NULL); Pico.m.dirtyPal = 1; - PicoFrameDrawOnly(); - PicoOpt = po_old; + emu_cmn_forced_frame(no_scale, do_emu); + + g_menubg_src_ptr = g_screen_ptr; + doing_bg_frame = 0; } void plat_debug_cat(char *str) { } -void emu_video_mode_change(int start_line, int line_count, int is_32cols) -{ - int scalex = 320; - osd_fps_x = OSD_FPS_X; - osd_y = 232; - if (is_32cols && (PicoOpt & POPT_DIS_32C_BORDER)) { - scalex = 256; - osd_fps_x = OSD_FPS_X - 64; - } - - /* want vertical scaling and game is not in 240 line mode */ - if (currentConfig.scaling == EOPT_SCALE_HW_HV) { - gp2x_video_RGB_setscaling(start_line, scalex, line_count); - osd_y = start_line + line_count - 8; - } else - gp2x_video_RGB_setscaling(0, scalex, 240); - - // clear whole screen in all buffers - if (!is_16bit_mode()) - gp2x_memset_all_buffers(0, 0xe0, 320*240); - else - gp2x_memset_all_buffers(0, 0, 320*240*2); -} - #if 0 static void tga_dump(void) { @@ -843,7 +864,7 @@ void pemu_loop_prep(void) if (gp2x_old_clock < 0) gp2x_old_clock = default_cpu_clock; - if (gp2x_old_clock != currentConfig.CPUclock) { + if (gp2x_old_clock != currentConfig.CPUclock && gp2x_set_cpuclk != NULL) { printf("changing clock to %i...", currentConfig.CPUclock); fflush(stdout); gp2x_set_cpuclk(currentConfig.CPUclock); gp2x_old_clock = currentConfig.CPUclock; @@ -863,6 +884,10 @@ void pemu_loop_prep(void) unset_lcd_custom_rate(); } + if (gp2x_dev_id == GP2X_DEV_CAANOO) + in_set_config_int(in_name_to_id("evdev:pollux-analog"), IN_CFG_ABS_DEAD_ZONE, + currentConfig.analog_deadzone); + if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_MMUHACK) gp2x_make_fb_bufferable(currentConfig.EmuOpt & EOPT_MMUHACK); @@ -870,54 +895,21 @@ void pemu_loop_prep(void) pal_old = Pico.m.pal; // make sure we are in correct mode - vidResetMode(); - scaling_update(); + change_renderer(0); + vid_reset_mode(); + + // dirty buffers better go now than during gameplay + sync(); + sleep(0); pemu_sound_start(); } void pemu_loop_end(void) { - int po_old = PicoOpt; - int eo_old = currentConfig.EmuOpt; - pemu_sound_stop(); - memset32(g_screen_ptr, 0, 320*240*2/4); /* do one more frame for menu bg */ - PicoOpt &= ~POPT_ALT_RENDERER; - PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES; - - PicoDrawSetOutFormat(PDF_RGB555, 1); - PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2); - PicoDraw32xSetFrameMode(0, 0); - PicoScanBegin = NULL; - PicoScanEnd = NULL; - Pico.m.dirtyPal = 1; - PicoFrame(); - - PicoOpt = po_old; - currentConfig.EmuOpt = eo_old; -} - -const char *plat_get_credits(void) -{ - return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n" - "Credits:\n" - "fDave: Cyclone 68000 core,\n" - " base code of PicoDrive\n" - "Reesy & FluBBa: DrZ80 core\n" - "MAME devs: YM2612 and SN76496 cores\n" - "rlyeh and others: minimal SDK\n" - "Squidge: mmuhack\n" - "Dzz: ARM940 sample\n" - "GnoStiC / Puck2099: USB joy code\n" - "craigix: GP2X hardware\n" - "ketchupgun: skin design\n" - "\n" - "special thanks (for docs, ideas):\n" - " Charles MacDonald, Haze,\n" - " Stephane Dallongeville,\n" - " Lordus, Exophase, Rokas,\n" - " Nemesis, Tasco Deluxe"; + pemu_forced_frame(0, 1); } +