X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.h;h=56b7597207a991f96c8a4a132c403722dcab9bd1;hb=8e77275edade55d89b0723a60ab4ef1e2ec288de;hp=b9bedff7d0aa6fc5c341f912f8b68d96d56dca7a;hpb=2c60056042e94007286e3e0e1789f4c9a78b7731;p=libpicofe.git

diff --git a/common/emu.h b/common/emu.h
index b9bedff..56b7597 100644
--- a/common/emu.h
+++ b/common/emu.h
@@ -20,16 +20,31 @@ 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_PSYNC        (1<<13)
+
+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
+					// 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
@@ -40,12 +55,8 @@ typedef struct _currentConfig_t {
 	int s_PicoCDBuffers;
 	int Frameskip;
 	int CPUclock;
-	int KeyBinds[PLAT_MAX_KEYS];
 	int volume;
 	int gamma;
-#if PLAT_HAVE_JOY
-	int JoyBinds[4][32];
-#endif
 	int scaling;  // gp2x: 0=center, 1=hscale, 2=hvscale, 3=hsoftscale; psp: bilinear filtering
 	int rotation; // for UIQ
 	float scale; // psp: screen scale
@@ -57,10 +68,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
@@ -81,27 +96,27 @@ 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_init(void);
+void  emu_finish(void);
+
+int   emu_reload_rom(char *rom_fname);
+int   emu_save_load_game(int load, int sram);
+void  emu_reset_game(void);
+
+int   emu_read_config(int game, int no_defaults);
+int   emu_write_config(int game);
 void  emu_writelrom(void);
-char *emu_GetSaveFName(int load, int is_sram, int slot);
-int   emu_checkSaveFile(int slot);
+
+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_update_input(void);
 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_get_game_name(char *str150);
+void  emu_set_fastforward(int set_on);
+int   emu_cd_check(int *pregion, char *fname_in);
 
 #ifdef __cplusplus
 } // extern "C"