X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fgp2x.c;h=6db1d41f95f07baf6d2329029ee943b6571f05d6;hb=2d2247c26080ed9009b3d8c650cfc647fd1fb162;hp=0d0017b401309f5bf11495835826e22042e7d39b;hpb=e11c55481f1703298b3e7e213f73cec8a136f974;p=picodrive.git diff --git a/platform/gp2x/gp2x.c b/platform/gp2x/gp2x.c index 0d0017b..6db1d41 100644 --- a/platform/gp2x/gp2x.c +++ b/platform/gp2x/gp2x.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -34,6 +35,7 @@ #include "gp2x.h" #include "usbjoy.h" +#include "../common/arm_utils.h" volatile unsigned short *gp2x_memregs; //static @@ -46,26 +48,27 @@ static int sounddev = 0, mixerdev = 0; void *gp2x_screen; -#define FRAMEBUFF_ADDR0 0x4000000-640*480 -#define FRAMEBUFF_ADDR1 0x4000000-640*480*2 -#define FRAMEBUFF_ADDR2 0x4000000-640*480*3 -#define FRAMEBUFF_ADDR3 0x4000000-640*480*4 +#define FRAMEBUFF_WHOLESIZE (0x30000*4) // 320*240*2 + some more +#define FRAMEBUFF_ADDR0 (0x4000000-FRAMEBUFF_WHOLESIZE) +#define FRAMEBUFF_ADDR1 (FRAMEBUFF_ADDR0+0x30000) +#define FRAMEBUFF_ADDR2 (FRAMEBUFF_ADDR1+0x30000) +#define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000) -static const int gp2x_screenaddrs[] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 }; +static const int gp2x_screenaddrs[4] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 }; +static int gp2x_screenaddrs_use[4]; static unsigned short gp2x_screenaddr_old[4]; /* video stuff */ void gp2x_video_flip(void) { - unsigned int address = gp2x_screenaddrs[screensel&3]; - unsigned short msb16 = (unsigned short)(address >> 16); - unsigned short lsb16 = (unsigned short)(address); + unsigned short lsw = (unsigned short) gp2x_screenaddrs_use[screensel&3]; + unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&3] >> 16); - gp2x_memregs[0x290E>>1] = lsb16; - gp2x_memregs[0x2910>>1] = msb16; - gp2x_memregs[0x2912>>1] = lsb16; - gp2x_memregs[0x2914>>1] = msb16; + gp2x_memregs[0x2910>>1] = msw; + gp2x_memregs[0x2914>>1] = msw; + gp2x_memregs[0x290E>>1] = lsw; + gp2x_memregs[0x2912>>1] = lsw; // jump to other buffer: gp2x_screen = gp2x_screens[++screensel&3]; @@ -74,14 +77,12 @@ void gp2x_video_flip(void) /* doulblebuffered flip */ void gp2x_video_flip2(void) { - unsigned int address = gp2x_screenaddrs[screensel&1]; - unsigned short msb16 = (unsigned short)(address >> 16); - unsigned short lsb16 = (unsigned short)(address); + unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16); - gp2x_memregs[0x290E>>1] = lsb16; - gp2x_memregs[0x2910>>1] = msb16; - gp2x_memregs[0x2912>>1] = lsb16; - gp2x_memregs[0x2914>>1] = msb16; + gp2x_memregs[0x2910>>1] = msw; + gp2x_memregs[0x2914>>1] = msw; + gp2x_memregs[0x290E>>1] = 0; + gp2x_memregs[0x2912>>1] = 0; // jump to other buffer: gp2x_screen = gp2x_screens[++screensel&1]; @@ -99,7 +100,7 @@ void gp2x_video_changemode(int bpp) { gp2x_video_changemode2(bpp); - gp2x_memset_all_buffers(0, 0, 640*480); + gp2x_memset_all_buffers(0, 0, 320*240*2); gp2x_video_flip(); } @@ -116,10 +117,17 @@ void gp2x_video_setpalette(int *pal, int len) // TV Compatible function // -void gp2x_video_RGB_setscaling(int W, int H) +void gp2x_video_RGB_setscaling(int ln_offs, int W, int H) { float escalaw, escalah; int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3; + unsigned short scalw; + + // set offset + gp2x_screenaddrs_use[0] = gp2x_screenaddrs[0] + ln_offs * 320 * bpp; + gp2x_screenaddrs_use[1] = gp2x_screenaddrs[1] + ln_offs * 320 * bpp; + gp2x_screenaddrs_use[2] = gp2x_screenaddrs[2] + ln_offs * 320 * bpp; + gp2x_screenaddrs_use[3] = gp2x_screenaddrs[3] + ln_offs * 320 * bpp; escalaw = 1024.0; // RGB Horiz LCD escalah = 320.0; // RGB Vert LCD @@ -134,26 +142,44 @@ void gp2x_video_RGB_setscaling(int W, int H) } // scale horizontal - gp2x_memregs[0x2906>>1]=(unsigned short)((float)escalaw *(W/320.0)); + scalw = (unsigned short)((float)escalaw *(W/320.0)); + /* if there is no horizontal scaling, vertical doesn't work. Here is a nasty wrokaround... */ + if (H != 240 && W == 320) scalw--; + gp2x_memregs[0x2906>>1]=scalw; // scale vertical gp2x_memregl[0x2908>>2]=(unsigned long)((float)escalah *bpp *(H/240.0)); } -/* LCD updates @ 80Hz? */ void gp2x_video_wait_vsync(void) { - gp2x_memregs[0x2846>>1] = 0x20|2; //(gp2x_memregs[0x2846>>1] | 0x20) & ~2; - while(!(gp2x_memregs[0x2846>>1] & 2));// usleep(1); + unsigned short v = gp2x_memregs[0x1182>>1]; + while (!((v ^ gp2x_memregs[0x1182>>1]) & 0x10)) spend_cycles(1024); +} + + +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; + if (buffers & (1<<0)) { dst = (char *)gp2x_screens[0] + offset; if (dst != data) memcpy(dst, data, len); } + if (buffers & (1<<1)) { dst = (char *)gp2x_screens[1] + offset; if (dst != data) memcpy(dst, data, len); } + if (buffers & (1<<2)) { dst = (char *)gp2x_screens[2] + offset; if (dst != data) memcpy(dst, data, len); } + if (buffers & (1<<3)) { dst = (char *)gp2x_screens[3] + offset; if (dst != data) memcpy(dst, data, len); } } void gp2x_memcpy_all_buffers(void *data, int offset, int len) { - memcpy((char *)gp2x_screens[0] + offset, data, len); - memcpy((char *)gp2x_screens[1] + offset, data, len); - memcpy((char *)gp2x_screens[2] + offset, data, len); - memcpy((char *)gp2x_screens[3] + offset, data, len); + gp2x_memcpy_buffers(0xf, data, offset, len); } @@ -168,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); } @@ -208,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; @@ -218,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); } @@ -256,9 +281,34 @@ void Pause940(int yes) void Reset940(int yes, int bank) { - gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (bank & 0x03); /* bank=3 */ + 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 */ @@ -282,16 +332,16 @@ void gp2x_init(void) } gp2x_memregl = (unsigned long *) gp2x_memregs; - gp2x_screens[3] = mmap(0, 640*480*4, PROT_WRITE, MAP_SHARED, memdev, FRAMEBUFF_ADDR3); - if(gp2x_screens[3] == MAP_FAILED) + gp2x_screens[0] = mmap(0, FRAMEBUFF_WHOLESIZE, PROT_WRITE, MAP_SHARED, memdev, FRAMEBUFF_ADDR0); + if(gp2x_screens[0] == MAP_FAILED) { printf("mmap(gp2x_screen) failed with %i\n", errno); exit(1); } - printf("framebuffers point to %p\n", gp2x_screens[3]); - gp2x_screens[2] = (char *) gp2x_screens[3]+640*480; - gp2x_screens[1] = (char *) gp2x_screens[2]+640*480; - gp2x_screens[0] = (char *) gp2x_screens[1]+640*480; + printf("framebuffers point to %p\n", gp2x_screens[0]); + gp2x_screens[1] = (char *) gp2x_screens[0]+0x30000; + gp2x_screens[2] = (char *) gp2x_screens[1]+0x30000; + gp2x_screens[3] = (char *) gp2x_screens[2]+0x30000; gp2x_screen = gp2x_screens[0]; screensel = 0; @@ -301,6 +351,9 @@ void gp2x_init(void) gp2x_screenaddr_old[2] = gp2x_memregs[0x2912>>1]; gp2x_screenaddr_old[3] = gp2x_memregs[0x2914>>1]; + memcpy(gp2x_screenaddrs_use, gp2x_screenaddrs, sizeof(gp2x_screenaddrs)); + gp2x_memset_all_buffers(0, 0, 320*240*2); + // snd mixerdev = open("/dev/mixer", O_RDWR); if (mixerdev == -1) @@ -309,6 +362,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); } @@ -325,7 +382,7 @@ void gp2x_deinit(void) gp2x_memregs[0x2912>>1] = gp2x_screenaddr_old[2]; gp2x_memregs[0x2914>>1] = gp2x_screenaddr_old[3]; - munmap(gp2x_screens[0], 640*480*4); + munmap(gp2x_screens[0], FRAMEBUFF_WHOLESIZE); munmap((void *)gp2x_memregs, 0x10000); close(memdev); close(mixerdev); @@ -349,4 +406,13 @@ void gp2x_deinit(void) } } +/* lprintf */ +void lprintf(const char *fmt, ...) +{ + va_list vl; + + va_start(vl, fmt); + vprintf(fmt, vl); + va_end(vl); +}