X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=common%2Femu.h;h=808bcb02b6ec0838a7d30bda212a63b1999d00a2;hb=fa8d133192876a802fbac43c0a0bfe4f5f85b682;hp=e05f365baee2759c19a81b12afd77d0dc9ad68b4;hpb=725d7f6c16b396ad3c7f98175cc20289c5241f3a;p=libpicofe.git

diff --git a/common/emu.h b/common/emu.h
index e05f365..808bcb0 100644
--- a/common/emu.h
+++ b/common/emu.h
@@ -9,15 +9,38 @@
 extern "C" {
 #endif
 
+extern void *g_screen_ptr;
+
+#if SCREEN_SIZE_FIXED
+#define g_screen_width  SCREEN_WIDTH
+#define g_screen_height SCREEN_HEIGHT
+#else
+extern int g_screen_width;
+extern int g_screen_height;
+#endif
+
+
 #define EOPT_USE_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_RAM_TIMINGS  (1<<8)
+#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
@@ -28,12 +51,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
@@ -49,15 +68,31 @@ extern char noticeMsg[64];
 extern int state_slot;
 extern int config_slot, config_slot_current;
 extern unsigned char *movie_data;
-extern char loadedRomFName[512];		// last loaded ROM filename
-extern int kb_combo_keys, kb_combo_acts;	// keys and actions which need button combos
 extern int pico_inp_mode;
 
+extern char rom_fname_reload[512];		// ROM to try loading on next PGS_ReloadRom
+extern char rom_fname_loaded[512];		// currently loaded ROM filename
+
+// engine states
+extern int engineState;
+enum TPicoGameState {
+	PGS_Paused = 1,
+	PGS_Running,
+	PGS_Quit,
+	PGS_KeyConfig,
+	PGS_ReloadRom,
+	PGS_Menu,
+	PGS_RestartRun,
+	PGS_Suspending,		/* PSP */
+	PGS_SuspendWake,	/* PSP */
+};
+
 
 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_setSaveStateCbs(int gz);
@@ -68,7 +103,6 @@ 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_findKeyBindCombos(void);
 void  emu_changeFastForward(int set_on);
 void  emu_RunEventsPico(unsigned int events);
 void  emu_DoTurbo(int *pad, int acts);
@@ -76,15 +110,6 @@ void  emu_packConfig(void);
 void  emu_unpackConfig(void);
 void  emu_shutdownMCD(void);
 
-/* not in common */
-extern const char * const keyNames[];
-void  emu_prepareDefaultConfig(void);
-void  emu_platformDebugCat(char *str);
-void  emu_forcedFrame(int opts);
-void  emu_startSound(void);
-void  emu_endSound(void);
-void  emu_waitSound(void);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif