X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fgp2x.c;h=7a5156c78f22f35be68b562977337d1e4b85802a;hb=0ae25549b5066ea8b42216ec875f5c3c5d5bd8d6;hp=3b5d125e2368cf9b5010302940e2ced102779d93;hpb=13059a606f2ffeb411101101ddcac47be73ad625;p=libpicofe.git

diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c
index 3b5d125..7a5156c 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
@@ -231,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;
@@ -241,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);
 }
 
 
@@ -375,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);
+}