X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fgp2x.c;h=7a5156c78f22f35be68b562977337d1e4b85802a;hb=eacee137eed2f00111e03544f6b1e43d20a7403b;hp=c0396d9d7162ff9456a2e8bd7bbbb81b78e52ad5;hpb=a9b3ffd3cce011d42652d22f15a4a13dff29b0d7;p=picodrive.git

diff --git a/platform/gp2x/gp2x.c b/platform/gp2x/gp2x.c
index c0396d9..7a5156c 100644
--- a/platform/gp2x/gp2x.c
+++ b/platform/gp2x/gp2x.c
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
@@ -34,7 +35,7 @@
 
 #include "gp2x.h"
 #include "usbjoy.h"
-#include "asmutils.h"
+#include "../common/arm_utils.h"
 
 volatile unsigned short *gp2x_memregs;
 //static
@@ -157,6 +158,15 @@ void gp2x_video_wait_vsync(void)
 }
 
 
+void gp2x_video_flush_cache(void)
+{
+	// since we are using the mmu hack, we must flush the cache first
+	// (the params are most likely wrong, but they seem to work somehow)
+	//flushcache(addr, addr + 320*240*2, 0);
+	flushcache(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);
+}
+
+
 void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
 {
 	char *dst;
@@ -184,9 +194,7 @@ void gp2x_memset_all_buffers(int offset, int byte, int len)
 
 void gp2x_pd_clone_buffer2(void)
 {
-	memcpy(gp2x_screen, gp2x_screens[2], 320*240);
-	memset(gp2x_screen, 0xe0, 320*8);
-	memset(gp2x_screen + 320*232, 0xe0, 320*8);
+	memcpy(gp2x_screen, gp2x_screens[2], 320*240*2);
 }
 
 
@@ -224,8 +232,8 @@ void gp2x_start_sound(int rate, int bits, int stereo)
 	if (sounddev == -1)
 		printf("open(\"/dev/dsp\") failed with %i\n", errno);
 
-	ioctl(sounddev, SNDCTL_DSP_SPEED,  &rate);
 	ioctl(sounddev, SNDCTL_DSP_SETFMT, &bits);
+	ioctl(sounddev, SNDCTL_DSP_SPEED,  &rate);
 	ioctl(sounddev, SNDCTL_DSP_STEREO, &stereo);
 	// calculate buffer size
 	buffers = 16;
@@ -234,11 +242,12 @@ void gp2x_start_sound(int rate, int bits, int stereo)
 	while ((bsize>>=1)) frag++;
 	frag |= buffers<<16; // 16 buffers
 	ioctl(sounddev, SNDCTL_DSP_SETFRAGMENT, &frag);
+	usleep(192*1024);
+
 	printf("gp2x_set_sound: %i/%ibit/%s, %i buffers of %i bytes\n",
 		rate, bits, stereo?"stereo":"mono", frag>>16, 1<<(frag&0xffff));
 
 	s_oldrate = rate; s_oldbits = bits; s_oldstereo = stereo;
-	usleep(100000);
 }
 
 
@@ -368,4 +377,13 @@ void gp2x_deinit(void)
 	}
 }
 
+/* lprintf */
+void lprintf(const char *fmt, ...)
+{
+	va_list vl;
+
+	va_start(vl, fmt);
+	vprintf(fmt, vl);
+	va_end(vl);
+}