X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.h;h=9a5ae660253d9dd2fd1cba91c5d967ec121f56f2;hb=35f2b65ef708e7afc922ceda8d00b716de289610;hp=ae8e4d78f89897f90cee41807a06a7ae9bf2eab7;hpb=cff531af94bd9c9c89ae162e80f48ddc26a4e504;p=picodrive.git

diff --git a/platform/common/emu.h b/platform/common/emu.h
index ae8e4d7..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,22 +72,25 @@ 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 int rom_loaded;
+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
 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
+extern const char *rom_fname_reload;		// ROM to try loading on next PGS_ReloadRom
 extern char rom_fname_loaded[512];		// currently loaded ROM filename
 
 // engine states
@@ -113,19 +108,11 @@ enum TPicoGameState {
 	PGS_SuspendWake,	/* PSP */
 };
 
-// media types
-enum {
-	PM_BAD = 0,
-	PM_MD_CART,	/* also 32x */
-	PM_MARK3,
-	PM_CD,
-};
-
 void  emu_init(void);
 void  emu_finish(void);
 void  emu_loop(void);
 
-int   emu_reload_rom(char *rom_fname);
+int   emu_reload_rom(const char *rom_fname_in);
 int   emu_swap_cd(const char *fname);
 int   emu_save_load_game(int load, int sram);
 void  emu_reset_game(void);
@@ -135,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);
@@ -143,12 +130,19 @@ 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);
 void  emu_set_fastforward(int set_on);
 void  emu_status_msg(const char *format, ...);
 
+/* default sound code */
+void  emu_sound_start(void);
+void  emu_sound_stop(void);
+void  emu_sound_wait(void);
+
 /* used by some (but not all) platforms */
 void  emu_cmn_forced_frame(int no_scale, int do_emu);
 
@@ -164,8 +158,6 @@ void pemu_forced_frame(int no_scale, int do_emu); // ..to g_menubg_src_ptr
 void pemu_finalize_frame(const char *fps, const char *notice_msg);
 
 void pemu_sound_start(void);
-void pemu_sound_stop(void);
-void pemu_sound_wait(void);
 
 void plat_early_init(void);
 void plat_init(void);
@@ -177,6 +169,7 @@ void plat_status_msg_busy_next(const char *msg);
 void plat_status_msg_clear(void);
 
 void plat_video_toggle_renderer(int change, int menu_call);
+void plat_video_loop_prepare(void);
 
 void plat_update_volume(int has_changed, int is_up);