#include <sys/mman.h>\r
#include <sys/types.h>\r
#include <sys/stat.h>\r
-#include <sys/ioctl.h>\r
-#include <sys/soundcard.h>\r
#include <fcntl.h>\r
#include <errno.h>\r
\r
#include "gp2x.h"\r
-#include "usbjoy.h"\r
+#include "../linux/sndout_oss.h"\r
#include "../common/arm_utils.h"\r
+#include "../common/arm_linux.h"\r
\r
volatile unsigned short *gp2x_memregs;\r
//static\r
static int screensel = 0;\r
//static\r
int memdev = 0;\r
-static int sounddev = -1, mixerdev = -1, touchdev = -1;\r
+static int touchdev = -1;\r
static int touchcal[7] = { 6203, 0, -1501397, 0, -4200, 16132680, 65536 };\r
\r
-void *gp2x_screen;\r
-\r
#define FRAMEBUFF_WHOLESIZE (0x30000*4) // 320*240*2 + some more\r
#define FRAMEBUFF_ADDR0 (0x4000000-FRAMEBUFF_WHOLESIZE)\r
#define FRAMEBUFF_ADDR1 (FRAMEBUFF_ADDR0+0x30000)\r
gp2x_memregs[0x2912>>1] = lsw;\r
\r
// jump to other buffer:\r
- gp2x_screen = gp2x_screens[++screensel&3];\r
+ g_screen_ptr = gp2x_screens[++screensel&3];\r
}\r
\r
/* doulblebuffered flip */\r
gp2x_memregs[0x2912>>1] = 0;\r
\r
// jump to other buffer:\r
- gp2x_screen = gp2x_screens[++screensel&1];\r
+ g_screen_ptr = gp2x_screens[++screensel&1];\r
}\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
+ cache_flush_d_inval_i(g_screen_ptr, (char *)g_screen_ptr + 320*240*2);\r
}\r
\r
\r
\r
void gp2x_pd_clone_buffer2(void)\r
{\r
- memcpy(gp2x_screen, gp2x_screens[2], 320*240*2);\r
+ memcpy(g_screen_ptr, gp2x_screens[2], 320*240*2);\r
}\r
\r
\r
-unsigned long gp2x_joystick_read(int allow_usb_joy)\r
+unsigned long gp2x_joystick_read(int unused)\r
{\r
int i;\r
unsigned long value=(gp2x_memregs[0x1198>>1] & 0x00FF); // GPIO M\r
if(value==0x7F) value=0xBE;\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
- gp2x_usbjoy_update();\r
- for (i = 0; i < num_of_joys; i++)\r
- value |= gp2x_usbjoy_check(i);\r
- }\r
-\r
return value;\r
}\r
\r
}\r
\r
\r
-static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0;\r
-\r
-void gp2x_start_sound(int rate, int bits, int stereo)\r
-{\r
- int frag = 0, bsize, buffers;\r
-\r
- // if no settings change, we don't need to do anything\r
- if (rate == s_oldrate && s_oldbits == bits && s_oldstereo == stereo) return;\r
-\r
- if (sounddev > 0) close(sounddev);\r
- sounddev = open("/dev/dsp", O_WRONLY|O_ASYNC);\r
- if (sounddev == -1)\r
- printf("open(\"/dev/dsp\") failed with %i\n", errno);\r
-\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
- bsize = rate / 32;\r
- if (rate > 22050) { bsize*=4; buffers*=2; } // 44k mode seems to be very demanding\r
- 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
-}\r
-\r
-\r
-void gp2x_sound_write(void *buff, int len)\r
-{\r
- write(sounddev, buff, len);\r
-}\r
-\r
-void gp2x_sound_sync(void)\r
-{\r
- ioctl(sounddev, SOUND_PCM_SYNC, 0);\r
-}\r
-\r
-void gp2x_sound_volume(int l, int r)\r
-{\r
- l=l<0?0:l; l=l>255?255:l; r=r<0?0:r; r=r>255?255:r;\r
- l<<=8; l|=r;\r
- ioctl(mixerdev, SOUND_MIXER_WRITE_PCM, &l); /*SOUND_MIXER_WRITE_VOLUME*/\r
-}\r
-\r
-\r
/* 940 */\r
void Pause940(int yes)\r
{\r
memdev = open("/dev/mem", O_RDWR);\r
if (memdev == -1)\r
{\r
- printf("open(\"/dev/mem\") failed with %i\n", errno);\r
+ perror("open(\"/dev/mem\")");\r
exit(1);\r
}\r
\r
printf("memregs are @ %p\n", gp2x_memregs);\r
if(gp2x_memregs == MAP_FAILED)\r
{\r
- printf("mmap(memregs) failed with %i\n", errno);\r
+ perror("mmap(memregs)");\r
exit(1);\r
}\r
gp2x_memregl = (unsigned long *) gp2x_memregs;\r
gp2x_screens[0] = mmap(0, FRAMEBUFF_WHOLESIZE, PROT_WRITE, MAP_SHARED, memdev, FRAMEBUFF_ADDR0);\r
if(gp2x_screens[0] == MAP_FAILED)\r
{\r
- printf("mmap(gp2x_screen) failed with %i\n", errno);\r
+ perror("mmap(g_screen_ptr)");\r
exit(1);\r
}\r
printf("framebuffers point to %p\n", gp2x_screens[0]);\r
gp2x_screens[2] = (char *) gp2x_screens[1]+0x30000;\r
gp2x_screens[3] = (char *) gp2x_screens[2]+0x30000;\r
\r
- gp2x_screen = gp2x_screens[0];\r
+ g_screen_ptr = gp2x_screens[0];\r
screensel = 0;\r
\r
gp2x_screenaddr_old[0] = gp2x_memregs[0x290E>>1];\r
gp2x_memset_all_buffers(0, 0, 320*240*2);\r
\r
// snd\r
- mixerdev = open("/dev/mixer", O_RDWR);\r
- if (mixerdev == -1)\r
- printf("open(\"/dev/mixer\") failed with %i\n", errno);\r
-\r
- /* init usb joys -GnoStiC */\r
- gp2x_usbjoy_init();\r
+ sndout_oss_init();\r
\r
// touchscreen\r
touchdev = open("/dev/touchscreen/wm97xx", O_RDONLY);\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
if (touchdev >= 0) close(touchdev);\r
\r
- gp2x_usbjoy_deinit();\r
+ sndout_oss_exit();\r
\r
printf("all done, running ");\r
\r
// Zaq121's alternative frontend support from MAME\r
- if(ext_menu && ext_state) {\r
+ if (ext_menu && ext_state) {\r
printf("%s -state %s\n", ext_menu, ext_state);\r
execl(ext_menu, ext_menu, "-state", ext_state, NULL);\r
} else if(ext_menu) {\r
notaz.gp2x.de / libpicofe.git / blobdiff