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

diff --git a/common/emu.h b/common/emu.h
index b503d96..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
@@ -20,19 +22,26 @@ extern int g_screen_height;
 #endif
 
 
-#define EOPT_USE_SRAM     (1<<0)
+#define EOPT_EN_SRAM      (1<<0)
 #define EOPT_SHOW_FPS     (1<<1)
 #define EOPT_EN_SOUND     (1<<2)
 #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_PSYNC        (1<<13)
+#define EOPT_VSYNC        (1<<13)
+#define EOPT_GIZ_SCANLN   (1<<14)
+#define EOPT_GIZ_DBLBUF   (1<<15)
+#define EOPT_VSYNC_MODE   (1<<16)
+#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,
@@ -42,13 +51,8 @@ enum {
 };
 
 typedef struct _currentConfig_t {
-	// char lastRomFile[512];
-	int EmuOpt;		// LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,
-					// mmuhack, no_save_cfg_on_exit, <unused>, 16_bit_mode
-					// craigix_ram, confirm_save, show_cd_leds, confirm_load
-					// A_SNs_gamma, perfect_vsync, giz_scanlines, giz_dblbuff
-					// vsync_mode, show_clock, no_frame_limitter
-	int s_PicoOpt;		// for old cfg files only
+	int EmuOpt;
+	int s_PicoOpt;
 	int s_PsndRate;
 	int s_PicoRegion;
 	int s_PicoAutoRgnOrder;
@@ -63,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;
@@ -90,39 +96,47 @@ 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);
+void  emu_loop(void);
 
-int   emu_ReloadRom(char *rom_fname);
-int   emu_SaveLoadGame(int load, int sram);
+int   emu_reload_rom(char *rom_fname);
+int   emu_swap_cd(const char *fname);
+int   emu_save_load_game(int load, int sram);
 void  emu_reset_game(void);
 
-int   emu_ReadConfig(int game, int no_defaults);
-int   emu_WriteConfig(int game);
-void  emu_packConfig(void);
-void  emu_unpackConfig(void);
-void  emu_writelrom(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);
 
-char *emu_GetSaveFName(int load, int is_sram, int slot);
-int   emu_checkSaveFile(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);
+void  emu_text_out8_rot (int x, int y, const char *text);
+void  emu_text_out16_rot(int x, int y, const char *text);
 
+void  emu_make_path(char *buff, const char *end, int size);
 void  emu_update_input(void);
-int   emu_findBios(int region, char **bios_file);
-void  emu_textOut8 (int x, int y, const char *text);
-void  emu_textOut16(int x, int y, const char *text);
-char *emu_makeRomId(void);
-void  emu_getGameName(char *str150);
-void  emu_changeFastForward(int set_on);
-void  emu_RunEventsPico(unsigned int events);
-void  emu_shutdownMCD(void);
-int   emu_cdCheck(int *pregion, char *fname_in);
+void  emu_get_game_name(char *str150);
+void  emu_set_fastforward(int set_on);
+void  emu_status_msg(const char *format, ...);
 
 #ifdef __cplusplus
 } // extern "C"