X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=96a49cf5554debf29021473118fdfc8f6a889a45;hb=93f9619ed819dee07948416c98ca2f1c70a22666;hp=5469c56265afbc2e2a0d6bf9607f238e125ccd06;hpb=e5ab6fafac1ee3cbe105c8cc49413c99d6874802;p=picodrive.git diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c index 5469c56..96a49cf 100644 --- a/platform/gizmondo/emu.c +++ b/platform/gizmondo/emu.c @@ -26,13 +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 DWORD noticeMsgTime = 0; static short *snd_cbuff = NULL; static int snd_cbuf_samples = 0, snd_all_samples = 0; @@ -40,12 +34,7 @@ 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(); -} - -int emu_getMainDir(char *dst, int len) +int plat_get_root_dir(char *dst, int len) { if (len > 0) *dst = 0; @@ -58,7 +47,7 @@ static void emu_msg_cb(const char *msg) 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 */ @@ -82,52 +71,10 @@ void emu_stateCb(const char *str) 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)) - config_writelrom(PicoConfigFile); - - PicoExit(); -} - -void emu_prepareDefaultConfig(void) +void pemu_prep_defconfig(void) { - memset(&defaultConfig, 0, sizeof(defaultConfig)); - defaultConfig.EmuOpt = 0x1d | 0x680; // | confirm_save, cd_leds, 16bit rend - defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES; defaultConfig.s_PsndRate = 22050; - defaultConfig.s_PicoRegion = 0; // auto - defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP defaultConfig.s_PicoCDBuffers = 0; - defaultConfig.Frameskip = -1; // auto - defaultConfig.volume = 50; defaultConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU defaultConfig.KeyBinds[ 3] = 1<<1; defaultConfig.KeyBinds[ 0] = 1<<2; @@ -142,14 +89,12 @@ void emu_prepareDefaultConfig(void) defaultConfig.KeyBinds[12] = 1<<29; // vol up defaultConfig.KeyBinds[11] = 1<<30; // vol down defaultConfig.scaling = 0; - defaultConfig.turbo_rate = 15; } static int EmuScanBegin16(unsigned int num) { - if (!(Pico.video.reg[1]&8)) num += 8; - DrawLineDest = (unsigned short *) giz_screen + 321 * num; + 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 @@ -160,8 +105,7 @@ static int EmuScanBegin16(unsigned int num) static int EmuScanBegin8(unsigned int num) { // draw like the fast renderer - if (!(Pico.video.reg[1]&8)) num += 8; - HighCol = gfx_buffer + 328 * num; + Pico.est.HighCol = gfx_buffer + 328 * num; return 0; } @@ -175,15 +119,8 @@ 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); -} - -/* -void log1(void *p1, void *p2) -{ - lprintf("%p %p %p\n", p1, p2, DrawLineDest); + emu_text_out16(x, y, text); } -*/ static void cd_leds(void) { @@ -208,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 @@ -217,12 +154,12 @@ static void blit(const char *fps, const char *notice) vidConvCpyRGB565(localPal, Pico.cram, 0x40); } // a hack for VR - if (PicoRead16Hook == PicoSVPRead16) - memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328); + 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)) { @@ -250,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)) { @@ -259,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) && (PicoAHW & PAHW_MCD)) + if ((emu_opt & 0x400) && (PicoIn.AHW & PAHW_MCD)) cd_leds(); } @@ -283,15 +220,15 @@ static void vidResetMode(void) { giz_screen = fb_lock(1); - if (PicoOpt&0x10) { + if (PicoIn.opt&0x10) { } else if (currentConfig.EmuOpt&0x80) { - PicoDrawSetColorFormat(1); - PicoScanBegin = EmuScanBegin16; + PicoDrawSetOutFormat(PDF_RGB555, 0); + PicoDrawSetCallbacks(EmuScanBegin16, NULL); } else { - PicoDrawSetColorFormat(-1); - PicoScanBegin = EmuScanBegin8; + 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; @@ -328,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) @@ -343,33 +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(int opts) +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 &= ~0x10; - PicoOpt |= opts|POPT_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 = fb_lock(1); - PicoDrawSetColorFormat(1); - PicoScanBegin = EmuScanBegin16; + PicoDrawSetOutFormat(PDF_RGB555, 0); + PicoDrawSetCallbacks(EmuScanBegin16, NULL); Pico.m.dirtyPal = 1; PicoFrameDrawOnly(); fb_unlock(); giz_screen = NULL; - PicoOpt = po_old; + PicoIn.opt = po_old; currentConfig.EmuOpt = eo_old; } @@ -384,7 +321,7 @@ static void RunEvents(unsigned int which) FrameworkAudio_SetPause(1); if (giz_screen == NULL) giz_screen = fb_lock(1); - if ( emu_checkSaveFile(state_slot) && + if ( emu_check_save_file(state_slot) && (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save { @@ -402,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); } @@ -413,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"); @@ -437,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(); } } @@ -448,45 +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 & 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 (kb_combo_keys & (1 << i)) - { - int u = i+1, acts_c = acts & kb_combo_acts; - // let's try to find the other one - if (acts_c) { - for (; u < 32; u++) - 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 & ~kb_combo_acts; - } else { - allActions[pl] |= acts; - } - } - } - - PicoPad[0] = allActions[0] & 0xfff; - PicoPad[1] = allActions[1] & 0xfff; + PicoIn.pad[0] = allActions[0] & 0xfff; + PicoIn.pad[1] = allActions[1] & 0xfff; - if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]); - if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], 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; @@ -512,9 +422,8 @@ static void updateKeys(void) prevEvents = (allActions[0] | allActions[1]) >> 16; } -void emu_platformDebugCat(char *str) +void plat_debug_cat(char *str) { - // nothing } static void simpleWait(DWORD until) @@ -531,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 @@ -546,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; - emu_findKeyBindCombos(); // pal/ntsc might have changed, reset related stuff target_fps = Pico.m.pal ? 50 : 60; @@ -558,17 +466,17 @@ void emu_Loop(void) reset_timing = 1; // prepare CD buffer - if (PicoAHW & PAHW_MCD) 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) { + 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; @@ -766,7 +674,7 @@ void emu_Loop(void) } - if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); + if (PicoIn.AHW & PAHW_MCD) PicoCDBufferFree(); if (PsndOut != NULL) { PsndOut = snd_cbuff = NULL; @@ -776,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(); - reset_timing = 1; -} -