occasional mp3 click noises fixed

[libpicofe.git] / gp2x / gp2x.c

diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c
index 4995f08..7706e41 100644 (file)
--- a/gp2x/gp2x.c
+++ b/gp2x/gp2x.c
@@ -22,6 +22,7 @@
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
+#include <stdarg.h>\r
 #include <string.h>\r
 #include <unistd.h>\r
 #include <sys/mman.h>\r
@@ -200,12 +201,12 @@ void gp2x_pd_clone_buffer2(void)
 unsigned long gp2x_joystick_read(int allow_usb_joy)\r
 {\r
        int i;\r
-       unsigned long value=(gp2x_memregs[0x1198>>1] & 0x00FF);\r
+       unsigned long value=(gp2x_memregs[0x1198>>1] & 0x00FF); // GPIO M\r
        if(value==0xFD) value=0xFA;\r
        if(value==0xF7) value=0xEB;\r
        if(value==0xDF) value=0xAF;\r
        if(value==0x7F) value=0xBE;\r
-       value = ~((gp2x_memregs[0x1184>>1] & 0xFF00) | value | (gp2x_memregs[0x1186>>1] << 16));\r
+       value = ~((gp2x_memregs[0x1184>>1] & 0xFF00) | value | (gp2x_memregs[0x1186>>1] << 16)); // C D\r
 \r
        if (allow_usb_joy && num_of_joys > 0) {\r
                // check the usb joy as well..\r
@@ -231,8 +232,8 @@ void gp2x_start_sound(int rate, int bits, int stereo)
        if (sounddev == -1)\r
                printf("open(\"/dev/dsp\") failed with %i\n", errno);\r
 \r
-       ioctl(sounddev, SNDCTL_DSP_SPEED,  &rate);\r
        ioctl(sounddev, SNDCTL_DSP_SETFMT, &bits);\r
+       ioctl(sounddev, SNDCTL_DSP_SPEED,  &rate);\r
        ioctl(sounddev, SNDCTL_DSP_STEREO, &stereo);\r
        // calculate buffer size\r
        buffers = 16;\r
@@ -241,11 +242,12 @@ void gp2x_start_sound(int rate, int bits, int stereo)
        while ((bsize>>=1)) frag++;\r
        frag |= buffers<<16; // 16 buffers\r
        ioctl(sounddev, SNDCTL_DSP_SETFRAGMENT, &frag);\r
+       usleep(192*1024);\r
+\r
        printf("gp2x_set_sound: %i/%ibit/%s, %i buffers of %i bytes\n",\r
                rate, bits, stereo?"stereo":"mono", frag>>16, 1<<(frag&0xffff));\r
 \r
        s_oldrate = rate; s_oldbits = bits; s_oldstereo = stereo;\r
-       usleep(100000);\r
 }\r
 \r
 \r
@@ -282,6 +284,31 @@ void Reset940(int yes, int bank)
        gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (bank & 0x03);\r
 }\r
 \r
+static void proc_set(const char *path, const char *val)\r
+{\r
+       FILE *f;\r
+       char tmp[16];\r
+\r
+       f = fopen(path, "w");\r
+       if (f == NULL) {\r
+               printf("failed to open: %s\n", path);\r
+               return;\r
+       }\r
+\r
+       fprintf(f, "0\n");\r
+       fclose(f);\r
+\r
+       printf("\"%s\" is set to: ", path);\r
+       f = fopen(path, "r");\r
+       if (f == NULL) {\r
+               printf("(open failed)\n");\r
+               return;\r
+       }\r
+\r
+       fgets(tmp, sizeof(tmp), f);\r
+       printf("%s", tmp);\r
+       fclose(f);\r
+}\r
 \r
 \r
 /* common */\r
@@ -305,6 +332,8 @@ void gp2x_init(void)
        }\r
        gp2x_memregl = (unsigned long *) gp2x_memregs;\r
 \r
+       gp2x_memregs[0x2880>>1] &= ~0x383; // disable cursor, subpict, osd, video layers\r
+\r
        gp2x_screens[0] = mmap(0, FRAMEBUFF_WHOLESIZE, PROT_WRITE, MAP_SHARED, memdev, FRAMEBUFF_ADDR0);\r
        if(gp2x_screens[0] == MAP_FAILED)\r
        {\r
@@ -335,6 +364,10 @@ void gp2x_init(void)
        /* init usb joys -GnoStiC */\r
        gp2x_usbjoy_init();\r
 \r
+       /* disable Linux read-ahead */\r
+       proc_set("/proc/sys/vm/max-readahead", "0\n");\r
+       proc_set("/proc/sys/vm/min-readahead", "0\n");\r
+\r
        printf("exitting init()\n"); fflush(stdout);\r
 }\r
 \r
@@ -375,4 +408,13 @@ void gp2x_deinit(void)
        }\r
 }\r
 \r
+/* lprintf */\r
+void lprintf(const char *fmt, ...)\r
+{\r
+       va_list vl;\r
+\r
+       va_start(vl, fmt);\r
+       vprintf(fmt, vl);\r
+       va_end(vl);\r
+}\r
 \r