X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=77bd83e695fc1bf290347342edb54eb30be8b77c;hb=efcba75f8a730340df6c1b679a207723f98d1ee6;hp=19f3c6768a4b8d1383239f6ce88c83f7a51c9c39;hpb=c060a9ab9c428e1ed9c4159b56529a2a36031e44;p=picodrive.git diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c index 19f3c67..77bd83e 100644 --- a/platform/gp2x/emu.c +++ b/platform/gp2x/emu.c @@ -24,9 +24,9 @@ #include "../common/config.h" #include "cpuctrl.h" -#include -#include -#include +#include +#include +#include #include //#define PFRAMES @@ -49,7 +49,6 @@ static short __attribute__((aligned(4))) sndBuffer[2*44100/50]; static struct timeval noticeMsgTime = { 0, 0 }; // when started showing static int osd_fps_x; static int gp2x_old_gamma = 100; -char noticeMsg[64]; // notice msg to draw unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer int reset_timing = 0; @@ -66,7 +65,7 @@ void emu_noticeMsgUpdated(void) gettimeofday(¬iceMsgTime, 0); } -void emu_getMainDir(char *dst, int len) +int emu_getMainDir(char *dst, int len) { extern char **g_argv; int j; @@ -77,6 +76,8 @@ void emu_getMainDir(char *dst, int len) dst[len] = 0; for (j = strlen(dst); j > 0; j--) if (dst[j] == '/') { dst[j+1] = 0; break; } + + return j + 1; } void emu_Init(void) @@ -164,16 +165,7 @@ void emu_prepareDefaultConfig(void) defaultConfig.KeyBinds[22] = 1<<30; // vol down defaultConfig.gamma = 100; defaultConfig.scaling = 0; -} - -void emu_setDefaultConfig(void) -{ - memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig)); - PicoOpt = currentConfig.s_PicoOpt; - PsndRate = currentConfig.s_PsndRate; - PicoRegionOverride = currentConfig.s_PicoRegion; - PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder; - PicoCDBuffers = currentConfig.s_PicoCDBuffers; + defaultConfig.turbo_rate = 15; } void osd_text(int x, int y, const char *text) @@ -291,7 +283,7 @@ static void blit(const char *fps, const char *notice) // 8bit accurate renderer if (Pico.m.dirtyPal) { - int pallen = 0x40; + int pallen = 0xc0; Pico.m.dirtyPal = 0; if (Pico.video.reg[0xC]&8) // shadow/hilight mode { @@ -301,21 +293,14 @@ static void blit(const char *fps, const char *notice) memcpy32(localPal+0xc0, localPal+0x40, 0x40); 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); - pallen = 0xc0; } else { vidConvCpyRGB32(localPal, Pico.cram, 0x40); + memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess } if (pallen > 0xc0) { localPal[0xc0] = 0x0000c000; @@ -436,25 +421,54 @@ static void emu_msg_tray_open(void) static void RunEventsPico(unsigned int events, unsigned int gp2x_keys) { + int ret, px, py, lim_x; + static int pdown_frames = 0; + emu_RunEventsPico(events); - if (pico_inp_mode != 0) + if (pico_inp_mode == 0) return; + + // for F200 + ret = gp2x_touchpad_read(&px, &py); + if (ret >= 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; + if (ret > 35000) + { + if (pdown_frames++ > 5) + PicoPad[0] |= 0x20; + + pico_pen_x = px; + pico_pen_y = py; + if (!(Pico.video.reg[12]&1)) { + pico_pen_x -= 32; + if (pico_pen_x < 0) pico_pen_x = 0; + if (pico_pen_x > 248) pico_pen_x = 248; + } + if (pico_pen_y > 224) pico_pen_y = 224; } - 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); + else + pdown_frames = 0; + + //if (ret == 0) + // PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000; } + + PicoPad[0] &= ~0x0f; // release UDLR + if (gp2x_keys & GP2X_UP) pico_pen_y--; + if (gp2x_keys & GP2X_DOWN) pico_pen_y++; + if (gp2x_keys & GP2X_LEFT) pico_pen_x--; + if (gp2x_keys & GP2X_RIGHT) pico_pen_x++; + + lim_x = (Pico.video.reg[12]&1) ? 319 : 255; + if (pico_pen_y < 8) pico_pen_y = 8; + if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; + if (pico_pen_x < 0) pico_pen_x = 0; + if (pico_pen_x > lim_x-PICO_PEN_ADJUST_X) pico_pen_x = lim_x-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) @@ -613,8 +627,11 @@ static void updateKeys(void) } } - PicoPad[0] = (unsigned short) allActions[0]; - PicoPad[1] = (unsigned short) allActions[1]; + PicoPad[0] = allActions[0] & 0xfff; + PicoPad[1] = allActions[1] & 0xfff; + + if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]); + if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]); events = (allActions[0] | allActions[1]) >> 16; @@ -686,6 +703,11 @@ void emu_forcedFrame(int opts) currentConfig.EmuOpt = eo_old; } +void emu_platformDebugCat(char *str) +{ + // nothing +} + static void simpleWait(int thissec, int lim_time) { struct timeval tval;