X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.h;h=2f5357af9530c948052a34509aa6f438fa14b6e4;hb=4bd165c8d8bce1946558c22bcb9a001754115d81;hp=412022da7a202a72070932c61a505587b9f3c852;hpb=82abf46f3db8ade517881c03327bdbc0de848eb2;p=libpicofe.git

diff --git a/common/emu.h b/common/emu.h
index 412022d..2f5357a 100644
--- a/common/emu.h
+++ b/common/emu.h
@@ -20,20 +20,36 @@ 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_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)
+#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)
+
+enum {
+	EOPT_SCALE_NONE = 0,
+	EOPT_SCALE_SW_H,
+	EOPT_SCALE_HW_H,
+	EOPT_SCALE_HW_HV,
+};
 
 typedef struct _currentConfig_t {
-	// char lastRomFile[512];
-	int EmuOpt;		// LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,
-					// squidgehack, 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;
@@ -53,10 +69,14 @@ typedef struct _currentConfig_t {
 extern currentConfig_t currentConfig, defaultConfig;
 extern char *PicoConfigFile;
 extern int rom_loaded;
-extern char noticeMsg[64];
 extern int state_slot;
 extern int config_slot, config_slot_current;
 extern unsigned char *movie_data;
+extern int reset_timing;
+
+#define PICO_PEN_ADJUST_X 4
+#define PICO_PEN_ADJUST_Y 2
+extern int pico_pen_x, pico_pen_y;
 extern int pico_inp_mode;
 
 extern char rom_fname_reload[512];		// ROM to try loading on next PGS_ReloadRom
@@ -77,27 +97,33 @@ enum TPicoGameState {
 };
 
 
-int   emu_ReloadRom(char *rom_fname);
-int   emu_SaveLoadGame(int load, int sram);
-int   emu_ReadConfig(int game, int no_defaults);
-int   emu_WriteConfig(int game);
-void  emu_writelrom(void);
-char *emu_GetSaveFName(int load, int is_sram, int slot);
-int   emu_checkSaveFile(int slot);
+void  emu_init(void);
+void  emu_finish(void);
+void  emu_loop(void);
+
+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);
+
+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_updateMovie(void);
-int   emu_cdCheck(int *pregion, char *fname_in);
-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_DoTurbo(int *pad, int acts);
-void  emu_packConfig(void);
-void  emu_unpackConfig(void);
-void  emu_shutdownMCD(void);
+
+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);
+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"