X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxcommon.h;h=9f5444ec4c78fbe91cce8b2d09de96bf43c7bfdb;hb=HEAD;hp=a549eb67e145373686e69dd6a1414051886d877a;hpb=d014a47167b28b19f87546bca0b0c53f08b1daff;p=pcsx_rearmed.git diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h index a549eb67..53bda973 100644 --- a/libpcsxcore/psxcommon.h +++ b/libpcsxcore/psxcommon.h @@ -51,7 +51,9 @@ extern "C" { #include #include #include +#ifndef __SWITCH__ #include +#endif #include // Define types @@ -110,6 +112,8 @@ extern int Log; void __Log(char *fmt, ...); +#define CYCLE_MULT_DEFAULT 175 + typedef struct { char Gpu[MAXPATHLEN]; char Spu[MAXPATHLEN]; @@ -117,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]; @@ -128,18 +132,30 @@ typedef struct { boolean Mdec; boolean PsxAuto; boolean Cdda; + boolean AsyncCD; boolean CHD_Precache; /* loads disk image into memory, works with CHD only. */ boolean HLE; + boolean SlowBoot; boolean Debug; boolean PsxOut; boolean UseNet; boolean icache_emulation; boolean DisableStalls; + boolean PreciseExceptions; + int cycle_multiplier; // 100 for 1.0 + int cycle_multiplier_override; + s8 GpuListWalking; + s8 FractionalFramerate; // ~49.75 and ~59.81 instead of 50 and 60 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_centering; + boolean dualshock_init_analog; + boolean gpu_timing1024; + boolean fractional_Framerate; + } hacks; } PcsxConfig; extern PcsxConfig Config; @@ -159,10 +175,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 {