summaryrefslogtreecommitdiff
path: root/libpcsxcore
diff options
context:
space:
mode:
authoriCatButler <i.am.catbutler@gmail.com>2016-05-15 09:10:10 +0100
committeriCatButler <i.am.catbutler@gmail.com>2016-05-15 09:10:10 +0100
commit6a9f87865f525a4b368330ebb28e6936493e0e72 (patch)
treed510d647188c27b08a1324a9506bc8de6e811e28 /libpcsxcore
parentb5a738748175a460f856a1ed8a2e29fa26ebfb14 (diff)
downloadpcsxr-6a9f87865f525a4b368330ebb28e6936493e0e72.tar.gz
Define and initialise PsxClockSpeed
- Fixes crash on entering bios
Diffstat (limited to 'libpcsxcore')
-rwxr-xr-xlibpcsxcore/psxcommon.c3
-rwxr-xr-xlibpcsxcore/psxcommon.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/libpcsxcore/psxcommon.c b/libpcsxcore/psxcommon.c
index 753222d2..a60aa48b 100755
--- a/libpcsxcore/psxcommon.c
+++ b/libpcsxcore/psxcommon.c
@@ -34,6 +34,9 @@ FILE *emuLog = NULL;
u32 rewind_counter=0;
u8 vblank_count_hideafter=0;
+// Used for overclocking
+u32 PsxClockSpeed = 33868800;
+
int EmuInit() {
return psxInit();
}
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 2b75bef4..13e6c1ab 100755
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -187,7 +187,7 @@ extern u8 vblank_count_hideafter;
// 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
-u32 PsxClockSpeed;
+extern u32 PsxClockSpeed;
#define BIAS 2
#define PSXCLK PsxClockSpeed /* 33.8688 MHz */