X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.h;h=667b6c2548df10e5e1c762cd9d8fcae76a2b8bed;hb=00faec9cdbc073199fa984a0450e1a961994b058;hp=b5d34f34550fe050c3b2e5cfc78e4a28754df3d7;hpb=0c720b9144eefaa55c654035a046e52c42126053;p=picodrive.git

diff --git a/pico/pico.h b/pico/pico.h
index b5d34f3..667b6c2 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -212,18 +212,24 @@ extern unsigned short *PicoCramHigh; // pointer to CRAM buff (0x40 shorts), conv
 extern void (*PicoPrepareCram)();    // prepares PicoCramHigh for renderer to use
 
 // pico.c (32x)
-// multipliers against 68k clock (7670442)
-// normally * 3, but effectively slower due to high latencies everywhere
-// however using something lower breaks MK2 animations
-extern int p32x_msh2_multiplier;
-extern int p32x_ssh2_multiplier;
-#define SH2_MULTI_SHIFT 10
-#define MSH2_MULTI_DEFAULT ((1 << SH2_MULTI_SHIFT) * 3)
-#define SSH2_MULTI_DEFAULT ((1 << SH2_MULTI_SHIFT) * 3)
+#ifndef NO_32X
+
+void Pico32xSetClocks(int msh2_hz, int ssh2_hz);
 
 // 32x/draw.c
 void PicoDraw32xSetFrameMode(int is_on, int only_32x);
 
+#else
+
+#define Pico32xSetClocks(msh2_khz, ssh2_khz)
+
+#endif
+
+// normally 68k clock (7670442) * 3, in reality but much lower
+// because of high memory latencies
+#define PICO_MSH2_HZ ((int)(7670442.0 * 2.4))
+#define PICO_SSH2_HZ ((int)(7670442.0 * 2.4))
+
 // sound.c
 extern int PsndRate,PsndLen;
 extern short *PsndOut;