X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=c225f18e7e2dcf98fb485e0bab91c7ede0797cda;hb=ac087c0e3af45d03045e2ef39f64267e3b41278b;hp=570b0fcf08f1ad2165ef1082c9f391e8ece3eae8;hpb=3f2aaff20c940e90e970c008e56f5253d494a92c;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 570b0fc..c225f18 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -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(&noticeMsgTime, 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(&currentConfig, &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)
@@ -436,33 +428,19 @@ static void emu_msg_tray_open(void)
 
 static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
 {
-	int ret, px, py;
+	int ret, px, py, lim_x;
 	static int pdown_frames = 0;
 
 	emu_RunEventsPico(events);
 
-	if (pico_inp_mode != 0)
-	{
-		PicoPad[0] &= ~0x0f; // release UDLR
-		if (gp2x_keys & GP2X_UP)   { pico_pen_y--; if (pico_pen_y < 8) pico_pen_y = 8; }
-		if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-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);
-	}
+	if (pico_inp_mode == 0) return;
 
 	// for F200
 	ret = gp2x_touchpad_read(&px, &py);
-	if (ret >= 0) {
-		if (ret > 5000) {
+	if (ret >= 0)
+	{
+		if (ret > 35000)
+		{
 			if (pdown_frames++ > 5)
 				PicoPad[0] |= 0x20;
 
@@ -476,11 +454,28 @@ static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
 			if (pico_pen_y > 224) pico_pen_y = 224;
 		}
 		else
-			pdown_frames= 0;
+			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)
@@ -639,8 +634,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;
 
@@ -712,6 +710,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;