X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=8a5755642bda9e0ecf0a1ed5cd8728a5d27a0a31;hb=9839d126cc1cf782fad713f4fbc3611cba628ade;hp=f0732bb75c9aa3985d7435466b58304d1290e3c2;hpb=fd34fdd0f4f7e0883be4944738b55419a066dab4;p=picodrive.git diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c index f0732bb..8a57556 100644 --- a/platform/gizmondo/emu.c +++ b/platform/gizmondo/emu.c @@ -1,6 +1,10 @@ #include #include +#include // mkdir +#include + +#include "kgsdk/Framework.h" #include "kgsdk/Framework2D.h" #include "kgsdk/FrameworkAudio.h" #include "../common/emu.h" @@ -28,7 +32,6 @@ unsigned char *PicoDraw2FB = gfx_buffer; // temporary buffer for alt renderer ( int reset_timing = 0; static DWORD noticeMsgTime = 0; -static int osd_fps_x; static void blit(const char *fps, const char *notice); @@ -59,8 +62,14 @@ static void emu_msg_cb(const char *msg) static void emu_state_cb(const char *str) { + if (giz_screen == NULL) + giz_screen = Framework2D_LockBuffer(); + clearArea(0); blit("", str); + + Framework2D_UnlockBuffer(); + giz_screen = NULL; } static void emu_msg_tray_open(void) @@ -73,10 +82,10 @@ static void emu_msg_tray_open(void) void emu_Init(void) { // make dirs for saves, cfgs, etc. - CreateDirectory(L"mds", NULL); - CreateDirectory(L"srm", NULL); - CreateDirectory(L"brm", NULL); - CreateDirectory(L"cfg", NULL); + mkdir("mds", 0777); + mkdir("srm", 0777); + mkdir("brm", 0777); + mkdir("cfg", 0777); PicoInit(); PicoMessage = emu_msg_cb; @@ -113,7 +122,7 @@ void emu_setDefaultConfig(void) { memset(¤tConfig, 0, sizeof(currentConfig)); currentConfig.lastRomFile[0] = 0; - currentConfig.EmuOpt = 0x1f | 0x600; // | confirm_save, cd_leds + 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 @@ -127,8 +136,8 @@ void emu_setDefaultConfig(void) currentConfig.KeyBinds[ 5] = 1<<4; currentConfig.KeyBinds[ 6] = 1<<5; currentConfig.KeyBinds[ 7] = 1<<6; - currentConfig.KeyBinds[ 8] = 1<<7; - currentConfig.KeyBinds[ 4] = 1<<26; // switch rend + 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 @@ -150,54 +159,75 @@ static int EmuScan8(unsigned int num, void *sdata) { // draw like the fast renderer if (!(Pico.video.reg[1]&8)) num += 8; - HighCol = gfx_buffer + 328*8 + 328*(num+1); + HighCol = gfx_buffer + 328*(num+1); return 0; } static void osd_text(int x, int y, const char *text) { - int len = strlen(text) * 8; - int *p, i, h; - len = (len+1) >> 1; + int len = strlen(text) * 8 / 2; + int *p, h; for (h = 0; h < 8; h++) { p = (int *) ((unsigned short *) giz_screen+x+321*(y+h)); p = (int *) ((int)p & ~3); // align - for (i = len; i; i--, p++) *p = 0; + memset32(p, 0, len); } emu_textOut16(x, y, text); } +/* +void log1(void *p1, void *p2) +{ + lprintf("%p %p %p\n", p1, p2, DrawLineDest); +} +*/ -short localPal[0x100]; -static void (*vidCpy8to16)(void *dest, void *src, short *pal, int lines) = NULL; - -// FIXME: rm -static void vidCpy8to16_(void *dest, void *src, short *pal, int lines) +static void cd_leds(void) { - vidCpy8to16(dest, src, pal, lines); + static int old_reg = 0; + unsigned int col_g, col_r, *p; + + if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change + old_reg = Pico_mcd->s68k_regs[0]; + + p = (unsigned int *)((short *)giz_screen + 321*2+4+2); + col_g = (old_reg & 2) ? 0x06000600 : 0; + col_r = (old_reg & 1) ? 0xc000c000 : 0; + *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 321/2 - 12/2 + 1; + *p++ = col_g; p+=3; *p++ = col_r; p += 321/2 - 10/2; + *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; } + +static short localPal[0x100]; + static void blit(const char *fps, const char *notice) { int emu_opt = currentConfig.EmuOpt; - if (PicoOpt&0x10) { + if (PicoOpt&0x10) + { + int lines_flags = 224; // 8bit fast renderer if (Pico.m.dirtyPal) { Pico.m.dirtyPal = 0; vidConvCpyRGB565(localPal, Pico.cram, 0x40); } - vidCpy8to16_((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, 224); - } else if (!(emu_opt&0x80)) { + if (!(Pico.video.reg[12]&1)) lines_flags|=0x100; + vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags); + } + else if (!(emu_opt&0x80)) + { + int lines_flags; // 8bit accurate renderer if (Pico.m.dirtyPal) { Pico.m.dirtyPal = 0; vidConvCpyRGB565(localPal, Pico.cram, 0x40); - if(Pico.video.reg[0xC]&8) { // shadow/hilight mode + 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*4); + //vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); // TODO? + blockcpy(localPal+0xc0, localPal+0x40, 0x40*2); localPal[0xc0] = 0x0600; localPal[0xd0] = 0xc000; localPal[0xe0] = 0x0000; // reserved pixels for OSD @@ -209,35 +239,19 @@ static void blit(const char *fps, const char *notice) vidConvCpyRGB565(localPal+0x80, HighPal+0x40, 0x40); } */ } - // TODO... - //lprintf("vidCpy8to16 %p %p\n", (unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8); - vidCpy8to16_((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, 224); - //lprintf("after vidCpy8to16\n"); + lines_flags = (Pico.video.reg[1]&8) ? 240 : 224; + if (!(Pico.video.reg[12]&1)) lines_flags|=0x100; + vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags); } if (notice || (emu_opt & 2)) { int h = 232; if (notice) osd_text(4, h, notice); - if (emu_opt & 2) osd_text(osd_fps_x, h, fps); + if (emu_opt & 2) osd_text(OSD_FPS_X, h, fps); } -// if ((emu_opt & 0x400) && (PicoMCD & 1)) -// cd_leds(); - - //gp2x_video_wait_vsync(); - if (!(PicoOpt&0x10)) { - if (Pico.video.reg[1] & 8) { - if (currentConfig.EmuOpt&0x80) - DrawLineDest = (unsigned short *) giz_screen; - else - HighCol = gfx_buffer; - } else { - if (currentConfig.EmuOpt&0x80) - DrawLineDest = (unsigned short *) giz_screen + 320*8; - else - HighCol = gfx_buffer + 328*8; - } - } + if ((emu_opt & 0x400) && (PicoMCD & 1)) + cd_leds(); } // clears whole screen or just the notice area (in all buffers) @@ -246,21 +260,22 @@ static void clearArea(int full) if (giz_screen == NULL) giz_screen = Framework2D_LockBuffer(); if (full) memset32(giz_screen, 0, 320*240*2/4); - else memset32((int *)((char *)giz_screen + 320*232*2), 0, 320*8*2/4); + else memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4); } static void vidResetMode(void) { - void *screen; + giz_screen = Framework2D_LockBuffer(); + if (PicoOpt&0x10) { } else if (currentConfig.EmuOpt&0x80) { PicoDrawSetColorFormat(1); PicoScan = EmuScan16; } else { - PicoDrawSetColorFormat(0); + PicoDrawSetColorFormat(-1); PicoScan = EmuScan8; } - if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) { + if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) { // setup pal for 8-bit modes localPal[0xc0] = 0x0600; localPal[0xd0] = 0xc000; @@ -268,8 +283,8 @@ static void vidResetMode(void) localPal[0xf0] = 0xffff; } Pico.m.dirtyPal = 1; - screen = Framework2D_LockBuffer(); - memset32(screen, 0, 320*240*2/4); + + memset32(giz_screen, 0, 321*240*2/4); Framework2D_UnlockBuffer(); giz_screen = NULL; } @@ -287,12 +302,137 @@ void emu_forcedFrame(void) // TODO } +static void RunEvents(unsigned int which) +{ + 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 + 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)) ) + Sleep(50); + if (keys & BTN_STOP) do_it = 0; + clearArea(0); + } + if (do_it) { + osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME"); + PicoStateProgressCB = emu_state_cb; + emu_SaveLoadGame((which & 0x1000) >> 12, 0); + PicoStateProgressCB = NULL; + } + + 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; + + vidResetMode(); + + if (PicoOpt&0x10) { + strcpy(noticeMsg, " 8bit fast renderer"); + } else if (currentConfig.EmuOpt&0x80) { + strcpy(noticeMsg, "16bit accurate renderer"); + } else { + strcpy(noticeMsg, " 8bit accurate renderer"); + } + + noticeMsgTime = GetTickCount(); + } + if (which & 0x0300) { + if(which&0x0200) { + state_slot -= 1; + if(state_slot < 0) state_slot = 9; + } else { + state_slot += 1; + if(state_slot > 9) state_slot = 0; + } + sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE"); + noticeMsgTime = GetTickCount(); + } +} + static void updateKeys(void) { + unsigned int keys, allActions[2] = { 0, 0 }, events; + static unsigned int prevEvents = 0; + int i; + + keys = Framework_PollGetButtons(); + if (keys & BTN_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] = (unsigned short) allActions[0]; + PicoPad[1] = (unsigned short) allActions[1]; + + events = (allActions[0] | allActions[1]) >> 16; + + // volume is treated in special way and triggered every frame + if (events & 0x6000) { + 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); + noticeMsgTime = GetTickCount(); + currentConfig.volume = vol; + } + + events &= ~prevEvents; + if (events) RunEvents(events); + if (movie_data) emu_updateMovie(); + + prevEvents = (allActions[0] | allActions[1]) >> 16; } static void simpleWait(DWORD until) { + DWORD tval; + int diff; + + tval = GetTickCount(); + diff = (int)until - (int)tval; + if (diff >= 2) + Sleep(diff - 1); + + while ((tval = GetTickCount()) < until && until - tval < 512) // some simple overflow detection + spend_cycles(1024*2); } void emu_Loop(void) @@ -375,11 +515,6 @@ void emu_Loop(void) // check for mode changes modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8); if (modes != oldmodes) { - osd_fps_x = OSD_FPS_X; - //if (modes & 4) - vidCpy8to16 = vidCpy8to16_40; - //else - // vidCpy8to16 = vidCpy8to16_32col; oldmodes = modes; clearArea(1); } @@ -461,17 +596,22 @@ void emu_Loop(void) updateKeys(); - if (giz_screen == NULL) + if (giz_screen == NULL && (currentConfig.EmuOpt&0x80)) giz_screen = Framework2D_LockBuffer(); + if (!(PicoOpt&0x10)) + PicoScan((unsigned) -1, NULL); PicoFrame(); + + if (giz_screen == NULL) + giz_screen = Framework2D_LockBuffer(); + blit(fpsbuff, notice); if (giz_screen != NULL) { Framework2D_UnlockBuffer(); giz_screen = NULL; } - //lprintf("after unlock\n"); // check time tval = GetTickCount();