X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=pico%2Fpico.h;h=0422dfd9a5da034100cd3c1c765b02eacb6fd1b4;hb=1555935b8acc47fab7ba550caaec3e395b3f95be;hp=6c6e7c5112eb30f274fb78f8bd69ee5d905f8591;hpb=2446536be520914616403876d7e49621ac6f4b95;p=picodrive.git

diff --git a/pico/pico.h b/pico/pico.h
index 6c6e7c5..0422dfd 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -12,9 +12,6 @@
 
 #include <stdlib.h> // size_t
 
-// port-specific compile-time settings
-#include <port_config.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -37,6 +34,7 @@ extern void cache_flush_d_inval_i(void *start_addr, void *end_addr);
 extern void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed);
 extern void *plat_mremap(void *ptr, size_t oldsize, size_t newsize);
 extern void  plat_munmap(void *ptr, size_t size);
+extern int   plat_mem_set_exec(void *ptr, size_t size);
 
 // this one should handle display mode changes
 extern void emu_video_mode_change(int start_line, int line_count, int is_32cols);
@@ -170,7 +168,7 @@ typedef enum
 	PDF_RGB555,      // RGB/BGR output, depends on compile options
 	PDF_8BIT,        // 8-bit out (handles shadow/hilight mode, sonic water)
 } pdso_t;
-void PicoDrawSetOutFormat(pdso_t which, int allow_32x);
+void PicoDrawSetOutFormat(pdso_t which, int use_32x_line_mode);
 void PicoDrawSetOutBuf(void *dest, int increment);
 void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned int num));
 extern void *DrawLineDest;
@@ -211,15 +209,20 @@ 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
-extern int p32x_msh2_multiplier;
-extern int p32x_ssh2_multiplier;
-#define SH2_MULTI_SHIFT 10
-#define MSH2_MULTI_DEFAULT ((1 << SH2_MULTI_SHIFT) * 21 / 10)
-#define SSH2_MULTI_DEFAULT ((1 << SH2_MULTI_SHIFT) * 3 / 2)
-
-// 32x/draw.c
-void PicoDraw32xSetFrameMode(int is_on, int only_32x);
+#ifndef NO_32X
+
+void Pico32xSetClocks(int msh2_hz, int ssh2_hz);
+
+#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;