X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fgp2x.c;h=7706e41a2ec95c91fa382dfe11fbcef5f6b3ea98;hb=6e507f764b95d5f6088ea7f174586cfb0360a236;hp=c0396d9d7162ff9456a2e8bd7bbbb81b78e52ad5;hpb=b9f8cb3d6d8d0b5965fab83a27fc356a56442ddb;p=libpicofe.git

diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c
index c0396d9..7706e41 100644
--- a/gp2x/gp2x.c
+++ b/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,21 +194,19 @@ 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);
 }
 
 
 unsigned long gp2x_joystick_read(int allow_usb_joy)
 {
 	int i;
-  	unsigned long value=(gp2x_memregs[0x1198>>1] & 0x00FF);
+  	unsigned long value=(gp2x_memregs[0x1198>>1] & 0x00FF); // GPIO M
   	if(value==0xFD) value=0xFA;
   	if(value==0xF7) value=0xEB;
   	if(value==0xDF) value=0xAF;
   	if(value==0x7F) value=0xBE;
-  	value = ~((gp2x_memregs[0x1184>>1] & 0xFF00) | value | (gp2x_memregs[0x1186>>1] << 16));
+  	value = ~((gp2x_memregs[0x1184>>1] & 0xFF00) | value | (gp2x_memregs[0x1186>>1] << 16)); // C D
 
 	if (allow_usb_joy && num_of_joys > 0) {
 		// check the usb joy as well..
@@ -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);
 }
 
 
@@ -275,6 +284,31 @@ void Reset940(int yes, int bank)
 	gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (bank & 0x03);
 }
 
+static void proc_set(const char *path, const char *val)
+{
+	FILE *f;
+	char tmp[16];
+
+	f = fopen(path, "w");
+	if (f == NULL) {
+		printf("failed to open: %s\n", path);
+		return;
+	}
+
+	fprintf(f, "0\n");
+	fclose(f);
+
+	printf("\"%s\" is set to: ", path);
+	f = fopen(path, "r");
+	if (f == NULL) {
+		printf("(open failed)\n");
+		return;
+	}
+
+	fgets(tmp, sizeof(tmp), f);
+	printf("%s", tmp);
+	fclose(f);
+}
 
 
 /* common */
@@ -298,6 +332,8 @@ void gp2x_init(void)
 	}
 	gp2x_memregl = (unsigned long *) gp2x_memregs;
 
+	gp2x_memregs[0x2880>>1] &= ~0x383; // disable cursor, subpict, osd, video layers
+
   	gp2x_screens[0] = mmap(0, FRAMEBUFF_WHOLESIZE, PROT_WRITE, MAP_SHARED, memdev, FRAMEBUFF_ADDR0);
 	if(gp2x_screens[0] == MAP_FAILED)
 	{
@@ -328,6 +364,10 @@ void gp2x_init(void)
 	/* init usb joys -GnoStiC */
 	gp2x_usbjoy_init();
 
+	/* disable Linux read-ahead */
+	proc_set("/proc/sys/vm/max-readahead", "0\n");
+	proc_set("/proc/sys/vm/min-readahead", "0\n");
+
 	printf("exitting init()\n"); fflush(stdout);
 }
 
@@ -368,4 +408,13 @@ void gp2x_deinit(void)
 	}
 }
 
+/* lprintf */
+void lprintf(const char *fmt, ...)
+{
+	va_list vl;
+
+	va_start(vl, fmt);
+	vprintf(fmt, vl);
+	va_end(vl);
+}