Merge branch 'libretro' into libretro-reset

[picodrive.git] / pico / pico.h

diff --git a/pico/pico.h b/pico/pico.h
index a1aa96e..f1687f5 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -34,6 +34,9 @@ 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);\r
 extern void *plat_mremap(void *ptr, size_t oldsize, size_t newsize);\r
 extern void  plat_munmap(void *ptr, size_t size);\r
+\r
+// memory for the dynarec; plat_mem_get_for_drc() can just return NULL\r
+extern void *plat_mem_get_for_drc(size_t size);\r
 extern int   plat_mem_set_exec(void *ptr, size_t size);\r
 \r
 // this one should handle display mode changes\r
@@ -81,10 +84,9 @@ extern int PicoAHW;            // Pico active hw
 #define PQUIRK_FORCE_6BTN   (1<<0)\r
 extern int PicoQuirks;\r
 \r
-extern int PicoSkipFrame;         // skip rendering frame, but still do sound (if enabled) and emulation stuff\r
-extern int PicoRegionOverride;    // override the region detection 0: auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
-extern int PicoRegionFPSOverride; // override the refresh rate of the region 0: Auto, 1: NTSC, 2: PAL\r
-extern int PicoAutoRgnOrder;      // packed priority list of regions, for example 0x148 means this detection order: EUR, USA, JAP\r
+extern int PicoSkipFrame;      // skip rendering frame, but still do sound (if enabled) and emulation stuff\r
+extern int PicoRegionOverride; // override the region detection 0: auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
+extern int PicoAutoRgnOrder;   // packed priority list of regions, for example 0x148 means this detection order: EUR, USA, JAP\r
 extern int PicoSVPCycles;\r
 void PicoInit(void);\r
 void PicoExit(void);\r
@@ -177,12 +179,6 @@ void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned in
 void vidConvCpyRGB565(void *to, void *from, int pixels);\r
 #endif\r
 void PicoDoHighPal555(int sh, int line, struct PicoEState *est);\r
-extern int PicoDrawMask;\r
-#define PDRAW_LAYERB_ON      (1<<2)\r
-#define PDRAW_LAYERA_ON      (1<<3)\r
-#define PDRAW_SPRITES_LOW_ON (1<<4)\r
-#define PDRAW_SPRITES_HI_ON  (1<<7)\r
-#define PDRAW_32X_ON         (1<<8)\r
 // internals\r
 #define PDRAW_SPRITES_MOVED (1<<0) // (asm)\r
 #define PDRAW_WND_DIFF_PRIO (1<<1) // not all window tiles use same priority\r