X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fgp2x.c;h=e433524af06412fc15cee0b3ab5609a9e53866fd;hb=2c60056042e94007286e3e0e1789f4c9a78b7731;hp=f138be636ae501fb2bf8020892404014bed2a686;hpb=79cad122559536a7831b121c5ec798847102d0de;p=libpicofe.git diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c index f138be6..e433524 100644 --- a/gp2x/gp2x.c +++ b/gp2x/gp2x.c @@ -22,18 +22,20 @@ #include #include +#include #include #include #include #include #include -#include -#include #include #include #include "gp2x.h" -#include "usbjoy.h" +#include "../linux/sndout_oss.h" +#include "../common/arm_utils.h" +#include "../common/arm_linux.h" +#include "../common/emu.h" volatile unsigned short *gp2x_memregs; //static @@ -42,9 +44,8 @@ static void *gp2x_screens[4]; static int screensel = 0; //static int memdev = 0; -static int sounddev = 0, mixerdev = 0; - -void *gp2x_screen; +static int touchdev = -1; +static int touchcal[7] = { 6203, 0, -1501397, 0, -4200, 16132680, 65536 }; #define FRAMEBUFF_WHOLESIZE (0x30000*4) // 320*240*2 + some more #define FRAMEBUFF_ADDR0 (0x4000000-FRAMEBUFF_WHOLESIZE) @@ -69,7 +70,7 @@ void gp2x_video_flip(void) gp2x_memregs[0x2912>>1] = lsw; // jump to other buffer: - gp2x_screen = gp2x_screens[++screensel&3]; + g_screen_ptr = gp2x_screens[++screensel&3]; } /* doulblebuffered flip */ @@ -83,7 +84,7 @@ void gp2x_video_flip2(void) gp2x_memregs[0x2912>>1] = 0; // jump to other buffer: - gp2x_screen = gp2x_screens[++screensel&1]; + g_screen_ptr = gp2x_screens[++screensel&1]; } @@ -149,20 +150,27 @@ void gp2x_video_RGB_setscaling(int ln_offs, int W, int H) } -/* 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 + cache_flush_d_inval_i(g_screen_ptr, (char *)g_screen_ptr + 320*240*2); } void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len) { - if (buffers & (1<<0)) memcpy((char *)gp2x_screens[0] + offset, data, len); - if (buffers & (1<<1)) memcpy((char *)gp2x_screens[1] + offset, data, len); - if (buffers & (1<<2)) memcpy((char *)gp2x_screens[2] + offset, data, len); - if (buffers & (1<<3)) memcpy((char *)gp2x_screens[3] + offset, data, 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); } } @@ -183,79 +191,52 @@ 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(g_screen_ptr, gp2x_screens[2], 320*240*2); } -unsigned long gp2x_joystick_read(int allow_usb_joy) +unsigned long gp2x_joystick_read(int unused) { - 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)); - - if (allow_usb_joy && num_of_joys > 0) { - // check the usb joy as well.. - gp2x_usbjoy_update(); - for (i = 0; i < num_of_joys; i++) - value |= gp2x_usbjoy_check(i); - } + value = ~((gp2x_memregs[0x1184>>1] & 0xFF00) | value | (gp2x_memregs[0x1186>>1] << 16)); // C D return value; } -static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0; - -void gp2x_start_sound(int rate, int bits, int stereo) +typedef struct ucb1x00_ts_event { - int frag = 0, bsize, buffers; - - // if no settings change, we don't need to do anything - if (rate == s_oldrate && s_oldbits == bits && s_oldstereo == stereo) return; - - if (sounddev > 0) close(sounddev); - sounddev = open("/dev/dsp", O_WRONLY|O_ASYNC); - 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_STEREO, &stereo); - // calculate buffer size - buffers = 16; - bsize = rate / 32; - if (rate > 22050) { bsize*=4; buffers*=2; } // 44k mode seems to be very demanding - while ((bsize>>=1)) frag++; - frag |= buffers<<16; // 16 buffers - ioctl(sounddev, SNDCTL_DSP_SETFRAGMENT, &frag); - 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); -} + unsigned short pressure; + unsigned short x; + unsigned short y; + unsigned short pad; + struct timeval stamp; +} UCB1X00_TS_EVENT; + +int gp2x_touchpad_read(int *x, int *y) +{ + UCB1X00_TS_EVENT event; + static int zero_seen = 0; + int retval; + if (touchdev < 0) return -1; -void gp2x_sound_write(void *buff, int len) -{ - write(sounddev, buff, len); -} + retval = read(touchdev, &event, sizeof(event)); + if (retval <= 0) { + printf("touch read failed %i %i\n", retval, errno); + return -1; + } + // this is to ignore the messed-up 4.1.x driver + if (event.pressure == 0) zero_seen = 1; -void gp2x_sound_sync(void) -{ - ioctl(sounddev, SOUND_PCM_SYNC, 0); -} + if (x) *x = (event.x * touchcal[0] + touchcal[2]) >> 16; + if (y) *y = (event.y * touchcal[4] + touchcal[5]) >> 16; + // printf("read %i %i %i\n", event.pressure, *x, *y); -void gp2x_sound_volume(int l, int r) -{ - l=l<0?0:l; l=l>255?255:l; r=r<0?0:r; r=r>255?255:r; - l<<=8; l|=r; - ioctl(mixerdev, SOUND_MIXER_WRITE_PCM, &l); /*SOUND_MIXER_WRITE_VOLUME*/ + return zero_seen ? event.pressure : 0; } @@ -274,6 +255,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 */ @@ -284,7 +290,7 @@ void gp2x_init(void) memdev = open("/dev/mem", O_RDWR); if (memdev == -1) { - printf("open(\"/dev/mem\") failed with %i\n", errno); + perror("open(\"/dev/mem\")"); exit(1); } @@ -292,15 +298,17 @@ void gp2x_init(void) printf("memregs are @ %p\n", gp2x_memregs); if(gp2x_memregs == MAP_FAILED) { - printf("mmap(memregs) failed with %i\n", errno); + perror("mmap(memregs)"); exit(1); } 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) { - printf("mmap(gp2x_screen) failed with %i\n", errno); + perror("mmap(g_screen_ptr)"); exit(1); } printf("framebuffers point to %p\n", gp2x_screens[0]); @@ -308,7 +316,7 @@ void gp2x_init(void) gp2x_screens[2] = (char *) gp2x_screens[1]+0x30000; gp2x_screens[3] = (char *) gp2x_screens[2]+0x30000; - gp2x_screen = gp2x_screens[0]; + g_screen_ptr = gp2x_screens[0]; screensel = 0; gp2x_screenaddr_old[0] = gp2x_memregs[0x290E>>1]; @@ -320,12 +328,23 @@ void gp2x_init(void) gp2x_memset_all_buffers(0, 0, 320*240*2); // snd - mixerdev = open("/dev/mixer", O_RDWR); - if (mixerdev == -1) - printf("open(\"/dev/mixer\") failed with %i\n", errno); + sndout_oss_init(); + + // touchscreen + touchdev = open("/dev/touchscreen/wm97xx", O_RDONLY); + if (touchdev >= 0) { + FILE *pcf = fopen("/etc/pointercal", "r"); + if (pcf) { + fscanf(pcf, "%d %d %d %d %d %d %d", &touchcal[0], &touchcal[1], + &touchcal[2], &touchcal[3], &touchcal[4], &touchcal[5], &touchcal[6]); + fclose(pcf); + } + printf("found touchscreen/wm97xx\n"); + } - /* 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); } @@ -346,15 +365,14 @@ void gp2x_deinit(void) munmap(gp2x_screens[0], FRAMEBUFF_WHOLESIZE); munmap((void *)gp2x_memregs, 0x10000); close(memdev); - close(mixerdev); - if (sounddev > 0) close(sounddev); + if (touchdev >= 0) close(touchdev); - gp2x_usbjoy_deinit(); + sndout_oss_exit(); printf("all done, running "); // Zaq121's alternative frontend support from MAME - if(ext_menu && ext_state) { + if (ext_menu && ext_state) { printf("%s -state %s\n", ext_menu, ext_state); execl(ext_menu, ext_menu, "-state", ext_state, NULL); } else if(ext_menu) { @@ -367,4 +385,13 @@ void gp2x_deinit(void) } } +/* lprintf */ +void lprintf(const char *fmt, ...) +{ + va_list vl; + + va_start(vl, fmt); + vprintf(fmt, vl); + va_end(vl); +}