X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxcommon.h;h=09fb39a4e34c0671a288172b58f89070b62dc289;hb=ebcd59b7ac1170dda42b7352ffdc1289f60ad174;hp=a57194c03383161887c7d0081f1eb03cae76c22e;hpb=840639a54563490c3e0287b4536d40a5ae761bc1;p=pcsx_rearmed.git diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h index a57194c0..09fb39a4 100644 --- a/libpcsxcore/psxcommon.h +++ b/libpcsxcore/psxcommon.h @@ -112,6 +112,8 @@ extern int Log; void __Log(char *fmt, ...); +#define CYCLE_MULT_DEFAULT 175 + typedef struct { char Gpu[MAXPATHLEN]; char Spu[MAXPATHLEN]; @@ -119,7 +121,7 @@ typedef struct { char Pad1[MAXPATHLEN]; char Pad2[MAXPATHLEN]; char Net[MAXPATHLEN]; - char Sio1[MAXPATHLEN]; + char Sio1[MAXPATHLEN]; char Mcd1[MAXPATHLEN]; char Mcd2[MAXPATHLEN]; char Bios[MAXPATHLEN]; @@ -139,11 +141,18 @@ typedef struct { boolean UseNet; boolean icache_emulation; boolean DisableStalls; + boolean PreciseExceptions; + int GpuListWalking; + int cycle_multiplier; // 100 for 1.0 + int cycle_multiplier_override; u8 Cpu; // CPU_DYNAREC or CPU_INTERPRETER u8 PsxType; // PSX_TYPE_NTSC or PSX_TYPE_PAL -#ifdef _WIN32 - char Lang[256]; -#endif + struct { + boolean cdr_read_timing; + boolean gpu_slow_list_walking; + boolean gpu_busy; + boolean gpu_centering; + } hacks; } PcsxConfig; extern PcsxConfig Config; @@ -163,10 +172,6 @@ extern struct PcsxSaveFuncs SaveFuncs; if (Mode == 0) SaveFuncs.read(f, ptr, size); \ } -// Make the timing events trigger faster as we are currently assuming everything -// takes one cycle, which is not the case on real hardware. -// FIXME: Count the proper cycle and get rid of this -#define BIAS 2 #define PSXCLK 33868800 /* 33.8688 MHz */ enum {