X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fgp2x.c;h=bcb3ee3eb5e8166aec8d00e97833e30b41c21e67;hb=34581c95f808322ecb29e0931ba8f5c879cc89b6;hp=199d69e21b4d3719d72fbef6ea10cf0533d2f0bb;hpb=5963319865fac11b85e02280ae911bcfc26f2d8f;p=libpicofe.git diff --git a/linux/gp2x.c b/linux/gp2x.c index 199d69e..bcb3ee3 100644 --- a/linux/gp2x.c +++ b/linux/gp2x.c @@ -3,30 +3,32 @@ #include #include #include +#include #include #include #include #include -#include -#include #include #include #include "../gp2x/emu.h" #include "../gp2x/gp2x.h" -#include "../gp2x/usbjoy.h" #include "../gp2x/version.h" +#include "sndout_oss.h" +#include "usbjoy.h" + +#include "log_io.h" void *gp2x_screen; static int current_bpp = 8; static int current_pal[256]; static unsigned long current_keys = 0; -static int sounddev = 0, mixerdev = 0; static const char *verstring = "PicoDrive " VERSION; // dummies char *ext_menu = 0, *ext_state = 0; +int mix_32_to_16l_level; /* gtk */ struct gtk_global_struct @@ -65,6 +67,13 @@ static gint key_press_event (GtkWidget *widget, GdkEventKey *event) case 0x29: current_keys |= GP2X_PUSH; break; // f case 0x18: current_keys |= GP2X_VOL_DOWN;break; // q case 0x19: current_keys |= GP2X_VOL_UP;break; // w + case 0x2d: log_io_clear(); break; // k + case 0x2e: log_io_dump(); break; // l + case 0x17: { // tab + extern int PicoReset(void); + PicoReset(); + break; + } } return 0; @@ -94,22 +103,12 @@ static gint key_release_event (GtkWidget *widget, GdkEventKey *event) return 0; } -static void *gtk_threadf(void *none) -{ - gtk_main(); - - printf("linux: gtk thread finishing\n"); - engineState = PGS_Quit; - - return NULL; -} - -static void gtk_initf(void) +static void *gtk_threadf(void *targ) { int argc = 0; char *argv[] = { "" }; GtkWidget *box; - pthread_t gtk_thread; + sem_t *sem = targ; g_thread_init (NULL); gdk_threads_init (); @@ -145,11 +144,27 @@ static void gtk_initf(void) gtk_widget_show (gtk_items.window); - // pthread_mutex_init (&thr_mutex, NULL); - // pthread_mutex_lock (&thr_mutex); - // pthread_mutex_init (&scanner_muttex, NULL); + sem_post(sem); - pthread_create(>k_thread, NULL, gtk_threadf, NULL); + gtk_main(); + + printf("linux: gtk thread finishing\n"); + exit(1); + + return NULL; +} + +static void gtk_initf(void) +{ + pthread_t gtk_thread; + sem_t sem; + sem_init(&sem, 0, 0); + + pthread_create(>k_thread, NULL, gtk_threadf, &sem); + pthread_detach(gtk_thread); + + sem_wait(&sem); + sem_close(&sem); } void finalize_image(guchar *pixels, gpointer data) @@ -167,13 +182,11 @@ void gp2x_init(void) memset(gp2x_screen, 0, 320*240*2 + 320*2); // snd - mixerdev = open("/dev/mixer", O_RDWR); - if (mixerdev == -1) - printf("open(\"/dev/mixer\") failed with %i\n", errno); + sndout_oss_init(); gtk_initf(); - gp2x_usbjoy_init(); + usbjoy_init(); printf("exitting init()\n"); fflush(stdout); } @@ -181,9 +194,8 @@ void gp2x_init(void) void gp2x_deinit(void) { free(gp2x_screen); - if (sounddev > 0) close(sounddev); - close(mixerdev); - gp2x_usbjoy_deinit(); + sndout_oss_exit(); + usbjoy_deinit(); } /* video */ @@ -257,13 +269,18 @@ void gp2x_video_setpalette(int *pal, int len) memcpy(current_pal, pal, len*4); } +void gp2x_video_flush_cache(void) +{ +} + void gp2x_video_RGB_setscaling(int v_offs, int W, int H) { } void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len) { - memcpy((char *)gp2x_screen + offset, data, len); + if ((char *)gp2x_screen + offset != data) + memcpy((char *)gp2x_screen + offset, data, len); } void gp2x_memcpy_all_buffers(void *data, int offset, int len) @@ -279,55 +296,7 @@ void gp2x_memset_all_buffers(int offset, int byte, int len) void gp2x_pd_clone_buffer2(void) { - memset(gp2x_screen, 0, 320*240); -} - -/* sound */ -static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0; - -void gp2x_start_sound(int rate, int bits, int stereo) -{ - 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; -} - -void gp2x_sound_write(void *buff, int len) -{ - write(sounddev, buff, len); -} - -void gp2x_sound_sync(void) -{ - ioctl(sounddev, SOUND_PCM_SYNC, 0); -} - -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*/ + memset(gp2x_screen, 0, 320*240*2); } /* joy */ @@ -338,14 +307,19 @@ unsigned long gp2x_joystick_read(int allow_usb_joy) if (allow_usb_joy && num_of_joys > 0) { // check the usb joy as well.. - gp2x_usbjoy_update(); + usbjoy_update(); for (i = 0; i < num_of_joys; i++) - value |= gp2x_usbjoy_check(i); + value |= usbjoy_check(i); } return value; } +int gp2x_touchpad_read(int *x, int *y) +{ + return -1; +} + /* 940 */ int crashed_940 = 0; void Pause940(int yes) @@ -412,5 +386,13 @@ void spend_cycles(int c) usleep(c/200); } +/* lprintf */ +void lprintf(const char *fmt, ...) +{ + va_list vl; + va_start(vl, fmt); + vprintf(fmt, vl); + va_end(vl); +}