X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.h;h=75a5abe3e2516650e5008040dc3d002a2383cdf6;hb=8b8d9463fa57d3165a50923e665888d1353c3eec;hp=518d5fdd0db857208b773dbe050cd76ca9f140e3;hpb=662e622b59369f975691a70756f80188d8d27ea0;p=libpicofe.git

diff --git a/common/emu.h b/common/emu.h
index 518d5fd..75a5abe 100644
--- a/common/emu.h
+++ b/common/emu.h
@@ -30,9 +30,7 @@ extern int g_screen_height;
 #define EOPT_NO_AUTOSVCFG (1<<5)
 #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)
@@ -45,9 +43,15 @@ extern int g_screen_height;
 
 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 {
@@ -58,10 +62,12 @@ 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
@@ -69,6 +75,8 @@ typedef struct _currentConfig_t {
 	int turbo_rate;
 	int renderer;
 	int renderer32x;
+	int filter; // pandora
+	int analog_deadzone;
 } currentConfig_t;
 
 extern currentConfig_t currentConfig, defaultConfig;
@@ -121,11 +129,11 @@ 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);
-int   emu_check_save_file(int slot);
+int   emu_check_save_file(int slot, int *time);
 
 void  emu_text_out8 (int x, int y, const char *text);
 void  emu_text_out16(int x, int y, const char *text);
@@ -138,6 +146,9 @@ void  emu_get_game_name(char *str150);
 void  emu_set_fastforward(int set_on);
 void  emu_status_msg(const char *format, ...);
 
+/* used by some (but not all) platforms */
+void  emu_cmn_forced_frame(int no_scale, int do_emu);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif