X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flinux%2Fgp2x.c;h=4a7c5564353b79f42690935da004fbc581cf15b0;hb=f53f286a8b48d19c65e83f90d00aa47e8e87c889;hp=199d69e21b4d3719d72fbef6ea10cf0533d2f0bb;hpb=4e8a534cecffcc60e96c9fefdb821cc1a09a1eba;p=picodrive.git

diff --git a/platform/linux/gp2x.c b/platform/linux/gp2x.c
index 199d69e..4a7c556 100644
--- a/platform/linux/gp2x.c
+++ b/platform/linux/gp2x.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
+#include <semaphore.h>
 #include <gtk/gtk.h>
 
 #include <unistd.h>
@@ -18,6 +19,8 @@
 #include "../gp2x/usbjoy.h"
 #include "../gp2x/version.h"
 
+#include "log_io.h"
+
 void *gp2x_screen;
 static int current_bpp = 8;
 static int current_pal[256];
@@ -27,6 +30,7 @@ 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 +69,8 @@ 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
 	}
 
 	return 0;
@@ -94,22 +100,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 +141,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);
 
-	pthread_create(&gtk_thread, NULL, gtk_threadf, NULL);
+	return NULL;
+}
+
+static void gtk_initf(void)
+{
+	pthread_t gtk_thread;
+	sem_t sem;
+	sem_init(&sem, 0, 0);
+
+	pthread_create(&gtk_thread, NULL, gtk_threadf, &sem);
+	pthread_detach(gtk_thread);
+
+	sem_wait(&sem);
+	sem_close(&sem);
 }
 
 void finalize_image(guchar *pixels, gpointer data)
@@ -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,7 +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);
+	memset(gp2x_screen, 0, 320*240*2);
 }
 
 /* sound */
@@ -412,5 +429,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);
+}