X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=5f4a0e2315a90db55929338d7e71649cc8266a10;hb=7a938d57b1dd2ff4170d801a5a70191a6e003717;hp=a3e7f83ec6562e783b01e17f61674a83cbaab903;hpb=450dab6fe58cfb6320b3f17211919029be679fa2;p=libpicofe.git diff --git a/gp2x/emu.c b/gp2x/emu.c index a3e7f83..5f4a0e2 100644 --- a/gp2x/emu.c +++ b/gp2x/emu.c @@ -11,7 +11,6 @@ #include #include #include -#include #include @@ -54,6 +53,10 @@ char noticeMsg[64]; // notice msg to draw unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer int reset_timing = 0; +#define PICO_PEN_ADJUST_X 4 +#define PICO_PEN_ADJUST_Y 2 +static int pico_pen_x = 320/2, pico_pen_y = 240/2, pico_inp_mode = 0; + static void emu_msg_cb(const char *msg); static void emu_msg_tray_open(void); @@ -142,7 +145,7 @@ void emu_prepareDefaultConfig(void) defaultConfig.s_PsndRate = 44100; defaultConfig.s_PicoRegion = 0; // auto defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP - defaultConfig.s_PicoCDBuffers = 64; + defaultConfig.s_PicoCDBuffers = 0; defaultConfig.Frameskip = -1; // auto defaultConfig.CPUclock = 200; defaultConfig.volume = 50; @@ -198,7 +201,7 @@ void osd_text(int x, int y, const char *text) } } -static void cd_leds(void) +static void draw_cd_leds(void) { // static int old_reg; @@ -226,18 +229,37 @@ static void cd_leds(void) } } -static int EmuScan16(unsigned int num, void *sdata) +static void draw_pico_ptr(void) +{ + unsigned short *p = (unsigned short *)gp2x_screen; + + // only if pen enabled and for 16bit modes + if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return; + + if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER)) + p += 32; + + p += 320 * (pico_pen_y + PICO_PEN_ADJUST_Y); + p += pico_pen_x + PICO_PEN_ADJUST_X; + p[0] ^= 0xffff; + p[319] ^= 0xffff; + p[320] ^= 0xffff; + p[321] ^= 0xffff; + p[640] ^= 0xffff; +} + +static int EmuScanBegin16(unsigned int num) { if (!(Pico.video.reg[1]&8)) num += 8; - DrawLineDest = (unsigned short *) gp2x_screen + 320*(num+1); + DrawLineDest = (unsigned short *) gp2x_screen + 320 * num; return 0; } -static int EmuScan8(unsigned int num, void *sdata) +static int EmuScanBegin8(unsigned int num) { if (!(Pico.video.reg[1]&8)) num += 8; - DrawLineDest = (unsigned char *) gp2x_screen + 320*(num+1); + DrawLineDest = (unsigned char *) gp2x_screen + 320 * num; return 0; } @@ -267,27 +289,41 @@ static void blit(const char *fps, const char *notice) else if (!(emu_opt&0x80)) { // 8bit accurate renderer - if (Pico.m.dirtyPal) { + if (Pico.m.dirtyPal) + { + int pallen = 0x40; Pico.m.dirtyPal = 0; - if(Pico.video.reg[0xC]&8) { // shadow/hilight mode + if (Pico.video.reg[0xC]&8) // shadow/hilight mode + { vidConvCpyRGB32(localPal, Pico.cram, 0x40); vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40); vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); memcpy32(localPal+0xc0, localPal+0x40, 0x40); - localPal[0xc0] = 0x0000c000; - localPal[0xd0] = 0x00c00000; - localPal[0xe0] = 0x00000000; // reserved pixels for OSD - localPal[0xf0] = 0x00ffffff; - gp2x_video_setpalette(localPal, 0x100); - } else if (rendstatus & 0x20) { // mid-frame palette changes + pallen = 0x100; + } + else if (rendstatus & PDRAW_ACC_SPRITES) { + vidConvCpyRGB32(localPal, Pico.cram, 0x40); + memcpy32(localPal+0x40, localPal, 0x40); + memcpy32(localPal+0x80, localPal, 0x40); + memcpy32(localPal+0xc0, localPal, 0x40); + pallen = 0x100; + } + else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes vidConvCpyRGB32(localPal, Pico.cram, 0x40); vidConvCpyRGB32(localPal+0x40, HighPal, 0x40); vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40); - gp2x_video_setpalette(localPal, 0xc0); - } else { + pallen = 0xc0; + } + else { vidConvCpyRGB32(localPal, Pico.cram, 0x40); - gp2x_video_setpalette(localPal, 0x40); } + if (pallen > 0xc0) { + localPal[0xc0] = 0x0000c000; + localPal[0xd0] = 0x00c00000; + localPal[0xe0] = 0x00000000; // reserved pixels for OSD + localPal[0xf0] = 0x00ffffff; + } + gp2x_video_setpalette(localPal, pallen); } } @@ -298,8 +334,10 @@ 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)) - cd_leds(); + if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD)) + draw_cd_leds(); + if (PicoAHW & PAHW_PICO) + draw_pico_ptr(); //gp2x_video_wait_vsync(); gp2x_video_flip(); @@ -340,13 +378,11 @@ static void vidResetMode(void) } else if (currentConfig.EmuOpt&0x80) { gp2x_video_changemode(16); PicoDrawSetColorFormat(1); - PicoScan = EmuScan16; - PicoScan(0, 0); + PicoScanBegin = EmuScanBegin16; } else { gp2x_video_changemode(8); PicoDrawSetColorFormat(2); - PicoScan = EmuScan8; - PicoScan(0, 0); + PicoScanBegin = EmuScanBegin8; } if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) { // setup pal for 8-bit modes @@ -398,6 +434,50 @@ static void emu_msg_tray_open(void) gettimeofday(¬iceMsgTime, 0); } +static void RunEventsPico(unsigned int events, unsigned int gp2x_keys) +{ + if (events & (1 << 3)) { + pico_inp_mode++; + if (pico_inp_mode > 2) pico_inp_mode = 0; + switch (pico_inp_mode) { + case 2: strcpy(noticeMsg, "Input: Pen on Pad "); break; + case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break; + case 0: strcpy(noticeMsg, "Input: Joytick "); + PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000; + break; + } + gettimeofday(¬iceMsgTime, 0); + } + if (events & (1 << 4)) { + PicoPicohw.page--; + if (PicoPicohw.page < 0) PicoPicohw.page = 0; + sprintf(noticeMsg, "Page %i ", PicoPicohw.page); + gettimeofday(¬iceMsgTime, 0); + } + if (events & (1 << 5)) { + PicoPicohw.page++; + if (PicoPicohw.page > 6) PicoPicohw.page = 6; + sprintf(noticeMsg, "Page %i ", PicoPicohw.page); + gettimeofday(¬iceMsgTime, 0); + } + if (pico_inp_mode != 0) { + PicoPad[0] &= ~0x0f; // release UDLR + if (gp2x_keys & GP2X_UP) { pico_pen_y--; if (pico_pen_y < 0) pico_pen_y = 0; } + if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 239-PICO_PEN_ADJUST_Y) pico_pen_y = 239-PICO_PEN_ADJUST_Y; } + if (gp2x_keys & GP2X_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; } + if (gp2x_keys & GP2X_RIGHT) { + int lim = (Pico.video.reg[12]&1) ? 319 : 255; + pico_pen_x++; + if (pico_pen_x > lim-PICO_PEN_ADJUST_X) + pico_pen_x = lim-PICO_PEN_ADJUST_X; + } + PicoPicohw.pen_pos[0] = pico_pen_x; + if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4; + PicoPicohw.pen_pos[0] += 0x3c; + PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y); + } +} + static void update_volume(int has_changed, int is_up) { static int prev_frame = 0, wait_frames = 0; @@ -467,9 +547,11 @@ static void RunEvents(unsigned int which) (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save unsigned long keys; blit("", (which & 0x1000) ? "LOAD STATE? (Y=yes, X=no)" : "OVERWRITE SAVE? (Y=yes, X=no)"); - while( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) ) + while ( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) ) usleep(50*1024); if (keys & GP2X_X) do_it = 0; + while ( gp2x_joystick_read(1) & (GP2X_X|GP2X_Y) ) // wait for release + usleep(50*1024); clearArea(0); } if (do_it) { @@ -517,11 +599,10 @@ static void RunEvents(unsigned int which) } } - static void updateKeys(void) { - unsigned long keys, allActions[2] = { 0, 0 }, events; - static unsigned long prevEvents = 0; + unsigned int keys, keys2, allActions[2] = { 0, 0 }, events; + static unsigned int prevEvents = 0; int joy, i; keys = gp2x_joystick_read(0); @@ -532,10 +613,11 @@ static void updateKeys(void) } keys &= CONFIGURABLE_KEYS; + keys2 = keys; for (i = 0; i < 32; i++) { - if (keys & (1 << i)) + if (keys2 & (1 << i)) { int pl, acts = currentConfig.KeyBinds[i]; if (!acts) continue; @@ -546,9 +628,9 @@ static void updateKeys(void) // let's try to find the other one if (acts_c) { for (; u < 32; u++) - if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) { + if ( (keys2 & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) { allActions[pl] |= acts_c & currentConfig.KeyBinds[u]; - keys &= ~((1 << i) | (1 << u)); + keys2 &= ~((1 << i) | (1 << u)); break; } } @@ -566,9 +648,9 @@ static void updateKeys(void) { gp2x_usbjoy_update(); for (joy = 0; joy < num_of_joys; joy++) { - int keys = gp2x_usbjoy_check2(joy); + int btns = gp2x_usbjoy_check2(joy); for (i = 0; i < 32; i++) { - if (keys & (1 << i)) { + if (btns & (1 << i)) { int acts = currentConfig.JoyBinds[joy][i]; int pl = (acts >> 16) & 1; allActions[pl] |= acts; @@ -590,6 +672,10 @@ static void updateKeys(void) change_fast_forward(events & 0x40); events &= ~prevEvents; + + if (PicoAHW == PAHW_PICO) + RunEventsPico(events, keys); + if (events) RunEvents(events); if (movie_data) emu_updateMovie(); @@ -626,8 +712,7 @@ void emu_forcedFrame(void) //vidResetMode(); PicoDrawSetColorFormat(1); - PicoScan = EmuScan16; - PicoScan(0, 0); + PicoScanBegin = EmuScanBegin16; Pico.m.dirtyPal = 1; PicoFrameDrawOnly(); @@ -653,9 +738,6 @@ static void simpleWait(int thissec, int lim_time) gettimeofday(&tval, 0); if (thissec != tval.tv_sec) tval.tv_usec+=1000000; - if (tval.tv_usec < lim_time) - sched_yield(); - while (tval.tv_usec < lim_time) { spend_cycles(1024); @@ -786,7 +868,7 @@ void emu_Loop(void) } // prepare CD buffer - if (PicoMCD & 1) PicoCDBufferInit(); + if (PicoAHW & PAHW_MCD) PicoCDBufferInit(); // calc vsync offset to sync timing code with vsync if (currentConfig.EmuOpt&0x2000) { @@ -869,9 +951,10 @@ void emu_Loop(void) bench_fps += frames_shown; sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2); #else - if (currentConfig.EmuOpt & 2) + if (currentConfig.EmuOpt & 2) { sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done); - if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; } + if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; } + } #endif frames_shown = frames_done = 0; thissec = tval.tv_sec; @@ -963,7 +1046,7 @@ void emu_Loop(void) change_fast_forward(0); - if (PicoMCD & 1) PicoCDBufferFree(); + if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); // save SRAM if((currentConfig.EmuOpt & 1) && SRam.changed) { @@ -980,7 +1063,7 @@ void emu_Loop(void) void emu_ResetGame(void) { - PicoReset(0); + PicoReset(); reset_timing = 1; }