clarify PicoDrive's license

[picodrive.git] / pico / pico.h

diff --git a/pico/pico.h b/pico/pico.h
index b61d7b1..e15f316 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -1,18 +1,16 @@
-\r
-// -------------------- Pico Library --------------------\r
-\r
-// Pico Library - Header File\r
-\r
-// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006-2009 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
+/*\r
+ * PicoDrive\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2010\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
 \r
 #ifndef PICO_H\r
 #define PICO_H\r
 \r
-#include <stdio.h>\r
+#include <stdlib.h> // size_t\r
 \r
 // port-specific compile-time settings\r
 #include <port_config.h>\r
@@ -22,8 +20,8 @@ extern "C" {
 #endif\r
 \r
 // external funcs for Sega/Mega CD\r
-extern int  mp3_get_bitrate(FILE *f, int size);\r
-extern void mp3_start_play(FILE *f, int pos);\r
+extern int  mp3_get_bitrate(void *f, int size);\r
+extern void mp3_start_play(void *f, int pos);\r
 extern void mp3_update(int *buffer, int length, int stereo);\r
 \r
 // this function should write-back d-cache and invalidate i-cache\r
@@ -33,7 +31,7 @@ extern void cache_flush_d_inval_i(const void *start_addr, const void *end_addr);
 \r
 // attempt to alloc mem at specified address.\r
 // alloc anywhere else if that fails (callers should handle that)\r
-extern void *plat_mmap(unsigned long addr, size_t size);\r
+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
@@ -90,7 +88,7 @@ void PicoLoopPrepare(void);
 void PicoFrame(void);\r
 void PicoFrameDrawOnly(void);\r
 extern int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU\r
-extern void (*PicoWriteSound)(int len); // called once per frame at the best time to send sound buffer (PsndOut) to hardware\r
+extern void (*PicoWriteSound)(int bytes); // called once per frame at the best time to send sound buffer (PsndOut) to hardware\r
 extern void (*PicoMessage)(const char *msg); // callback to output text message from emu\r
 typedef enum { PI_ROM, PI_ISPAL, PI_IS40_CELL, PI_IS240_LINES } pint_t;\r
 typedef union { int vint; void *vptr; } pint_ret_t;\r
@@ -170,10 +168,9 @@ typedef enum
 } pdso_t;\r
 void PicoDrawSetOutFormat(pdso_t which, int allow_32x);\r
 void PicoDrawSetOutBuf(void *dest, int increment);\r
+void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned int num));\r
 extern void *DrawLineDest;\r
 extern unsigned char *HighCol;\r
-extern int (*PicoScanBegin)(unsigned int num);\r
-extern int (*PicoScanEnd)(unsigned int num);\r
 // utility\r
 #ifdef _ASM_DRAW_C\r
 void vidConvCpyRGB565(void *to, void *from, int pixels);\r
@@ -219,8 +216,6 @@ extern int p32x_ssh2_multiplier;
 \r
 // 32x/draw.c\r
 void PicoDraw32xSetFrameMode(int is_on, int only_32x);\r
-extern int (*PicoScan32xBegin)(unsigned int num);\r
-extern int (*PicoScan32xEnd)(unsigned int num);\r
 \r
 // sound.c\r
 extern int PsndRate,PsndLen;\r
@@ -228,13 +223,6 @@ extern short *PsndOut;
 extern void (*PsndMix_32_to_16l)(short *dest, int *src, int count);\r
 void PsndRerate(int preserve_state);\r
 \r
-// Utils.c\r
-extern int PicuAnd;\r
-int PicuQuick(unsigned short *dest,unsigned short *src);\r
-int PicuShrink(unsigned short *dest,int destLen,unsigned short *src,int srcLen);\r
-int PicuShrinkReverse(unsigned short *dest,int destLen,unsigned short *src,int srcLen);\r
-int PicuMerge(unsigned short *dest,int destLen,unsigned short *src,int srcLen);\r
-\r
 #ifdef __cplusplus\r
 } // End of extern "C"\r
 #endif\r