X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.h;h=9a5ae660253d9dd2fd1cba91c5d967ec121f56f2;hb=31fbc691a10d9d3119fed9624ffcbd1a52784502;hp=4d2f17d4787deefe281426de0e8229a736dc7f98;hpb=4c2e35547fd6f849648234989419a4a02d2546b4;p=picodrive.git

diff --git a/platform/common/emu.h b/platform/common/emu.h
index 4d2f17d..9a5ae66 100644
--- a/platform/common/emu.h
+++ b/platform/common/emu.h
@@ -6,8 +6,6 @@
  * See COPYING file in the top-level directory.
  */
 
-#include "port_config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -16,23 +14,15 @@ extern "C" {
 
 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_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)  // depreceted for .renderer
-#define EOPT_RAM_TIMINGS  (1<<8)
 #define EOPT_EN_CD_LEDS   (1<<10)
 #define EOPT_A_SN_GAMMA   (1<<12)
 #define EOPT_VSYNC        (1<<13)
@@ -65,6 +55,8 @@ typedef struct _currentConfig_t {
 	int s_PicoAutoRgnOrder;
 	int s_PicoCDBuffers;
 	int Frameskip;
+	int input_dev0;
+	int input_dev1;
 	int confirm_save;
 	int CPUclock;
 	int volume;
@@ -80,14 +72,18 @@ typedef struct _currentConfig_t {
 	int renderer32x;
 	int filter; // pandora
 	int analog_deadzone;
+	int msh2_khz;
+	int ssh2_khz;
+	int overclock_68k;
 } currentConfig_t;
 
 extern currentConfig_t currentConfig, defaultConfig;
-extern char *PicoConfigFile;
+extern const char *PicoConfigFile;
 extern int state_slot;
 extern int config_slot, config_slot_current;
 extern unsigned char *movie_data;
 extern int reset_timing;
+extern int flip_after_sync;
 
 #define PICO_PEN_ADJUST_X 4
 #define PICO_PEN_ADJUST_Y 2
@@ -126,7 +122,7 @@ void  emu_set_defconfig(void);
 int   emu_read_config(const char *rom_fname, int no_defaults);
 int   emu_write_config(int game);
 
-char *emu_get_save_fname(int load, int is_sram, int slot);
+char *emu_get_save_fname(int load, int is_sram, int slot, int *time);
 int   emu_check_save_file(int slot, int *time);
 
 void  emu_text_out8 (int x, int y, const char *text);
@@ -134,6 +130,8 @@ 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_osd_text16(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);