X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fgp2x.c;h=ef21a675533f7700dc2e8a41eead1d3c20bf4e7d;hb=3f2aaff20c940e90e970c008e56f5253d494a92c;hp=e4e34213f2bfbe1b91a6ffc1ea1cde030607245a;hpb=dccc2bd01c24a4d7af8614872d62a513cf35df4a;p=libpicofe.git

diff --git a/linux/gp2x.c b/linux/gp2x.c
index e4e3421..ef21a67 100644
--- a/linux/gp2x.c
+++ b/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,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 +105,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 +146,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(&gtk_thread, NULL, gtk_threadf, &sem);
+	pthread_detach(gtk_thread);
 
-	pthread_create(&gtk_thread, NULL, gtk_threadf, NULL);
+	sem_wait(&sem);
+	sem_close(&sem);
 }
 
 void finalize_image(guchar *pixels, gpointer data)
@@ -164,6 +181,7 @@ void gp2x_init(void)
 	printf("entering init()\n"); fflush(stdout);
 
 	gp2x_screen = malloc(320*240*2 + 320*2);
+	memset(gp2x_screen, 0, 320*240*2 + 320*2);
 
 	// snd
   	mixerdev = open("/dev/mixer", O_RDWR);
@@ -256,13 +274,18 @@ void gp2x_video_setpalette(int *pal, int len)
 	memcpy(current_pal, pal, len*4);
 }
 
-void gp2x_video_RGB_setscaling(int W, int H)
+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)
@@ -278,7 +301,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 */
@@ -345,6 +368,11 @@ unsigned long gp2x_joystick_read(int allow_usb_joy)
 	return value;
 }
 
+int gp2x_touchpad_read(int *x, int *y)
+{
+	return -1;
+}
+
 /* 940 */
 int crashed_940 = 0;
 void Pause940(int yes)
@@ -380,10 +408,17 @@ void set_RAM_Timings(int tRC, int tRAS, int tWR, int tMRD, int tRFC, int tRP, in
 {
 }
 
-void set_gamma(int g100)
+void set_gamma(int g100, int A_SNs_curve)
 {
 }
 
+void set_LCD_custom_rate(int rate)
+{
+}
+
+void unset_LCD_custom_rate(void)
+{
+}
 
 /* squidgehack.c */
 int mmuhack(void)
@@ -401,8 +436,16 @@ int mmuunhack(void)
 /* misc */
 void spend_cycles(int c)
 {
-	usleep(c/*/200*/);
+	usleep(c/200);
 }
 
+/* lprintf */
+void lprintf(const char *fmt, ...)
+{
+	va_list vl;
 
+	va_start(vl, fmt);
+	vprintf(fmt, vl);
+	va_end(vl);
+}