aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutechre2020-10-21 12:46:59 +0200
committerGitHub2020-10-21 12:46:59 +0200
commitc1a850c86c0f569ebc4570b6b94a3e5b08ccb575 (patch)
tree14a6d38b403bbcf92f8e8f5f59b664d6ea4bbb34
parent81040ceeaeac0a3dcb3e65798ff86f17ef9e37b9 (diff)
parent93c9e42aa5323ad40cf65b7ea11c54e5616d8624 (diff)
downloadpcsx_rearmed-c1a850c86c0f569ebc4570b6b94a3e5b08ccb575.tar.gz
pcsx_rearmed-c1a850c86c0f569ebc4570b6b94a3e5b08ccb575.tar.bz2
pcsx_rearmed-c1a850c86c0f569ebc4570b6b94a3e5b08ccb575.zip
Merge pull request #459 from libretro/revert-458-fixes-for-rpi-compilation
Revert "fixes link time errors on the RPi platform (tested with 3 and 4)"
-rw-r--r--libpcsxcore/psxcounters.c4
-rw-r--r--libpcsxcore/psxcounters.h1
-rw-r--r--libpcsxcore/r3000a.c1
3 files changed, 4 insertions, 2 deletions
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 2dd7d89..bebec87 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -70,6 +70,8 @@ static const s32 VerboseLevel = VERBOSE_LEVEL;
/******************************************************************************/
+Rcnt rcnts[ CounterQuantity ];
+
u32 hSyncCount = 0;
u32 frame_counter = 0;
static u32 hsync_steps = 0;
@@ -494,7 +496,7 @@ s32 psxRcntFreeze( void *f, s32 Mode )
u32 count;
s32 i;
- gzfreeze( &rcnts, sizeof(*rcnts) * CounterQuantity );
+ gzfreeze( &rcnts, sizeof(rcnts) );
gzfreeze( &hSyncCount, sizeof(hSyncCount) );
gzfreeze( &spuSyncCount, sizeof(spuSyncCount) );
gzfreeze( &psxNextCounter, sizeof(psxNextCounter) );
diff --git a/libpcsxcore/psxcounters.h b/libpcsxcore/psxcounters.h
index d986435..4b7b6b4 100644
--- a/libpcsxcore/psxcounters.h
+++ b/libpcsxcore/psxcounters.h
@@ -39,7 +39,6 @@ typedef struct Rcnt
u32 rate, irq, counterState, irqState;
u32 cycle, cycleStart;
} Rcnt;
-
extern Rcnt rcnts[];
void psxRcntInit();
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index a8d2745..1118107 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -27,6 +27,7 @@
#include "gte.h"
R3000Acpu *psxCpu = NULL;
+psxRegisters psxRegs;
int psxInit() {
SysPrintf(_("Running PCSX Version %s (%s).\n"), PCSX_VERSION, __DATE__);