X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.h;h=5138754db92461ce61a78a38b4bcbfeafa61006c;hb=531a8f38839713938a441f9287724e5e72c492c3;hp=d63a1f0bbca95f65824b7b5f23e33da011d26032;hpb=df92fbd1f2d16f83b66a9941f7312fdfea2602ca;p=picodrive.git diff --git a/platform/common/emu.h b/platform/common/emu.h index d63a1f0..5138754 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,14 +14,8 @@ 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) @@ -65,6 +57,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,15 +74,17 @@ typedef struct _currentConfig_t { int renderer32x; int filter; // pandora int analog_deadzone; + int msh2_khz; + int ssh2_khz; } currentConfig_t; extern currentConfig_t currentConfig, defaultConfig; extern char *PicoConfigFile; -extern int rom_loaded; 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 @@ -113,14 +109,6 @@ 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);