X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fgp2x.c;h=c00671aa6ee2cded93f9a76719e8559ae1b4951c;hb=b5bfb86438216d502f1f9ed14b923d3b0107c07d;hp=a58b45166b0893ad4386a885db748f89116ba6b0;hpb=d572cbad9886a04f8c51edb825dc6aaec9b02e23;p=libpicofe.git

diff --git a/linux/gp2x.c b/linux/gp2x.c
index a58b451..c00671a 100644
--- a/linux/gp2x.c
+++ b/linux/gp2x.c
@@ -12,10 +12,10 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "../gp2x/emu.h"
-#include "../gp2x/gp2x.h"
 #include "../gp2x/version.h"
 #include "../common/emu.h"
+#include "../common/menu.h"
+#include "../common/readpng.h"
 #include "sndout_oss.h"
 
 #include "log_io.h"
@@ -25,9 +25,13 @@ static int current_bpp = 8;
 static int current_pal[256];
 static const char *verstring = "PicoDrive " VERSION;
 static int scr_changed = 0, scr_w = SCREEN_WIDTH, scr_h = SCREEN_HEIGHT;
+void *gp2x_screens[4];
 
 // dummies
 int mix_32_to_16l_level;
+int crashed_940 = 0;
+int default_cpu_clock = 123;
+void *gp2x_memregs = NULL;
 
 /* gtk */
 struct gtk_global_struct
@@ -203,36 +207,19 @@ void finalize_image(guchar *pixels, gpointer data)
 static void realloc_screen(void)
 {
 	void *old = g_screen_ptr;
+	int i;
 	g_screen_width = scr_w;
 	g_screen_height = scr_h;
 	g_screen_ptr = calloc(g_screen_width * g_screen_height * 2, 1);
 	free(old);
 	scr_changed = 0;
-}
-
-void plat_init(void)
-{
-	printf("entering init()\n"); fflush(stdout);
-
-	realloc_screen();
-	memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
-
-	// snd
-	sndout_oss_init();
 
-	gtk_initf();
-
-	printf("exitting init()\n"); fflush(stdout);
+	for (i = 0; i < 4; i++)
+		gp2x_screens[i] = g_screen_ptr;
 }
 
-void plat_finish(void)
-{
-	free(g_screen_ptr);
-	sndout_oss_exit();
-}
-
-/* video */
-void gp2x_video_flip(void)
+/* gp2x/emu.c stuff, most to be rm'd */
+static void gp2x_video_flip_(void)
 {
 	GdkPixbuf	*pixbuf;
 	unsigned char	*image;
@@ -288,27 +275,17 @@ void gp2x_video_flip(void)
 		realloc_screen();
 }
 
-void gp2x_video_flip2(void)
-{
-	gp2x_video_flip();
-}
-
-void gp2x_video_changemode(int bpp)
-{
-	current_bpp = bpp;
-}
-
-void gp2x_video_changemode2(int bpp)
+static void gp2x_video_changemode_ll_(int bpp)
 {
 	current_bpp = bpp;
 }
 
-void gp2x_video_setpalette(int *pal, int len)
+static void gp2x_video_setpalette_(int *pal, int len)
 {
 	memcpy(current_pal, pal, len*4);
 }
 
-void gp2x_video_RGB_setscaling(int v_offs, int W, int H)
+void gp2x_memcpy_all_buffers(void *data, int offset, int len)
 {
 }
 
@@ -317,76 +294,128 @@ void gp2x_memset_all_buffers(int offset, int byte, int len)
 	memset((char *)g_screen_ptr + offset, byte, len);
 }
 
-/* joy */
-int gp2x_touchpad_read(int *x, int *y)
+void gp2x_video_changemode(int bpp)
 {
-	return -1;
+	gp2x_video_changemode_ll_(bpp);
 }
 
-/* 940 */
-int crashed_940 = 0;
-void pause940(int yes)
+void gp2x_make_fb_bufferable(int yes)
 {
 }
 
-void reset940(int yes, int bank)
+int soc_detect(void)
 {
+	return 0;
 }
 
-/* faking gp2x cpuctrl.c */
-void cpuctrl_init(void)
+/* plat */
+static char menu_bg_buffer[320*240*2];
+char cpu_clk_name[16] = "GP2X CPU clocks";
+
+void plat_video_menu_enter(int is_rom_loaded)
 {
+	if (is_rom_loaded)
+	{
+		// darken the active framebuffer
+		memset(g_screen_ptr, 0, 320*8*2);
+		menu_darken_bg((char *)g_screen_ptr + 320*8*2, 320*224, 1);
+		memset((char *)g_screen_ptr + 320*232*2, 0, 320*8*2);
+	}
+	else
+	{
+		char buff[256];
+
+		// should really only happen once, on startup..
+		emu_make_path(buff, "skin/background.png", sizeof(buff));
+		if (readpng(g_screen_ptr, buff, READPNG_BG) < 0)
+			memset(g_screen_ptr, 0, 320*240*2);
+	}
+
+	memcpy(menu_bg_buffer, g_screen_ptr, 320*240*2);
+
+	// switch to 16bpp
+	gp2x_video_changemode_ll_(16);
+	gp2x_video_flip_();
 }
 
-void cpuctrl_deinit(void)
+void plat_video_menu_begin(void)
 {
+	memcpy(g_screen_ptr, menu_bg_buffer, 320*240*2);
 }
 
-void set_FCLK(unsigned MHZ)
+void plat_video_menu_end(void)
 {
+	gp2x_video_flip_();
 }
 
-void Disable_940(void)
+void plat_validate_config(void)
 {
+//	PicoOpt &= ~POPT_EXT_FM;
 }
 
-void gp2x_video_wait_vsync(void)
+void plat_early_init(void)
 {
 }
 
-void set_RAM_Timings(int tRC, int tRAS, int tWR, int tMRD, int tRFC, int tRP, int tRCD)
+void plat_init(void)
 {
+	realloc_screen();
+	memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
+
+	// snd
+	sndout_oss_init();
+
+	gtk_initf();
 }
 
-void set_gamma(int g100, int A_SNs_curve)
+void plat_finish(void)
 {
+	free(g_screen_ptr);
+	sndout_oss_exit();
 }
 
-void set_LCD_custom_rate(int rate)
+/* nasty */
+static void do_nothing()
 {
 }
 
-void unset_LCD_custom_rate(void)
+void *gp2x_video_flip = gp2x_video_flip_;
+void *gp2x_video_flip2 = gp2x_video_flip_;
+void *gp2x_video_changemode_ll = gp2x_video_changemode_ll_;
+void *gp2x_video_setpalette = gp2x_video_setpalette_;
+
+void *gp2x_video_RGB_setscaling = do_nothing;
+void *gp2x_video_wait_vsync = do_nothing;
+void *gp2x_set_cpuclk = do_nothing;
+void *set_lcd_custom_rate = do_nothing;
+void *unset_lcd_custom_rate = do_nothing;
+void *set_lcd_gamma = do_nothing;
+void *set_ram_timings = do_nothing;
+void *unset_ram_timings = do_nothing;
+
+/* joy */
+int gp2x_touchpad_read(int *x, int *y)
 {
+	return -1;
 }
 
-/* squidgehack.c */
-int mmuhack(void)
+/* misc */
+void spend_cycles(int c)
 {
-	return 0;
+	usleep(c/200);
 }
 
-
-int mmuunhack(void)
+int mp3_get_bitrate(FILE *f, int size)
 {
-	return 0;
+	return 128;
 }
 
+void mp3_start_play(FILE *f, int pos)
+{
+}
 
-/* misc */
-void spend_cycles(int c)
+void mp3_update(int *buffer, int length, int stereo)
 {
-	usleep(c/200);
 }
 
 /* lprintf */