X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=97547242b7f4afc6f50175b0ff1f2c58e143cdbb;hb=1850d43f8f90b126e8d8a0db5c77536521fd7bf5;hp=e4fdab2c7729d24ae9973c2a2e8bc4325040e5d5;hpb=da42200b24749eee63cccf49d87781b861146e9f;p=picodrive.git diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c index e4fdab2..9754724 100644 --- a/platform/gizmondo/emu.c +++ b/platform/gizmondo/emu.c @@ -31,7 +31,6 @@ int engineState; unsigned char *PicoDraw2FB = gfx_buffer; // temporary buffer for alt renderer ( (8+320)*(8+240+8) ) int reset_timing = 0; -static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos static DWORD noticeMsgTime = 0; static short *snd_cbuff = NULL; static int snd_cbuf_samples = 0, snd_all_samples = 0; @@ -52,8 +51,8 @@ void emu_getMainDir(char *dst, int len) static void emu_msg_cb(const char *msg) { - if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(); + if (giz_screen != NULL) Framework2D_UnlockBuffer(); + giz_screen = Framework2D_LockBuffer(1); memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4); emu_textOut16(4, 232, msg); @@ -61,12 +60,15 @@ static void emu_msg_cb(const char *msg) /* assumption: emu_msg_cb gets called only when something slow is about to happen */ reset_timing = 1; + + Framework2D_UnlockBuffer(); + giz_screen = Framework2D_LockBuffer((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) Framework2D_UnlockBuffer(); + giz_screen = Framework2D_LockBuffer(1); clearArea(0); blit("", str); @@ -101,24 +103,13 @@ void emu_Init(void) void emu_Deinit(void) { // save SRAM - if((currentConfig.EmuOpt & 1) && SRam.changed) { + 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); - } - } + if (!(currentConfig.EmuOpt & 0x20)) + config_writelrom(PicoConfigFile); PicoExit(); } @@ -152,22 +143,22 @@ void emu_setDefaultConfig(void) } -static int EmuScan16(unsigned int num, void *sdata) +static int EmuScanBegin16(unsigned int num) { if (!(Pico.video.reg[1]&8)) num += 8; - DrawLineDest = (unsigned short *) giz_screen + 321*(num+1); + DrawLineDest = (unsigned short *) giz_screen + 321 * num; - if ((currentConfig.EmuOpt&0x4000) && (num&1) == (Pico.m.frame_count&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); + HighCol = gfx_buffer + 328 * num; return 0; } @@ -224,7 +215,7 @@ static void blit(const char *fps, const char *notice) } if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000; if (currentConfig.EmuOpt&0x4000) - lines_flags|=(Pico.m.frame_count&1)?0x20000:0x40000; + 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)) @@ -252,7 +243,7 @@ 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|=0x10000; if (currentConfig.EmuOpt&0x4000) - lines_flags|=(Pico.m.frame_count&1)?0x20000:0x40000; + lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000; vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags); } @@ -262,7 +253,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(); } @@ -270,22 +261,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 = Framework2D_LockBuffer(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) { + Framework2D_UnlockBuffer(); + giz_screen = Framework2D_LockBuffer(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 = Framework2D_LockBuffer(1); if (PicoOpt&0x10) { } else if (currentConfig.EmuOpt&0x80) { PicoDrawSetColorFormat(1); - PicoScan = EmuScan16; + PicoScanBegin = EmuScanBegin16; } else { PicoDrawSetColorFormat(-1); - PicoScan = EmuScan8; + PicoScanBegin = EmuScanBegin8; } if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) { // setup pal for 8-bit modes @@ -297,6 +295,11 @@ static void vidResetMode(void) Pico.m.dirtyPal = 1; memset32(giz_screen, 0, 321*240*2/4); + if (currentConfig.EmuOpt&0x8000) { + Framework2D_UnlockBuffer(); + giz_screen = Framework2D_LockBuffer(0); + memset32(giz_screen, 0, 321*240*2/4); + } Framework2D_UnlockBuffer(); giz_screen = NULL; } @@ -339,21 +342,21 @@ static void SkipFrame(void) PicoSkipFrame=0; } -void emu_forcedFrame(void) +/* forced frame to front buffer */ +void emu_forcedFrame(int opts) { int po_old = PicoOpt; int eo_old = currentConfig.EmuOpt; - PicoOpt &= ~0x0010; - PicoOpt |= 0x4080; // soft_scale | acc_sprites + PicoOpt &= ~0x10; + PicoOpt |= opts|POPT_ACC_SPRITES; currentConfig.EmuOpt |= 0x80; if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(); + giz_screen = Framework2D_LockBuffer(1); PicoDrawSetColorFormat(1); - PicoScan = EmuScan16; - PicoScan((unsigned) -1, NULL); + PicoScanBegin = EmuScanBegin16; Pico.m.dirtyPal = 1; PicoFrameDrawOnly(); @@ -374,7 +377,7 @@ static void RunEvents(unsigned int which) if (PsndOut != NULL) FrameworkAudio_SetPause(1); if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(); + giz_screen = Framework2D_LockBuffer(1); if ( emu_checkSaveFile(state_slot) && (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save @@ -392,7 +395,7 @@ static void RunEvents(unsigned int which) if (do_it) { osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME"); - PicoStateProgressCB = emu_state_cb; + PicoStateProgressCB = emu_stateCb; emu_SaveLoadGame((which & 0x1000) >> 12, 0); PicoStateProgressCB = NULL; Sleep(0); @@ -452,20 +455,21 @@ static void updateKeys(void) int pl, acts = currentConfig.KeyBinds[i]; if (!acts) continue; pl = (acts >> 16) & 1; - if (combo_keys & (1 << i)) + if (kb_combo_keys & (1 << i)) { - int u = i+1, acts_c = acts & combo_acts; + int u = i+1, acts_c = acts & kb_combo_acts; // let's try to find the other one - if (acts_c) + if (acts_c) { for (; u < 32; u++) - if ( (currentConfig.KeyBinds[u] & acts_c) && (keys & (1 << u)) ) { - allActions[pl] |= acts_c; + if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) { + allActions[pl] |= acts_c & currentConfig.KeyBinds[u]; 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; + allActions[pl] |= acts & ~kb_combo_acts; } else { allActions[pl] |= acts; } @@ -487,7 +491,7 @@ static void updateKeys(void) if (vol > 0) vol--; } FrameworkAudio_SetVolume(vol, vol); - sprintf(noticeMsg, "VOL: %02i", vol); + sprintf(noticeMsg, "VOL: %02i ", vol); noticeMsgTime = GetTickCount(); currentConfig.volume = vol; } @@ -499,34 +503,6 @@ static void updateKeys(void) prevEvents = (allActions[0] | allActions[1]) >> 16; } -static void find_combos(void) -{ - int act, u; - - // find out which keys and actions are combos - combo_keys = combo_acts = 0; - for (act = 0; act < 32; act++) - { - int keyc = 0; - if (act == 16 || act == 17) continue; // player2 flag - for (u = 0; u < 32; u++) - { - if (currentConfig.KeyBinds[u] & (1 << act)) keyc++; - } - if (keyc > 1) - { - // loop again and mark those keys and actions as combo - for (u = 0; u < 32; u++) - { - if (currentConfig.KeyBinds[u] & (1 << act)) { - combo_keys |= 1 << u; - combo_acts |= 1 << act; - } - } - } - } -} - static void simpleWait(DWORD until) { @@ -561,7 +537,7 @@ void emu_Loop(void) else PicoOpt&=~0x4000; Pico.m.dirtyPal = 1; oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc; - find_combos(); + emu_findKeyBindCombos(); // pal/ntsc might have changed, reset related stuff target_fps = Pico.m.pal ? 50 : 60; @@ -569,7 +545,7 @@ void emu_Loop(void) reset_timing = 1; // prepare CD buffer - if (PicoMCD & 1) PicoCDBufferInit(); + if (PicoAHW & PAHW_MCD) PicoCDBufferInit(); // prepare sound stuff PsndOut = NULL; @@ -577,7 +553,7 @@ void emu_Loop(void) { 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; @@ -735,18 +711,14 @@ void emu_Loop(void) 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 = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1); PicoFrame(); - if (currentConfig.EmuOpt&0x2000) - Framework2D_WaitVSync(); - if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(); + giz_screen = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1); blit(fpsbuff, notice); @@ -755,6 +727,12 @@ void emu_Loop(void) giz_screen = NULL; } + if (currentConfig.EmuOpt&0x2000) + Framework2D_WaitVSync(); + + if (currentConfig.EmuOpt&0x8000) + Framework2D_Flip(); + // check time tval = GetTickCount(); tval_diff = (int)(tval - tval_thissec) << 8; @@ -775,7 +753,7 @@ void emu_Loop(void) } - if (PicoMCD & 1) PicoCDBufferFree(); + if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); if (PsndOut != NULL) { PsndOut = snd_cbuff = NULL; @@ -784,7 +762,7 @@ void emu_Loop(void) // save SRAM if ((currentConfig.EmuOpt & 1) && SRam.changed) { - emu_state_cb("Writing SRAM/BRAM.."); + emu_stateCb("Writing SRAM/BRAM.."); emu_SaveLoadGame(0, 1); SRam.changed = 0; } @@ -793,7 +771,7 @@ void emu_Loop(void) void emu_ResetGame(void) { - PicoReset(0); + PicoReset(); reset_timing = 1; }