notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
defaut dualshock to digital again, unless overriden
[pcsx_rearmed.git]
/
libpcsxcore
/
psxcommon.h
diff --git
a/libpcsxcore/psxcommon.h
b/libpcsxcore/psxcommon.h
index
3edab38
..
01b2a9a
100644
(file)
--- a/
libpcsxcore/psxcommon.h
+++ b/
libpcsxcore/psxcommon.h
@@
-37,6
+37,10
@@
extern "C" {
#pragma GCC diagnostic ignored "-Wformat-overflow"
#pragma GCC diagnostic ignored "-Wstringop-truncation"
#endif
#pragma GCC diagnostic ignored "-Wformat-overflow"
#pragma GCC diagnostic ignored "-Wstringop-truncation"
#endif
+// devkitpro has uint32_t as long, unfortunately
+#ifdef _3DS
+#pragma GCC diagnostic ignored "-Wformat"
+#endif
// System includes
#include <stdio.h>
// System includes
#include <stdio.h>
@@
-108,6
+112,8
@@
extern int Log;
void __Log(char *fmt, ...);
void __Log(char *fmt, ...);
+#define CYCLE_MULT_DEFAULT 175
+
typedef struct {
char Gpu[MAXPATHLEN];
char Spu[MAXPATHLEN];
typedef struct {
char Gpu[MAXPATHLEN];
char Spu[MAXPATHLEN];
@@
-115,7
+121,7
@@
typedef struct {
char Pad1[MAXPATHLEN];
char Pad2[MAXPATHLEN];
char Net[MAXPATHLEN];
char Pad1[MAXPATHLEN];
char Pad2[MAXPATHLEN];
char Net[MAXPATHLEN];
- char Sio1[MAXPATHLEN];
+
char Sio1[MAXPATHLEN];
char Mcd1[MAXPATHLEN];
char Mcd2[MAXPATHLEN];
char Bios[MAXPATHLEN];
char Mcd1[MAXPATHLEN];
char Mcd2[MAXPATHLEN];
char Bios[MAXPATHLEN];
@@
-123,7
+129,6
@@
typedef struct {
char PluginsDir[MAXPATHLEN];
char PatchesDir[MAXPATHLEN];
boolean Xa;
char PluginsDir[MAXPATHLEN];
char PatchesDir[MAXPATHLEN];
boolean Xa;
- boolean Sio;
boolean Mdec;
boolean PsxAuto;
boolean Cdda;
boolean Mdec;
boolean PsxAuto;
boolean Cdda;
@@
-133,17
+138,22
@@
typedef struct {
boolean SlowBoot;
boolean Debug;
boolean PsxOut;
boolean SlowBoot;
boolean Debug;
boolean PsxOut;
- boolean SpuIrq;
- boolean RCntFix;
boolean UseNet;
boolean UseNet;
- boolean VSyncWA;
boolean icache_emulation;
boolean DisableStalls;
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
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;
+ boolean dualshock_init_analog;
+ } hacks;
} PcsxConfig;
extern PcsxConfig Config;
} PcsxConfig;
extern PcsxConfig Config;
@@
-163,10
+173,6
@@
extern struct PcsxSaveFuncs SaveFuncs;
if (Mode == 0) SaveFuncs.read(f, ptr, size); \
}
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 {
#define PSXCLK 33868800 /* 33.8688 MHz */
enum {