\r
#include "minimal.h"\r
#include "usbjoy.h"\r
-#include "asmutils.h"\r
+#include "../arm/asmutils.h"\r
\r
volatile unsigned short *gp2x_memregs;\r
//static\r
#define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000)\r
\r
static const int gp2x_screenaddrs[4] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 };\r
-static int gp2x_screenaddrs_use[4];\r
static unsigned short gp2x_screenaddr_old[4];\r
\r
\r
void gp2x_video_flip(void)\r
{\r
unsigned short lsw, msw;\r
- int addr = gp2x_screenaddrs_use[screensel&3];\r
+ int addr = gp2x_screenaddrs[screensel&3];\r
\r
addr += gp2x_screen_offs;\r
\r
- // since we are using the mmu hack, we must flush the cache first\r
- // (the params are most likely wrong, but they seem to work somehow)\r
- flushcache(addr, addr + 320*240*2, 0);\r
-\r
lsw = (unsigned short) addr;\r
msw = (unsigned short)(addr >> 16);\r
\r
/* doulblebuffered flip */\r
void gp2x_video_flip2(void)\r
{\r
- unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16);\r
+ unsigned short msw = (unsigned short)(gp2x_screenaddrs[screensel&1] >> 16);\r
\r
gp2x_memregs[0x2910>>1] = msw;\r
gp2x_memregs[0x2914>>1] = msw;\r
\r
\r
// TV Compatible function //\r
-void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)\r
+void gp2x_video_RGB_setscaling(int W, int H)\r
{\r
float escalaw, escalah;\r
int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3;\r
unsigned short scalw;\r
\r
- // set offset\r
- gp2x_screenaddrs_use[0] = gp2x_screenaddrs[0] + ln_offs * 320 * bpp;\r
- gp2x_screenaddrs_use[1] = gp2x_screenaddrs[1] + ln_offs * 320 * bpp;\r
- gp2x_screenaddrs_use[2] = gp2x_screenaddrs[2] + ln_offs * 320 * bpp;\r
- gp2x_screenaddrs_use[3] = gp2x_screenaddrs[3] + ln_offs * 320 * bpp;\r
-\r
escalaw = 1024.0; // RGB Horiz LCD\r
escalah = 320.0; // RGB Vert LCD\r
\r
gp2x_screen_offs = offs;\r
}\r
\r
+void gp2x_video_wait_vsync(void)\r
+{\r
+ unsigned short v = gp2x_memregs[0x1182>>1];\r
+ while (!((v ^ gp2x_memregs[0x1182>>1]) & 0x10));\r
+}\r
+\r
+void gp2x_video_flush_cache(void)\r
+{\r
+ // since we are using the mmu hack, we must flush the cache first\r
+ // (the params are most likely wrong, but they seem to work somehow)\r
+ //flushcache(addr, addr + 320*240*2, 0);\r
+ flushcache(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);\r
+}\r
+\r
void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)\r
{\r
if (buffers & (1<<0)) memcpy((char *)gp2x_screens[0] + offset, data, len);\r
if (sounddev > 0) close(sounddev);\r
sounddev = open("/dev/dsp", O_WRONLY|O_ASYNC);\r
if (sounddev == -1)\r
+ {\r
printf("open(\"/dev/dsp\") failed with %i\n", errno);\r
+ return;\r
+ }\r
\r
ioctl(sounddev, SNDCTL_DSP_SPEED, &rate);\r
ioctl(sounddev, SNDCTL_DSP_SETFMT, &bits);\r
gp2x_screenaddr_old[2] = gp2x_memregs[0x2912>>1];\r
gp2x_screenaddr_old[3] = gp2x_memregs[0x2914>>1];\r
\r
- memcpy(gp2x_screenaddrs_use, gp2x_screenaddrs, sizeof(gp2x_screenaddrs));\r
gp2x_memset_all_buffers(0, 0, 320*240*2);\r
\r
// snd\r
gp2x_memregs[0x2912>>1] = gp2x_screenaddr_old[2];\r
gp2x_memregs[0x2914>>1] = gp2x_screenaddr_old[3];\r
\r
+ gp2x_usbjoy_deinit();\r
+\r
munmap(gp2x_screens[0], FRAMEBUFF_WHOLESIZE);\r
munmap((void *)gp2x_memregs, 0x10000);\r
close(memdev);\r
close(mixerdev);\r
if (sounddev > 0) close(sounddev);\r
\r
- gp2x_usbjoy_deinit();\r
-\r
printf("all done, running ");\r
\r
// Zaq121's alternative frontend support from MAME\r