X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=3a6c861b113f47c4e71e55bcd853c9403281f372;hb=99bdfd31b8708f8059fbc16ec8be90cb8d7c8bc3;hp=8a5755642bda9e0ecf0a1ed5cd8728a5d27a0a31;hpb=9839d126cc1cf782fad713f4fbc3611cba628ade;p=picodrive.git diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c index 8a57556..3a6c861 100644 --- a/platform/gizmondo/emu.c +++ b/platform/gizmondo/emu.c @@ -10,12 +10,13 @@ #include "../common/emu.h" #include "../common/lprintf.h" #include "../common/arm_utils.h" +#include "../common/config.h" #include "emu.h" #include "menu.h" #include "giz.h" #include "asm_utils.h" -#include +#include #ifdef BENCHMARK #define OSD_FPS_X 220 @@ -25,141 +26,86 @@ // main 300K gfx-related buffer. Used by menu and renderers. unsigned char gfx_buffer[321*240*2*2]; -char romFileName[MAX_PATH]; -int engineState; -unsigned char *PicoDraw2FB = gfx_buffer; // temporary buffer for alt renderer ( (8+320)*(8+240+8) ) -int reset_timing = 0; - -static DWORD noticeMsgTime = 0; +static short *snd_cbuff = NULL; +static int snd_cbuf_samples = 0, snd_all_samples = 0; static void blit(const char *fps, const char *notice); static void clearArea(int full); -void emu_noticeMsgUpdated(void) -{ - noticeMsgTime = GetTickCount(); -} - -void emu_getMainDir(char *dst, int len) +int plat_get_root_dir(char *dst, int len) { if (len > 0) *dst = 0; + + return 0; } static void emu_msg_cb(const char *msg) { - if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(); + if (giz_screen != NULL) fb_unlock(); + giz_screen = fb_lock(1); memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4); - emu_textOut16(4, 232, msg); + emu_text_out16(4, 232, msg); noticeMsgTime = GetTickCount() - 2000; /* assumption: emu_msg_cb gets called only when something slow is about to happen */ reset_timing = 1; + + fb_unlock(); + giz_screen = fb_lock((currentConfig.EmuOpt&0x8000) ? 0 : 1); } -static void emu_state_cb(const char *str) +void emu_stateCb(const char *str) { - if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(); + if (giz_screen != NULL) fb_unlock(); + giz_screen = fb_lock(1); clearArea(0); blit("", str); - Framework2D_UnlockBuffer(); + fb_unlock(); giz_screen = NULL; -} -static void emu_msg_tray_open(void) -{ - strcpy(noticeMsg, "CD tray opened"); - noticeMsgTime = GetTickCount(); + Sleep(0); /* yield the CPU, the system may need it */ } - -void emu_Init(void) +void pemu_prep_defconfig(void) { - // make dirs for saves, cfgs, etc. - mkdir("mds", 0777); - mkdir("srm", 0777); - mkdir("brm", 0777); - mkdir("cfg", 0777); - - PicoInit(); - PicoMessage = emu_msg_cb; - PicoMCDopenTray = emu_msg_tray_open; - PicoMCDcloseTray = menu_loop_tray; + defaultConfig.s_PsndRate = 22050; + defaultConfig.s_PicoCDBuffers = 0; + defaultConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU + defaultConfig.KeyBinds[ 3] = 1<<1; + defaultConfig.KeyBinds[ 0] = 1<<2; + defaultConfig.KeyBinds[ 1] = 1<<3; + defaultConfig.KeyBinds[ 5] = 1<<4; + defaultConfig.KeyBinds[ 6] = 1<<5; + defaultConfig.KeyBinds[ 7] = 1<<6; + defaultConfig.KeyBinds[ 4] = 1<<7; + defaultConfig.KeyBinds[13] = 1<<26; // switch rend + defaultConfig.KeyBinds[ 8] = 1<<27; // save state + defaultConfig.KeyBinds[ 9] = 1<<28; // load state + defaultConfig.KeyBinds[12] = 1<<29; // vol up + defaultConfig.KeyBinds[11] = 1<<30; // vol down + defaultConfig.scaling = 0; } -void emu_Deinit(void) -{ - // save SRAM - if((currentConfig.EmuOpt & 1) && SRam.changed) { - emu_SaveLoadGame(0, 1); - SRam.changed = 0; - } - - if (!(currentConfig.EmuOpt & 0x20)) { - FILE *f = fopen(PicoConfigFile, "r+b"); - if (!f) emu_WriteConfig(0); - else { - // if we already have config, reload it, except last ROM - fseek(f, sizeof(currentConfig.lastRomFile), SEEK_SET); - fread(¤tConfig.EmuOpt, 1, sizeof(currentConfig) - sizeof(currentConfig.lastRomFile), f); - fseek(f, 0, SEEK_SET); - fwrite(¤tConfig, 1, sizeof(currentConfig), f); - fflush(f); - fclose(f); - } - } - - PicoExit(); -} -void emu_setDefaultConfig(void) +static int EmuScanBegin16(unsigned int num) { - memset(¤tConfig, 0, sizeof(currentConfig)); - currentConfig.lastRomFile[0] = 0; - currentConfig.EmuOpt = 0x1f | 0x680; // | confirm_save, cd_leds, 16bit rend - currentConfig.PicoOpt = 0x0f | 0xc00; // | cd_pcm, cd_cdda - currentConfig.PsndRate = 22050; - currentConfig.PicoRegion = 0; // auto - currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP - currentConfig.Frameskip = 0;//-1; // auto - currentConfig.volume = 50; - currentConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU - currentConfig.KeyBinds[ 3] = 1<<1; - currentConfig.KeyBinds[ 0] = 1<<2; - currentConfig.KeyBinds[ 1] = 1<<3; - currentConfig.KeyBinds[ 5] = 1<<4; - currentConfig.KeyBinds[ 6] = 1<<5; - currentConfig.KeyBinds[ 7] = 1<<6; - currentConfig.KeyBinds[ 4] = 1<<7; - currentConfig.KeyBinds[13] = 1<<26; // switch rend - currentConfig.KeyBinds[ 8] = 1<<27; // save state - currentConfig.KeyBinds[ 9] = 1<<28; // load state - currentConfig.KeyBinds[12] = 1<<29; // vol up - currentConfig.KeyBinds[11] = 1<<30; // vol down - currentConfig.PicoCDBuffers = 64; - currentConfig.scaling = 0; -} - + Pico.est.DrawLineDest = (unsigned short *) giz_screen + 321 * num; -static int EmuScan16(unsigned int num, void *sdata) -{ - if (!(Pico.video.reg[1]&8)) num += 8; - DrawLineDest = (unsigned short *) giz_screen + 321*(num+1); + if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1)) + return 1; // skip next line return 0; } -static int EmuScan8(unsigned int num, void *sdata) +static int EmuScanBegin8(unsigned int num) { // draw like the fast renderer - if (!(Pico.video.reg[1]&8)) num += 8; - HighCol = gfx_buffer + 328*(num+1); + Pico.est.HighCol = gfx_buffer + 328 * num; return 0; } @@ -173,16 +119,9 @@ static void osd_text(int x, int y, const char *text) p = (int *) ((int)p & ~3); // align memset32(p, 0, len); } - emu_textOut16(x, y, text); + emu_text_out16(x, y, text); } -/* -void log1(void *p1, void *p2) -{ - lprintf("%p %p %p\n", p1, p2, DrawLineDest); -} -*/ - static void cd_leds(void) { static int old_reg = 0; @@ -214,7 +153,12 @@ static void blit(const char *fps, const char *notice) Pico.m.dirtyPal = 0; vidConvCpyRGB565(localPal, Pico.cram, 0x40); } - if (!(Pico.video.reg[12]&1)) lines_flags|=0x100; + // a hack for VR + if (PicoAHW & PAHW_SVP) + memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328); + if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000; + if (currentConfig.EmuOpt&0x4000) + lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000; vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags); } else if (!(emu_opt&0x80)) @@ -227,7 +171,7 @@ static void blit(const char *fps, const char *notice) if (Pico.video.reg[0xC]&8) { // shadow/hilight mode //vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40); //vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); // TODO? - blockcpy(localPal+0xc0, localPal+0x40, 0x40*2); + memcpy32((void *)(localPal+0xc0), (void *)(localPal+0x40), 0x40*2/4); localPal[0xc0] = 0x0600; localPal[0xd0] = 0xc000; localPal[0xe0] = 0x0000; // reserved pixels for OSD @@ -240,7 +184,9 @@ static void blit(const char *fps, const char *notice) } */ } lines_flags = (Pico.video.reg[1]&8) ? 240 : 224; - if (!(Pico.video.reg[12]&1)) lines_flags|=0x100; + if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000; + if (currentConfig.EmuOpt&0x4000) + lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000; vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags); } @@ -250,7 +196,7 @@ static void blit(const char *fps, const char *notice) if (emu_opt & 2) osd_text(OSD_FPS_X, h, fps); } - if ((emu_opt & 0x400) && (PicoMCD & 1)) + if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD)) cd_leds(); } @@ -258,22 +204,29 @@ static void blit(const char *fps, const char *notice) static void clearArea(int full) { if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(); + giz_screen = fb_lock(1); if (full) memset32(giz_screen, 0, 320*240*2/4); else memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4); + + if (currentConfig.EmuOpt&0x8000) { + fb_unlock(); + giz_screen = fb_lock(0); + if (full) memset32(giz_screen, 0, 320*240*2/4); + else memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4); + } } static void vidResetMode(void) { - giz_screen = Framework2D_LockBuffer(); + giz_screen = fb_lock(1); if (PicoOpt&0x10) { } else if (currentConfig.EmuOpt&0x80) { - PicoDrawSetColorFormat(1); - PicoScan = EmuScan16; + PicoDrawSetOutFormat(PDF_RGB555, 0); + PicoDrawSetCallbacks(EmuScanBegin16, NULL); } else { - PicoDrawSetColorFormat(-1); - PicoScan = EmuScan8; + PicoDrawSetOutFormat(PDF_NONE, 0); + PicoDrawSetCallbacks(EmuScanBegin8, NULL); } if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) { // setup pal for 8-bit modes @@ -285,50 +238,120 @@ static void vidResetMode(void) Pico.m.dirtyPal = 1; memset32(giz_screen, 0, 321*240*2/4); - Framework2D_UnlockBuffer(); + if (currentConfig.EmuOpt&0x8000) { + fb_unlock(); + giz_screen = fb_lock(0); + memset32(giz_screen, 0, 321*240*2/4); + } + fb_unlock(); giz_screen = NULL; } +/* +#include +static void stdbg(const char *fmt, ...) +{ + static int cnt = 0; + va_list vl; + + sprintf(noticeMsg, "%x ", cnt++); + va_start(vl, fmt); + vsnprintf(noticeMsg+strlen(noticeMsg), sizeof(noticeMsg)-strlen(noticeMsg), fmt, vl); + va_end(vl); -static void SkipFrame(int do_audio) + noticeMsgTime = GetTickCount(); +} +*/ + +static void updateSound(int len) +{ + snd_all_samples += len / 2; + PsndOut += len / 2; + if (PsndOut - snd_cbuff >= snd_cbuf_samples) + { + //if (PsndOut - snd_cbuff != snd_cbuf_samples) + // stdbg("snd diff is %i, not %i", PsndOut - snd_cbuff, snd_cbuf_samples); + PsndOut = snd_cbuff; + } +} + + +static void SkipFrame(void) { - PicoSkipFrame=do_audio ? 1 : 2; + PicoSkipFrame=1; PicoFrame(); PicoSkipFrame=0; } -void emu_forcedFrame(void) +/* forced frame to front buffer */ +void pemu_forced_frame(int no_scale, int do_emu) { - // TODO + int po_old = PicoOpt; + int eo_old = currentConfig.EmuOpt; + + PicoOpt &= ~0x10; + PicoOpt |= POPT_ACC_SPRITES; + if (!no_scale) + PicoOpt |= POPT_EN_SOFTSCALE; + currentConfig.EmuOpt |= 0x80; + + if (giz_screen == NULL) + giz_screen = fb_lock(1); + + PicoDrawSetOutFormat(PDF_RGB555, 0); + PicoDrawSetCallbacks(EmuScanBegin16, NULL); + Pico.m.dirtyPal = 1; + PicoFrameDrawOnly(); + + fb_unlock(); + giz_screen = NULL; + + PicoOpt = po_old; + currentConfig.EmuOpt = eo_old; } + static void RunEvents(unsigned int which) { - if (which & 0x1800) { // save or load (but not both) + if (which & 0x1800) // save or load (but not both) + { int do_it = 1; - if ( emu_checkSaveFile(state_slot) && - (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load - (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save + + if (PsndOut != NULL) + FrameworkAudio_SetPause(1); + if (giz_screen == NULL) + giz_screen = fb_lock(1); + if ( emu_check_save_file(state_slot) && + (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load + (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save + { int keys; blit("", (which & 0x1000) ? "LOAD STATE? (PLAY=yes, STOP=no)" : "OVERWRITE SAVE? (PLAY=yes, STOP=no)"); - while( !((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) ) + while( !((keys = Framework_PollGetButtons()) & (PBTN_PLAY|PBTN_STOP)) ) + Sleep(50); + if (keys & PBTN_STOP) do_it = 0; + while( ((keys = Framework_PollGetButtons()) & (PBTN_PLAY|PBTN_STOP)) ) // wait for release Sleep(50); - if (keys & BTN_STOP) do_it = 0; clearArea(0); } - if (do_it) { + + if (do_it) + { osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME"); - PicoStateProgressCB = emu_state_cb; - emu_SaveLoadGame((which & 0x1000) >> 12, 0); + PicoStateProgressCB = emu_stateCb; + emu_save_load_game((which & 0x1000) >> 12, 0); PicoStateProgressCB = NULL; + Sleep(0); } + if (PsndOut != NULL) + FrameworkAudio_SetPause(0); reset_timing = 1; } - if (which & 0x0400) { // switch renderer - if ( PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; } - else if (!(currentConfig.EmuOpt&0x80)) PicoOpt|= 0x10; - else currentConfig.EmuOpt &= ~0x80; + if (which & 0x0400) // switch renderer + { + if (PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; } + else { PicoOpt|= 0x10; currentConfig.EmuOpt &= ~0x80; } vidResetMode(); @@ -342,7 +365,8 @@ static void RunEvents(unsigned int which) noticeMsgTime = GetTickCount(); } - if (which & 0x0300) { + if (which & 0x0300) + { if(which&0x0200) { state_slot -= 1; if(state_slot < 0) state_slot = 9; @@ -350,7 +374,7 @@ static void RunEvents(unsigned int which) state_slot += 1; if(state_slot > 9) state_slot = 0; } - sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE"); + sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_check_save_file(state_slot) ? "USED" : "FREE"); noticeMsgTime = GetTickCount(); } } @@ -361,55 +385,32 @@ static void updateKeys(void) static unsigned int prevEvents = 0; int i; + /* FIXME: port to input fw, merge with emu.c:emu_update_input() */ keys = Framework_PollGetButtons(); - if (keys & BTN_HOME) { + if (keys & PBTN_HOME) engineState = PGS_Menu; - // wait until select is released, so menu would not resume game - while (Framework_PollGetButtons() & BTN_HOME) Sleep(50); - } keys &= CONFIGURABLE_KEYS; - for (i = 0; i < 32; i++) - { - if (keys & (1 << i)) { - int pl, acts = currentConfig.KeyBinds[i]; - if (!acts) continue; - pl = (acts >> 16) & 1; - /* TODO if (combo_keys & (1 << i)) { - int u = i+1, acts_c = acts & combo_acts; - // let's try to find the other one - if (acts_c) - for (; u < 32; u++) - if ( (currentConfig.KeyBinds[u] & acts_c) && (keys & (1 << u)) ) { - allActions[pl] |= acts_c; - keys &= ~((1 << i) | (1 << u)); - break; - } - // add non-combo actions if combo ones were not found - if (!acts_c || u == 32) - allActions[pl] |= acts & ~combo_acts; - } else */ { - allActions[pl] |= acts; - } - } - } + PicoPad[0] = allActions[0] & 0xfff; + PicoPad[1] = allActions[1] & 0xfff; - PicoPad[0] = (unsigned short) allActions[0]; - PicoPad[1] = (unsigned short) allActions[1]; + if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]); + if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]); events = (allActions[0] | allActions[1]) >> 16; // volume is treated in special way and triggered every frame - if (events & 0x6000) { + if ((events & 0x6000) && PsndOut != NULL) + { int vol = currentConfig.volume; if (events & 0x2000) { if (vol < 100) vol++; } else { if (vol > 0) vol--; } - //gp2x_sound_volume(vol, vol); - sprintf(noticeMsg, "VOL: %02i", vol); + FrameworkAudio_SetVolume(vol, vol); + sprintf(noticeMsg, "VOL: %02i ", vol); noticeMsgTime = GetTickCount(); currentConfig.volume = vol; } @@ -421,6 +422,10 @@ static void updateKeys(void) prevEvents = (allActions[0] | allActions[1]) >> 16; } +void plat_debug_cat(char *str) +{ +} + static void simpleWait(DWORD until) { DWORD tval; @@ -435,12 +440,12 @@ static void simpleWait(DWORD until) spend_cycles(1024*2); } -void emu_Loop(void) +void pemu_loop(void) { - //static int PsndRate_old = 0, PicoOpt_old = 0, PsndLen_real = 0, pal_old = 0; + static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0; char fpsbuff[24]; // fps count c string DWORD tval, tval_prev = 0, tval_thissec = 0; // timing - int frames_done = 0, frames_shown = 0, oldmodes = 0; + int frames_done = 0, frames_shown = 0, oldmodes = 0, sec_ms = 1000; int target_fps, target_frametime, lim_time, tval_diff, i; char *notice = NULL; @@ -454,38 +459,46 @@ void emu_Loop(void) else PicoOpt&=~0x4000; Pico.m.dirtyPal = 1; oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc; - //find_combos(); // TODO // pal/ntsc might have changed, reset related stuff target_fps = Pico.m.pal ? 50 : 60; - target_frametime = (1000<<8)/target_fps; + target_frametime = Pico.m.pal ? (1000<<8)/50 : (1000<<8)/60+1; reset_timing = 1; + // prepare CD buffer + if (PicoAHW & PAHW_MCD) PicoCDBufferInit(); + // prepare sound stuff -/* if (currentConfig.EmuOpt & 4) { - int snd_excess_add; + PsndOut = NULL; + if (currentConfig.EmuOpt & 4) + { + int ret, snd_excess_add, stereo; if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) { - sound_rerate(Pico.m.frame_count ? 1 : 0); + PsndRerate(Pico.m.frame_count ? 1 : 0); } + stereo=(PicoOpt&8)>>3; snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps; + snd_cbuf_samples = (PsndRate<>3, Pico.m.pal); - gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3); - gp2x_sound_volume(currentConfig.volume, currentConfig.volume); - PicoWriteSound = updateSound; - memset(sndBuffer, 0, sizeof(sndBuffer)); - PsndOut = sndBuffer; - PsndRate_old = PsndRate; - PsndLen_real = PsndLen; - PicoOpt_old = PicoOpt; - pal_old = Pico.m.pal; - } else*/ { - PsndOut = 0; + PsndRate, PsndLen, snd_excess_add, stereo, Pico.m.pal); + ret = FrameworkAudio_Init(PsndRate, snd_cbuf_samples, stereo); + if (ret != 0) { + lprintf("FrameworkAudio_Init() failed: %i\n", ret); + sprintf(noticeMsg, "sound init failed (%i), snd disabled", ret); + noticeMsgTime = GetTickCount(); + currentConfig.EmuOpt &= ~4; + } else { + FrameworkAudio_SetVolume(currentConfig.volume, currentConfig.volume); + PicoWriteSound = updateSound; + snd_cbuff = FrameworkAudio_56448Buffer(); + PsndOut = snd_cbuff + snd_cbuf_samples / 2; // start writing at the middle + snd_all_samples = 0; + PsndRate_old = PsndRate; + PicoOpt_old = PicoOpt; + pal_old = Pico.m.pal; + } } - // prepare CD buffer - if (PicoMCD & 1) PicoCDBufferInit(); - // loop? while (engineState == PGS_Running) { @@ -493,6 +506,7 @@ void emu_Loop(void) tval = GetTickCount(); if (reset_timing || tval < tval_prev) { + //stdbg("timing reset"); reset_timing = 0; tval_thissec = tval; frames_shown = frames_done = 0; @@ -520,7 +534,7 @@ void emu_Loop(void) } // second passed? - if (tval - tval_thissec >= 1000) + if (tval - tval_thissec >= sec_ms) { #ifdef BENCHMARK static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4]; @@ -536,21 +550,43 @@ void emu_Loop(void) if(currentConfig.EmuOpt & 2) sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done); #endif - tval_thissec = tval; + //tval_thissec += 1000; + tval_thissec += sec_ms; - if (PsndOut == 0 && currentConfig.Frameskip >= 0) { - frames_done = frames_shown = 0; - } else { - // it is quite common for this implementation to leave 1 fame unfinished - // when second changes, but we don't want buffer to starve. - if (PsndOut && frames_done < target_fps && frames_done > target_fps-5) { - updateKeys(); - SkipFrame(1); frames_done++; + if (PsndOut != NULL) + { + /* some code which tries to sync things to audio clock, the dirty way */ + static int audio_skew_prev = 0; + int audio_skew, adj, co = 9, shift = 7; + audio_skew = snd_all_samples*2 - FrameworkAudio_BufferPos(); + if (PsndRate == 22050) co = 10; + if (PsndRate > 22050) co = 11; + if (PicoOpt&8) shift++; + if (audio_skew < 0) { + adj = -((-audio_skew) >> shift); + if (audio_skew > -(6<>=1; + if (audio_skew > -(4<>=1; + if (audio_skew > -(2<>=1; + if (audio_skew > audio_skew_prev) adj>>=2; // going up already + } else { + adj = audio_skew >> shift; + if (audio_skew < (6<>=1; + if (audio_skew < (4<>=1; + if (audio_skew < (2<>=1; + if (audio_skew < audio_skew_prev) adj>>=2; } - + audio_skew_prev = audio_skew; + target_frametime += adj; + sec_ms = (target_frametime * target_fps) >> 8; + //stdbg("%i %i %i", audio_skew, adj, sec_ms); + frames_done = frames_shown = 0; + } + else if (currentConfig.Frameskip < 0) { frames_done -= target_fps; if (frames_done < 0) frames_done = 0; frames_shown -= target_fps; if (frames_shown < 0) frames_shown = 0; if (frames_shown > frames_done) frames_shown = frames_done; + } else { + frames_done = frames_shown = 0; } } #ifdef PFRAMES @@ -563,7 +599,7 @@ void emu_Loop(void) { for (i = 0; i < currentConfig.Frameskip; i++) { updateKeys(); - SkipFrame(1); frames_done++; + SkipFrame(); frames_done++; if (PsndOut) { // do framelimitting if sound is enabled int tval_diff; tval = GetTickCount(); @@ -589,30 +625,35 @@ void emu_Loop(void) continue; } updateKeys(); - SkipFrame(tval_diff < lim_time+target_frametime*2); frames_done++; + SkipFrame(); frames_done++; continue; } } updateKeys(); - if (giz_screen == NULL && (currentConfig.EmuOpt&0x80)) - giz_screen = Framework2D_LockBuffer(); - if (!(PicoOpt&0x10)) - PicoScan((unsigned) -1, NULL); + if (currentConfig.EmuOpt&0x80) + /* be sure correct framebuffer is locked */ + giz_screen = fb_lock((currentConfig.EmuOpt&0x8000) ? 0 : 1); PicoFrame(); if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(); + giz_screen = fb_lock((currentConfig.EmuOpt&0x8000) ? 0 : 1); blit(fpsbuff, notice); if (giz_screen != NULL) { - Framework2D_UnlockBuffer(); + fb_unlock(); giz_screen = NULL; } + if (currentConfig.EmuOpt&0x2000) + Framework2D_WaitVSync(); + + if (currentConfig.EmuOpt&0x8000) + fb_flip(); + // check time tval = GetTickCount(); tval_diff = (int)(tval - tval_thissec) << 8; @@ -633,20 +674,18 @@ void emu_Loop(void) } - if (PicoMCD & 1) PicoCDBufferFree(); + if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); + + if (PsndOut != NULL) { + PsndOut = snd_cbuff = NULL; + FrameworkAudio_Close(); + } // save SRAM if ((currentConfig.EmuOpt & 1) && SRam.changed) { - emu_state_cb("Writing SRAM/BRAM.."); - emu_SaveLoadGame(0, 1); + emu_stateCb("Writing SRAM/BRAM.."); + emu_save_load_game(0, 1); SRam.changed = 0; } } - -void emu_ResetGame(void) -{ - PicoReset(0); - reset_timing = 1; -} -