#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 <linux/fb.h>\r
#include <fcntl.h>\r
#include <errno.h>\r
\r
#include "../gp2x/gp2x.h"\r
-#include "../gp2x/usbjoy.h"\r
+#include "../linux/usbjoy.h"\r
+#include "../linux/sndout_oss.h"\r
#include "../common/arm_linux.h"\r
\r
static volatile unsigned int *memregs = MAP_FAILED;\r
//static\r
int memdev = 0;\r
-static int fbdev = -1, sounddev = -1, mixerdev = -1, touchdev = -1;\r
-static int touchcal[7] = { 6203, 0, -1501397, 0, -4200, 16132680, 65536 };\r
+static int fbdev = -1;\r
\r
-//#define SCREEN_MAP_SIZE (((800*(480+11)*2)+0xfff)&~0xfff)\r
#define SCREEN_MAP_SIZE (800*480*2)\r
static void *screen = MAP_FAILED;\r
void *gp2x_screen;\r
\r
if (allow_usb_joy && num_of_joys > 0) {\r
// check the usb joy as well..\r
- gp2x_usbjoy_update();\r
+ usbjoy_update();\r
for (i = 0; i < num_of_joys; i++)\r
- value |= gp2x_usbjoy_check(i);\r
+ value |= usbjoy_check(i);\r
}\r
\r
return value;\r
}\r
\r
+// FIXME\r
+#if 0\r
+static int touchcal[7] = { 6203, 0, -1501397, 0, -4200, 16132680, 65536 };\r
+\r
typedef struct ucb1x00_ts_event\r
{\r
unsigned short pressure;\r
\r
return zero_seen ? event.pressure : 0;\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
-#if 0\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
+#else\r
+int gp2x_touchpad_read(int *x, int *y) { return -1; }\r
#endif\r
-}\r
-\r
\r
/* common */\r
void gp2x_init(void)\r
{\r
- struct fb_fix_screeninfo fbfix;\r
- int ret;\r
-\r
printf("entering init()\n"); fflush(stdout);\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
fbdev = open("/dev/fb0", O_RDWR);\r
if (fbdev == -1)\r
{\r
- printf("open(\"/dev/fb0\") failed with %i\n", errno);\r
- exit(1);\r
- }\r
-\r
- ret = ioctl(fbdev, FBIOGET_FSCREENINFO, &fbfix);\r
- if (ret == -1)\r
- {\r
- printf("ioctl(fbdev) failed with %i\n", errno);\r
+ perror("open(\"/dev/fb0\")");\r
exit(1);\r
}\r
\r
- // squidge hack\r
- if (fbfix.line_length != 800*2)\r
- {\r
- gp2x_screen = malloc(800*640*2);\r
- return;\r
- }\r
-\r
screen = mmap(0, SCREEN_MAP_SIZE, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev, 0);\r
if (screen == MAP_FAILED)\r
{\r
- printf("mmap(fbptr) failed with %i\n", errno);\r
+ perror("mmap(fbptr)");\r
exit(1);\r
}\r
printf("fbptr %p\n", screen);\r
-// gp2x_screen = (char *)screen + 800*10*2-64;\r
gp2x_screen = screen;\r
\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
+ sndout_oss_init();\r
\r
/* init usb joys -GnoStiC */\r
- gp2x_usbjoy_init();\r
-\r
- // touchscreen\r
- touchdev = open("/dev/touchscreen/wm97xx", O_RDONLY);\r
- if (touchdev >= 0) {\r
- FILE *pcf = fopen("/etc/pointercal", "r");\r
- if (pcf) {\r
- fscanf(pcf, "%d %d %d %d %d %d %d", &touchcal[0], &touchcal[1],\r
- &touchcal[2], &touchcal[3], &touchcal[4], &touchcal[5], &touchcal[6]);\r
- fclose(pcf);\r
- }\r
- printf("found touchscreen/wm97xx\n");\r
- }\r
+ usbjoy_init();\r
\r
printf("exitting init()\n"); fflush(stdout);\r
}\r
\r
void gp2x_deinit(void)\r
{\r
- //gp2x_video_changemode(15);\r
-\r
if (screen != MAP_FAILED)\r
munmap(screen, SCREEN_MAP_SIZE);\r
if (memregs != MAP_FAILED)\r
munmap((void *)memregs, 0x10000);\r
close(memdev);\r
if (fbdev >= 0) close(fbdev);\r
- if (mixerdev >= 0) close(mixerdev);\r
- if (sounddev >= 0) close(sounddev);\r
- if (touchdev >= 0) close(touchdev);\r
\r
- gp2x_usbjoy_deinit();\r
+ sndout_oss_exit();\r
+ usbjoy_deinit();\r
\r
printf("all done");\r
}\r
/* fake GP2X */\r
int crashed_940 = 0;\r
\r
-int readpng(void *dest, const char *fname, int what) { return -1; }\r
void set_gamma(int g100, int A_SNs_curve) {}\r
void set_FCLK(unsigned MHZ) {}\r
void set_LCD_custom_rate(int rate) {}\r
notaz.gp2x.de / libpicofe.git / blobdiff