X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.h;h=518d5fdd0db857208b773dbe050cd76ca9f140e3;hb=82d64b3a5ff89b5b44a2b1b901dcee4326a97af7;hp=2f5357af9530c948052a34509aa6f438fa14b6e4;hpb=f71361b521c9c64351ea99ed97627a606c642008;p=libpicofe.git

diff --git a/common/emu.h b/common/emu.h
index 2f5357a..518d5fd 100644
--- a/common/emu.h
+++ b/common/emu.h
@@ -9,6 +9,8 @@
 extern "C" {
 #endif
 
+#define array_size(x) (sizeof(x) / sizeof(x[0]))
+
 extern void *g_screen_ptr;
 
 #if SCREEN_SIZE_FIXED
@@ -26,7 +28,7 @@ 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)
@@ -39,6 +41,7 @@ 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,
@@ -64,6 +67,8 @@ typedef struct _currentConfig_t {
 	float hscale32, hscale40; // psp: horizontal scale
 	int gamma2;  // psp: black level
 	int turbo_rate;
+	int renderer;
+	int renderer32x;
 } currentConfig_t;
 
 extern currentConfig_t currentConfig, defaultConfig;
@@ -91,11 +96,19 @@ enum TPicoGameState {
 	PGS_KeyConfig,
 	PGS_ReloadRom,
 	PGS_Menu,
+	PGS_TrayMenu,
 	PGS_RestartRun,
 	PGS_Suspending,		/* PSP */
 	PGS_SuspendWake,	/* PSP */
 };
 
+// media types
+enum {
+	PM_BAD = 0,
+	PM_MD_CART,	/* also 32x */
+	PM_MARK3,
+	PM_CD,
+};
 
 void  emu_init(void);
 void  emu_finish(void);
@@ -106,13 +119,13 @@ 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_write_config(int game);
 
 char *emu_get_save_fname(int load, int is_sram, int slot);
 int   emu_check_save_file(int slot);
-void  emu_setSaveStateCbs(int gz);
 
 void  emu_text_out8 (int x, int y, const char *text);
 void  emu_text_out16(int x, int y, const char *text);