X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=blobdiff_plain;f=pico%2Fpico.h;h=527498ee2a358d25237fb867691400cc63f8562c;hp=6c6e7c5112eb30f274fb78f8bd69ee5d905f8591;hb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;hpb=2446536be520914616403876d7e49621ac6f4b95

diff --git a/pico/pico.h b/pico/pico.h
index 6c6e7c5..527498e 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);
@@ -54,7 +52,7 @@ extern void *p32x_bios_g, *p32x_bios_m, *p32x_bios_s;
 #define POPT_EN_Z80         (1<< 2)
 #define POPT_EN_STEREO      (1<< 3)
 #define POPT_ALT_RENDERER   (1<< 4) // 00 00x0
-#define POPT_6BTN_PAD       (1<< 5)
+// unused                   (1<< 5)
 // unused                   (1<< 6)
 #define POPT_ACC_SPRITES    (1<< 7)
 #define POPT_DIS_32C_BORDER (1<< 8) // 00 0x00
@@ -62,11 +60,11 @@ extern void *p32x_bios_g, *p32x_bios_m, *p32x_bios_s;
 #define POPT_EN_MCD_PCM     (1<<10)
 #define POPT_EN_MCD_CDDA    (1<<11)
 #define POPT_EN_MCD_GFX     (1<<12) // 00 x000
-#define POPT_EN_MCD_PSYNC   (1<<13)
+// unused                   (1<<13)
 #define POPT_EN_SOFTSCALE   (1<<14)
 #define POPT_EN_MCD_RAMCART (1<<15)
 #define POPT_DIS_VDP_FIFO   (1<<16) // 0x 0000
-#define POPT_EN_SVP_DRC     (1<<17)
+#define POPT_EN_DRC         (1<<17)
 #define POPT_DIS_SPRITE_LIM (1<<18)
 #define POPT_DIS_IDLE_DET   (1<<19)
 #define POPT_EN_32X         (1<<20)
@@ -79,6 +77,10 @@ extern int PicoOpt; // bitfield
 #define PAHW_PICO (1<<3)
 #define PAHW_SMS  (1<<4)
 extern int PicoAHW;            // Pico active hw
+
+#define PQUIRK_FORCE_6BTN   (1<<0)
+extern int PicoQuirks;
+
 extern int PicoSkipFrame;      // skip rendering frame, but still do sound (if enabled) and emulation stuff
 extern int PicoRegionOverride; // override the region detection 0: auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
 extern int PicoAutoRgnOrder;   // packed priority list of regions, for example 0x148 means this detection order: EUR, USA, JAP
@@ -97,10 +99,11 @@ typedef enum { PI_ROM, PI_ISPAL, PI_IS40_CELL, PI_IS240_LINES } pint_t;
 typedef union { int vint; void *vptr; } pint_ret_t;
 void PicoGetInternal(pint_t which, pint_ret_t *ret);
 
-// cd/Pico.c
+struct PicoEState;
+
+// cd/mcd.c
 extern void (*PicoMCDopenTray)(void);
 extern void (*PicoMCDcloseTray)(void);
-extern int PicoCDBuffers;
 
 // pico.c
 #define XPCM_BUFFER_SIZE (320+160)
@@ -126,14 +129,9 @@ void *PicoTmpStateSave(void);
 void  PicoTmpStateRestore(void *data);
 extern void (*PicoStateProgressCB)(const char *str);
 
-// cd/buffering.c
-void PicoCDBufferInit(void);
-void PicoCDBufferFree(void);
-void PicoCDBufferFlush(void);
-
-// cd/cd_sys.c
-int Insert_CD(const char *cdimg_name, int type);
-void Stop_CD(void); // releases all resources taken when CD game was started.
+// cd/cdd.c
+int cdd_load(const char *filename, int type);
+int cdd_unload(void);
 
 // Cart.c
 typedef enum
@@ -170,22 +168,14 @@ 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;
-extern unsigned char *HighCol;
 // utility
 #ifdef _ASM_DRAW_C
 void vidConvCpyRGB565(void *to, void *from, int pixels);
 #endif
-void PicoDoHighPal555(int sh);
-extern int PicoDrawMask;
-#define PDRAW_LAYERB_ON      (1<<2)
-#define PDRAW_LAYERA_ON      (1<<3)
-#define PDRAW_SPRITES_LOW_ON (1<<4)
-#define PDRAW_SPRITES_HI_ON  (1<<7)
-#define PDRAW_32X_ON         (1<<8)
+void PicoDoHighPal555(int sh, int line, struct PicoEState *est);
 // internals
 #define PDRAW_SPRITES_MOVED (1<<0) // (asm)
 #define PDRAW_WND_DIFF_PRIO (1<<1) // not all window tiles use same priority
@@ -196,9 +186,8 @@ extern int PicoDrawMask;
 #define PDRAW_PLANE_HI_PRIO (1<<6) // have layer with all hi prio tiles (mk3)
 #define PDRAW_SHHI_DONE     (1<<7) // layer sh/hi already processed
 #define PDRAW_32_COLS       (1<<8) // 32 column mode
-extern int rendstatus, rendstatus_old;
+extern int rendstatus_old;
 extern int rendlines;
-extern unsigned short HighPal[0x100];
 
 // draw.c
 void PicoDrawUpdateHighPal(void);
@@ -206,20 +195,24 @@ void PicoDrawSetInternalBuf(void *dest, int line_increment);
 
 // draw2.c
 // stuff below is optional
-extern unsigned char  *PicoDraw2FB;  // buffer for fast renderer in format (8+320)x(8+224+8) (eights for borders)
 extern unsigned short *PicoCramHigh; // pointer to CRAM buff (0x40 shorts), converted to native device color (works only with 16bit for now)
 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)
+#ifndef NO_32X
+
+void Pico32xSetClocks(int msh2_hz, int ssh2_hz);
+
+#else
+
+#define Pico32xSetClocks(msh2_khz, ssh2_khz)
 
-// 32x/draw.c
-void PicoDraw32xSetFrameMode(int is_on, int only_32x);
+#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;
@@ -237,6 +230,15 @@ enum media_type_e {
   PM_MARK3,
   PM_CD,
 };
+
+enum cd_img_type
+{
+  CIT_NOT_CD = 0,
+  CIT_ISO,
+  CIT_BIN,
+  CIT_CUE
+};
+
 enum media_type_e PicoLoadMedia(const char *filename,
   const char *carthw_cfg_fname,
   const char *(*get_bios_filename)(int *region, const char *cd_fname),
@@ -245,6 +247,14 @@ int PicoCdCheck(const char *fname_in, int *pregion);
 
 extern unsigned char media_id_header[0x100];
 
+// memory.c
+enum input_device {
+  PICO_INPUT_NOTHING,
+  PICO_INPUT_PAD_3BTN,
+  PICO_INPUT_PAD_6BTN,
+};
+void PicoSetInputDevice(int port, enum input_device device);
+
 #ifdef __cplusplus
 } // End of extern "C"
 #endif