X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.h;h=be3e5bfe938e42f3e7d5647bd3938f5a5b12e59a;hb=902972d1c7f353aebb17a5ab587b2526e1a45d60;hp=5b695ef9171bdd93f7d11196896ee5ff029570a0;hpb=2f3ca01638b740bc8ca5530dac8f3e2d2e069cb1;p=libpicofe.git

diff --git a/common/emu.h b/common/emu.h
index 5b695ef..be3e5bf 100644
--- a/common/emu.h
+++ b/common/emu.h
@@ -28,11 +28,9 @@ extern int g_screen_height;
 #define EOPT_GZIP_SAVES   (1<<3)
 #define EOPT_MMUHACK      (1<<4)
 #define EOPT_NO_AUTOSVCFG (1<<5)
-#define EOPT_16BPP        (1<<7)
+#define EOPT_16BPP        (1<<7)  // depreceted for .renderer
 #define EOPT_RAM_TIMINGS  (1<<8)
-#define EOPT_CONFIRM_SAVE (1<<9)
 #define EOPT_EN_CD_LEDS   (1<<10)
-#define EOPT_CONFIRM_LOAD (1<<11)
 #define EOPT_A_SN_GAMMA   (1<<12)
 #define EOPT_VSYNC        (1<<13)
 #define EOPT_GIZ_SCANLN   (1<<14)
@@ -41,12 +39,19 @@ extern int g_screen_height;
 #define EOPT_SHOW_RTC     (1<<17)
 #define EOPT_NO_FRMLIMIT  (1<<18)
 #define EOPT_WIZ_TEAR_FIX (1<<19)
+#define EOPT_EXT_FRMLIMIT (1<<20) // no internal frame limiter (limited by snd, etc)
 
 enum {
 	EOPT_SCALE_NONE = 0,
-	EOPT_SCALE_SW_H,
-	EOPT_SCALE_HW_H,
-	EOPT_SCALE_HW_HV,
+	EOPT_SCALE_SW,
+	EOPT_SCALE_HW,
+};
+
+enum {
+	EOPT_CONFIRM_NONE = 0,
+	EOPT_CONFIRM_SAVE = 1,
+	EOPT_CONFIRM_LOAD = 2,
+	EOPT_CONFIRM_BOTH = 3,
 };
 
 typedef struct _currentConfig_t {
@@ -57,15 +62,21 @@ typedef struct _currentConfig_t {
 	int s_PicoAutoRgnOrder;
 	int s_PicoCDBuffers;
 	int Frameskip;
+	int confirm_save;
 	int CPUclock;
 	int volume;
 	int gamma;
-	int scaling;  // gp2x: 0=center, 1=hscale, 2=hvscale, 3=hsoftscale; psp: bilinear filtering
+	int scaling;  // gp2x: EOPT_SCALE_*; psp: bilinear filtering
+	int vscaling;
 	int rotation; // for UIQ
 	float scale; // psp: screen scale
 	float hscale32, hscale40; // psp: horizontal scale
 	int gamma2;  // psp: black level
 	int turbo_rate;
+	int renderer;
+	int renderer32x;
+	int filter; // pandora
+	int analog_deadzone;
 } currentConfig_t;
 
 extern currentConfig_t currentConfig, defaultConfig;
@@ -116,8 +127,9 @@ int   emu_swap_cd(const char *fname);
 int   emu_save_load_game(int load, int sram);
 void  emu_reset_game(void);
 
+void  emu_prep_defconfig(void);
 void  emu_set_defconfig(void);
-int   emu_read_config(int game, int no_defaults);
+int   emu_read_config(const char *rom_fname, int no_defaults);
 int   emu_write_config(int game);
 
 char *emu_get_save_fname(int load, int is_sram, int slot);