X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fgp2x.c;h=cb1d8d2274021889caa80e8ab7b46dc99ef3657e;hb=73a853695e1a82252b5c773f07cceae005e249ff;hp=f5da1670c766a48ba09b454aac2fd6285eb54ffa;hpb=15b55b4ed53d8445bd6f0dd31a0e8fb72e05fa99;p=libpicofe.git diff --git a/linux/gp2x.c b/linux/gp2x.c index f5da167..cb1d8d2 100644 --- a/linux/gp2x.c +++ b/linux/gp2x.c @@ -3,32 +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; +unsigned long current_keys = 0; 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 @@ -52,9 +52,13 @@ static gint key_press_event (GtkWidget *widget, GdkEventKey *event) { switch (event->hardware_keycode) { + case 111: case 0x62: current_keys |= GP2X_UP; break; + case 116: case 0x68: current_keys |= GP2X_DOWN; break; + case 113: case 0x64: current_keys |= GP2X_LEFT; break; + case 114: case 0x66: current_keys |= GP2X_RIGHT; break; case 0x24: current_keys |= GP2X_START; break; // enter case 0x23: current_keys |= GP2X_SELECT;break; // ] @@ -69,6 +73,11 @@ static gint key_press_event (GtkWidget *widget, GdkEventKey *event) 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; @@ -78,9 +87,13 @@ static gint key_release_event (GtkWidget *widget, GdkEventKey *event) { switch (event->hardware_keycode) { + case 111: case 0x62: current_keys &= ~GP2X_UP; break; + case 116: case 0x68: current_keys &= ~GP2X_DOWN; break; + case 113: case 0x64: current_keys &= ~GP2X_LEFT; break; + case 114: case 0x66: current_keys &= ~GP2X_RIGHT; break; case 0x24: current_keys &= ~GP2X_START; break; // enter case 0x23: current_keys &= ~GP2X_SELECT;break; // ] @@ -98,22 +111,25 @@ 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; +/* +void gdk_drawable_get_size (GdkDrawable *drawable, + gint *width, + gint *height); +**/ - return NULL; +static void size_allocate_event(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data) +{ + gint w, h; + gdk_drawable_get_size(gtk_items.window, &w, &h); + printf("%dx%d %dx%d\n", allocation->width, allocation->height, w, h); } -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 (); @@ -134,6 +150,9 @@ static void gtk_initf(void) g_signal_connect (G_OBJECT (gtk_items.window), "key_release_event", G_CALLBACK (key_release_event), NULL); + g_signal_connect (G_OBJECT (gtk_items.window), "size_allocate", + G_CALLBACK (size_allocate_event), NULL); + gtk_container_set_border_width (GTK_CONTAINER (gtk_items.window), 2); gtk_window_set_title ((GtkWindow *) gtk_items.window, verstring); @@ -149,11 +168,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); + + 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); - pthread_create(>k_thread, NULL, gtk_threadf, NULL); + sem_wait(&sem); + sem_close(&sem); } void finalize_image(guchar *pixels, gpointer data) @@ -171,13 +206,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); } @@ -185,9 +218,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 */ @@ -291,54 +323,6 @@ void gp2x_pd_clone_buffer2(void) memset(gp2x_screen, 0, 320*240*2); } -/* 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*/ -} - /* joy */ unsigned long gp2x_joystick_read(int allow_usb_joy) { @@ -347,14 +331,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) @@ -421,5 +410,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); +}