X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fgp2x.c;h=daf18fe2b45cb30c971e67c995cac8134e2ec828;hb=046c454067c66b783417f4a61ab1445d06412d66;hp=ca915bc133915a1e0dd3e889716caf3771fd3868;hpb=fa8d133192876a802fbac43c0a0bfe4f5f85b682;p=libpicofe.git

diff --git a/linux/gp2x.c b/linux/gp2x.c
index ca915bc..daf18fe 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"
@@ -28,6 +28,8 @@ static int scr_changed = 0, scr_w = SCREEN_WIDTH, scr_h = SCREEN_HEIGHT;
 
 // dummies
 int mix_32_to_16l_level;
+int crashed_940 = 0;
+int default_cpu_clock = 123;
 
 /* gtk */
 struct gtk_global_struct
@@ -210,29 +212,8 @@ static void realloc_screen(void)
 	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);
-}
-
-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,65 +269,124 @@ void gp2x_video_flip(void)
 		realloc_screen();
 }
 
-void gp2x_video_flip2(void)
+static void gp2x_video_changemode_ll_(int bpp)
+{
+	current_bpp = bpp;
+}
+
+static void gp2x_video_setpalette_(int *pal, int len)
 {
-	gp2x_video_flip();
+	memcpy(current_pal, pal, len*4);
+}
+
+void gp2x_memcpy_all_buffers(void *data, int offset, int len)
+{
+}
+
+void gp2x_memset_all_buffers(int offset, int byte, int len)
+{
+	memset((char *)g_screen_ptr + offset, byte, len);
 }
 
 void gp2x_video_changemode(int bpp)
 {
-	current_bpp = bpp;
+	gp2x_video_changemode_ll_(bpp);
 }
 
-void gp2x_video_changemode2(int bpp)
+void gp2x_make_fb_bufferable(int yes)
 {
-	current_bpp = bpp;
 }
 
-void gp2x_video_setpalette(int *pal, int len)
+int soc_detect(void)
 {
-	memcpy(current_pal, pal, len*4);
+	return 0;
 }
 
-void gp2x_video_RGB_setscaling(int v_offs, int W, int H)
+/* 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
+	{
+		// should really only happen once, on startup..
+		readpng(g_screen_ptr, "skin/background.png", READPNG_BG);
+	}
+
+	memcpy(menu_bg_buffer, g_screen_ptr, 320*240*2);
+
+	// switch to 16bpp
+	gp2x_video_changemode_ll_(16);
+	gp2x_video_flip_();
 }
 
-void gp2x_memset_all_buffers(int offset, int byte, int len)
+void plat_video_menu_begin(void)
 {
-	memset((char *)g_screen_ptr + offset, byte, len);
+	memcpy(g_screen_ptr, menu_bg_buffer, 320*240*2);
 }
 
-/* joy */
-int gp2x_touchpad_read(int *x, int *y)
+void plat_video_menu_end(void)
 {
-	return -1;
+	gp2x_video_flip_();
 }
 
-/* 940 */
-int crashed_940 = 0;
-void pause940(int yes)
+void plat_validate_config(void)
 {
+//	PicoOpt &= ~POPT_EXT_FM;
 }
 
-void reset940(int yes, int bank)
+void plat_early_init(void)
 {
 }
 
-void gp2x_video_wait_vsync(void)
+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;
 }
 
 /* misc */
@@ -355,6 +395,19 @@ void spend_cycles(int c)
 	usleep(c/200);
 }
 
+int mp3_get_bitrate(FILE *f, int size)
+{
+	return 128;
+}
+
+void mp3_start_play(FILE *f, int pos)
+{
+}
+
+void mp3_update(int *buffer, int length, int stereo)
+{
+}
+
 /* lprintf */
 void lprintf(const char *fmt, ...)
 {