gp2x+wiz binary support, wiz code wip

[picodrive.git] / platform / common / emu.h

diff --git a/platform/common/emu.h b/platform/common/emu.h
index 516c77f..808bcb0 100644 (file)
--- a/platform/common/emu.h
+++ b/platform/common/emu.h
@@ -9,16 +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
@@ -29,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
@@ -50,7 +68,6 @@ extern char noticeMsg[64];
 extern int state_slot;
 extern int config_slot, config_slot_current;
 extern unsigned char *movie_data;
-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
@@ -86,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);