X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fmenu.c;h=7d7ac93dc22ebe6202dd893e98d2817a8ea049f2;hb=9db6a54485501b56b0f2f5db4d093c38fe495bda;hp=b7f7b85b3310a65c096ff3248a40384e24292653;hpb=45285368c0fad43f23f90888fde16106bdc0fd52;p=picodrive.git

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index b7f7b85..7d7ac93 100644
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -1,65 +1,7 @@
-#include <time.h>
-#include "soc.h"
-#include "plat_gp2x.h"
-
-static void menu_main_plat_draw(void)
-{
-	static time_t last_bat_read = 0;
-	static int last_bat_val = -1;
-	unsigned short *bp = g_screen_ptr;
-	int bat_h = me_mfont_h * 2 / 3;
-	int i, u, w, wfill, batt_val;
-	struct tm *tmp;
-	time_t ltime;
-	char time_s[16];
-
-	if (!(currentConfig.EmuOpt & EOPT_SHOW_RTC))
-		return;
-
-	ltime = time(NULL);
-	tmp = gmtime(&ltime);
-	strftime(time_s, sizeof(time_s), "%H:%M", tmp);
-
-	text_out16(g_screen_width - me_mfont_w * 6, me_mfont_h + 2, time_s);
-
-	if (ltime - last_bat_read > 10) {
-		last_bat_read = ltime;
-		last_bat_val = batt_val = gp2x_read_battery();
-	}
-	else
-		batt_val = last_bat_val;
-
-	if (batt_val < 0 || batt_val > 100)
-		return;
-
-	/* battery info */
-	bp += (me_mfont_h * 2 + 2) * g_screen_width + g_screen_width - me_mfont_w * 3 - 3;
-	for (i = 0; i < me_mfont_w * 2; i++)
-		bp[i] = menu_text_color;
-	for (i = 0; i < me_mfont_w * 2; i++)
-		bp[i + g_screen_width * bat_h] = menu_text_color;
-	for (i = 0; i <= bat_h; i++)
-		bp[i * g_screen_width] =
-		bp[i * g_screen_width + me_mfont_w * 2] = menu_text_color;
-	for (i = 2; i < bat_h - 1; i++)
-		bp[i * g_screen_width - 1] =
-		bp[i * g_screen_width - 2] = menu_text_color;
-
-	w = me_mfont_w * 2 - 1;
-	wfill = batt_val * w / 100;
-	for (u = 1; u < bat_h; u++)
-		for (i = 0; i < wfill; i++)
-			bp[(w - i) + g_screen_width * u] = menu_text_color;
-}
+#include "../libpicofe/gp2x/plat_gp2x.h"
 
 // ------------ gfx options menu ------------
 
-static const char *mgn_aopt_gamma(menu_id id, int *offs)
-{
-	sprintf(static_buff, "%i.%02i", currentConfig.gamma / 100, currentConfig.gamma % 100);
-	return static_buff;
-}
-
 
 const char *men_scaling_opts[] = { "OFF", "software", "hardware", NULL };
 
@@ -67,16 +9,11 @@ const char *men_scaling_opts[] = { "OFF", "software", "hardware", NULL };
 	mee_enum      ("Horizontal scaling",       MA_OPT_SCALING,        currentConfig.scaling, men_scaling_opts), \
 	mee_enum      ("Vertical scaling",         MA_OPT_VSCALING,       currentConfig.vscaling, men_scaling_opts), \
 	mee_onoff     ("Tearing Fix",              MA_OPT_TEARING_FIX,    currentConfig.EmuOpt, EOPT_WIZ_TEAR_FIX), \
-	mee_range_cust("Gamma correction",         MA_OPT2_GAMMA,         currentConfig.gamma, 1, 300, mgn_aopt_gamma), \
-	mee_onoff     ("A_SN's gamma curve",       MA_OPT2_A_SN_GAMMA,    currentConfig.EmuOpt, EOPT_A_SN_GAMMA), \
+	/*mee_onoff     ("A_SN's gamma curve",       MA_OPT2_A_SN_GAMMA,    currentConfig.EmuOpt, EOPT_A_SN_GAMMA),*/ \
 	mee_onoff     ("Vsync",                    MA_OPT2_VSYNC,         currentConfig.EmuOpt, EOPT_VSYNC),
 
 #define MENU_OPTIONS_ADV \
 	mee_onoff     ("Use second CPU for sound", MA_OPT_ARM940_SOUND,   PicoOpt, POPT_EXT_FM), \
-	mee_onoff     ("RAM overclock",            MA_OPT2_RAMTIMINGS,    currentConfig.EmuOpt, EOPT_RAM_TIMINGS), \
-	mee_onoff     ("MMU hack",                 MA_OPT2_SQUIDGEHACK,   currentConfig.EmuOpt, EOPT_MMUHACK), \
-	mee_onoff     ("SVP dynarec",              MA_OPT2_SVP_DYNAREC,   PicoOpt, POPT_EN_SVP_DRC), \
-	mee_onoff     ("Status line in main menu", MA_OPT2_STATUS_LINE,   currentConfig.EmuOpt, EOPT_SHOW_RTC),
 
 
 static menu_entry e_menu_adv_options[];
@@ -86,12 +23,6 @@ static menu_entry e_menu_keyconfig[];
 
 void gp2x_menu_init(void)
 {
-	static menu_entry *cpu_clk_ent;
-	int i;
-
-	i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
-	cpu_clk_ent = &e_menu_options[i];
-
 	/* disable by default.. */
 	me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);
 	me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);
@@ -103,22 +34,16 @@ void gp2x_menu_init(void)
 		me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 1);
 		me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 1);
 		me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 1);
-		cpu_clk_ent->name = "GP2X CPU clocks";
 		break;
 	case GP2X_DEV_WIZ:
 		me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 1);
-		cpu_clk_ent->name = "Wiz/Caanoo CPU clock";
 		break;
 	case GP2X_DEV_CAANOO:
-		cpu_clk_ent->name = "Wiz/Caanoo CPU clock";
 		break;
 	default:
 		break;
 	}
 
-	if (gp2x_set_cpuclk == NULL)
-		cpu_clk_ent->name = "";
-
 	if (gp2x_dev_id != GP2X_DEV_GP2X)
 		men_scaling_opts[2] = NULL; /* leave only off and sw */