X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=96a49cf5554debf29021473118fdfc8f6a889a45;hb=93f9619ed819dee07948416c98ca2f1c70a22666;hp=440a8de33e53b5e91846958c954cf8f693b4beea;hpb=c77ca79e899d9cff96f90a2c5b6a866cf02ed47e;p=picodrive.git diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c index 440a8de..96a49cf 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,14 +26,7 @@ // 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 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; @@ -40,125 +34,67 @@ 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) Framework2D_UnlockBuffer(); - giz_screen = Framework2D_LockBuffer(1); + 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; - Framework2D_UnlockBuffer(); - giz_screen = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1); + fb_unlock(); + giz_screen = fb_lock((currentConfig.EmuOpt&0x8000) ? 0 : 1); } void emu_stateCb(const char *str) { - if (giz_screen != NULL) Framework2D_UnlockBuffer(); - giz_screen = Framework2D_LockBuffer(1); + if (giz_screen != NULL) fb_unlock(); + giz_screen = fb_lock(1); clearArea(0); blit("", str); - Framework2D_UnlockBuffer(); + fb_unlock(); giz_screen = NULL; Sleep(0); /* yield the CPU, the system may need it */ } -static void emu_msg_tray_open(void) -{ - strcpy(noticeMsg, "CD tray opened"); - noticeMsgTime = GetTickCount(); -} - - -void emu_Init(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; -} - -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) +void pemu_prep_defconfig(void) { - memset(¤tConfig, 0, sizeof(currentConfig)); - currentConfig.lastRomFile[0] = 0; - currentConfig.EmuOpt = 0x1f | 0x680; // | confirm_save, cd_leds, 16bit rend - currentConfig.PicoOpt = 0x07 | 0xc00; // | cd_pcm, cd_cdda - currentConfig.PsndRate = 22050; - currentConfig.PicoRegion = 0; // auto - currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP - currentConfig.Frameskip = -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 = 0; - currentConfig.scaling = 0; + 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; } -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); + Pico.est.DrawLineDest = (unsigned short *) giz_screen + 321 * num; if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1)) return 1; // skip next line @@ -166,11 +102,10 @@ static int EmuScan16(unsigned int num, void *sdata) 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; } @@ -184,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; @@ -217,7 +145,7 @@ static void blit(const char *fps, const char *notice) { int emu_opt = currentConfig.EmuOpt; - if (PicoOpt&0x10) + if (PicoIn.opt&0x10) { int lines_flags = 224; // 8bit fast renderer @@ -225,10 +153,13 @@ static void blit(const char *fps, const char *notice) Pico.m.dirtyPal = 0; vidConvCpyRGB565(localPal, Pico.cram, 0x40); } + // a hack for VR + if (PicoIn.AHW & PAHW_SVP) + memset32((int *)(Pico.est.Draw2FB+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); + vidCpy8to16((unsigned short *)giz_screen+321*8, Pico.est.Draw2FB+328*8, localPal, lines_flags); } else if (!(emu_opt&0x80)) { @@ -240,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 @@ -256,7 +187,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|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000; - vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags); + vidCpy8to16((unsigned short *)giz_screen+321*8, Pico.est.Draw2FB+328*8, localPal, lines_flags); } if (notice || (emu_opt & 2)) { @@ -265,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) && (PicoIn.AHW & PAHW_MCD)) cd_leds(); } @@ -273,13 +204,13 @@ static void blit(const char *fps, const char *notice) static void clearArea(int full) { if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(1); + 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) { - Framework2D_UnlockBuffer(); - giz_screen = Framework2D_LockBuffer(0); + 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); } @@ -287,17 +218,17 @@ static void clearArea(int full) static void vidResetMode(void) { - giz_screen = Framework2D_LockBuffer(1); + giz_screen = fb_lock(1); - if (PicoOpt&0x10) { + if (PicoIn.opt&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)) { + if ((PicoIn.opt&0x10) || !(currentConfig.EmuOpt&0x80)) { // setup pal for 8-bit modes localPal[0xc0] = 0x0600; localPal[0xd0] = 0xc000; @@ -308,11 +239,11 @@ static void vidResetMode(void) memset32(giz_screen, 0, 321*240*2/4); if (currentConfig.EmuOpt&0x8000) { - Framework2D_UnlockBuffer(); - giz_screen = Framework2D_LockBuffer(0); + fb_unlock(); + giz_screen = fb_lock(0); memset32(giz_screen, 0, 321*240*2/4); } - Framework2D_UnlockBuffer(); + fb_unlock(); giz_screen = NULL; } @@ -334,10 +265,8 @@ static void stdbg(const char *fmt, ...) static void updateSound(int len) { - if (PicoOpt&8) len<<=1; - - snd_all_samples += len; - PsndOut += len; + snd_all_samples += len / 2; + PsndOut += len / 2; if (PsndOut - snd_cbuff >= snd_cbuf_samples) { //if (PsndOut - snd_cbuff != snd_cbuf_samples) @@ -349,34 +278,35 @@ static void updateSound(int len) static void SkipFrame(void) { - PicoSkipFrame=1; + PicoIn.skipFrame=1; PicoFrame(); - PicoSkipFrame=0; + PicoIn.skipFrame=0; } /* forced frame to front buffer */ -void emu_forcedFrame(void) +void pemu_forced_frame(int no_scale, int do_emu) { - int po_old = PicoOpt; + int po_old = PicoIn.opt; int eo_old = currentConfig.EmuOpt; - PicoOpt &= ~0x0010; - PicoOpt |= 0x4080; // soft_scale | acc_sprites + PicoIn.opt &= ~0x10; + PicoIn.opt |= POPT_ACC_SPRITES; + if (!no_scale) + PicoIn.opt |= POPT_EN_SOFTSCALE; currentConfig.EmuOpt |= 0x80; if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(1); + giz_screen = fb_lock(1); - PicoDrawSetColorFormat(1); - PicoScan = EmuScan16; - PicoScan((unsigned) -1, NULL); + PicoDrawSetOutFormat(PDF_RGB555, 0); + PicoDrawSetCallbacks(EmuScanBegin16, NULL); Pico.m.dirtyPal = 1; PicoFrameDrawOnly(); - Framework2D_UnlockBuffer(); + fb_unlock(); giz_screen = NULL; - PicoOpt = po_old; + PicoIn.opt = po_old; currentConfig.EmuOpt = eo_old; } @@ -390,17 +320,17 @@ static void RunEvents(unsigned int which) if (PsndOut != NULL) FrameworkAudio_SetPause(1); if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer(1); - if ( emu_checkSaveFile(state_slot) && + 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 & BTN_STOP) do_it = 0; - while( ((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) ) // wait for release + if (keys & PBTN_STOP) do_it = 0; + while( ((keys = Framework_PollGetButtons()) & (PBTN_PLAY|PBTN_STOP)) ) // wait for release Sleep(50); clearArea(0); } @@ -409,7 +339,7 @@ static void RunEvents(unsigned int which) { osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME"); PicoStateProgressCB = emu_stateCb; - emu_SaveLoadGame((which & 0x1000) >> 12, 0); + emu_save_load_game((which & 0x1000) >> 12, 0); PicoStateProgressCB = NULL; Sleep(0); } @@ -420,12 +350,12 @@ static void RunEvents(unsigned int which) } if (which & 0x0400) // switch renderer { - if (PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; } - else { PicoOpt|= 0x10; currentConfig.EmuOpt &= ~0x80; } + if (PicoIn.opt&0x10) { PicoIn.opt&=~0x10; currentConfig.EmuOpt |= 0x80; } + else { PicoIn.opt|= 0x10; currentConfig.EmuOpt &= ~0x80; } vidResetMode(); - if (PicoOpt&0x10) { + if (PicoIn.opt&0x10) { strcpy(noticeMsg, " 8bit fast renderer"); } else if (currentConfig.EmuOpt&0x80) { strcpy(noticeMsg, "16bit accurate renderer"); @@ -444,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(); } } @@ -455,41 +385,18 @@ 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; 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; - 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; - } - } - } + PicoIn.pad[0] = allActions[0] & 0xfff; + PicoIn.pad[1] = allActions[1] & 0xfff; - PicoPad[0] = (unsigned short) allActions[0]; - PicoPad[1] = (unsigned short) allActions[1]; + if (allActions[0] & 0x7000) emu_DoTurbo(&PicoIn.pad[0], allActions[0]); + if (allActions[1] & 0x7000) emu_DoTurbo(&PicoIn.pad[1], allActions[1]); events = (allActions[0] | allActions[1]) >> 16; @@ -515,35 +422,10 @@ static void updateKeys(void) prevEvents = (allActions[0] | allActions[1]) >> 16; } -static void find_combos(void) +void plat_debug_cat(char *str) { - 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) { DWORD tval; @@ -558,7 +440,7 @@ 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, pal_old = 0; char fpsbuff[24]; // fps count c string @@ -573,11 +455,10 @@ void emu_Loop(void) // make sure we are in correct mode vidResetMode(); - if (currentConfig.scaling) PicoOpt|=0x4000; - else PicoOpt&=~0x4000; + if (currentConfig.scaling) PicoIn.opt|=0x4000; + else PicoIn.opt&=~0x4000; Pico.m.dirtyPal = 1; oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc; - find_combos(); // pal/ntsc might have changed, reset related stuff target_fps = Pico.m.pal ? 50 : 60; @@ -585,17 +466,17 @@ void emu_Loop(void) reset_timing = 1; // prepare CD buffer - if (PicoMCD & 1) PicoCDBufferInit(); + if (PicoIn.AHW & PAHW_MCD) PicoCDBufferInit(); // prepare sound stuff 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); + if (PsndRate != PsndRate_old || (PicoIn.opt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) { + PsndRerate(Pico.m.frame_count ? 1 : 0); } - stereo=(PicoOpt&8)>>3; + stereo=(PicoIn.opt&8)>>3; snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps; snd_cbuf_samples = (PsndRate< 22050) co = 11; - if (PicoOpt&8) shift++; + if (PicoIn.opt&8) shift++; if (audio_skew < 0) { adj = -((-audio_skew) >> shift); if (audio_skew > -(6<>=1; @@ -753,20 +634,17 @@ void emu_Loop(void) if (currentConfig.EmuOpt&0x80) /* be sure correct framebuffer is locked */ - giz_screen = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1); - - if (!(PicoOpt&0x10)) - PicoScan((unsigned) -1, NULL); + giz_screen = fb_lock((currentConfig.EmuOpt&0x8000) ? 0 : 1); PicoFrame(); if (giz_screen == NULL) - giz_screen = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1); + giz_screen = fb_lock((currentConfig.EmuOpt&0x8000) ? 0 : 1); blit(fpsbuff, notice); if (giz_screen != NULL) { - Framework2D_UnlockBuffer(); + fb_unlock(); giz_screen = NULL; } @@ -774,7 +652,7 @@ void emu_Loop(void) Framework2D_WaitVSync(); if (currentConfig.EmuOpt&0x8000) - Framework2D_Flip(); + fb_flip(); // check time tval = GetTickCount(); @@ -796,7 +674,7 @@ void emu_Loop(void) } - if (PicoMCD & 1) PicoCDBufferFree(); + if (PicoIn.AHW & PAHW_MCD) PicoCDBufferFree(); if (PsndOut != NULL) { PsndOut = snd_cbuff = NULL; @@ -806,15 +684,8 @@ void emu_Loop(void) // save SRAM if ((currentConfig.EmuOpt & 1) && SRam.changed) { emu_stateCb("Writing SRAM/BRAM.."); - emu_SaveLoadGame(0, 1); + emu_save_load_game(0, 1); SRam.changed = 0; } } - -void emu_ResetGame(void) -{ - PicoReset(0); - reset_timing = 1; -} -