X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.h;h=ac5eb05f11ce54b35a5a0e1e571498bf33a23ac5;hb=72de54727a87873e8ae30a1ddebe3d0342de7b10;hp=b61d7b14b24f84fcddb8376033965dcc4c88d146;hpb=f3a57b2d6c6a32dc09a6efd4fbef31eb876263b2;p=picodrive.git diff --git a/pico/pico.h b/pico/pico.h index b61d7b1..ac5eb05 100644 --- a/pico/pico.h +++ b/pico/pico.h @@ -12,7 +12,7 @@ #ifndef PICO_H #define PICO_H -#include +#include // size_t // port-specific compile-time settings #include @@ -22,8 +22,8 @@ extern "C" { #endif // external funcs for Sega/Mega CD -extern int mp3_get_bitrate(FILE *f, int size); -extern void mp3_start_play(FILE *f, int pos); +extern int mp3_get_bitrate(void *f, int size); +extern void mp3_start_play(void *f, int pos); extern void mp3_update(int *buffer, int length, int stereo); // this function should write-back d-cache and invalidate i-cache @@ -90,7 +90,7 @@ void PicoLoopPrepare(void); void PicoFrame(void); void PicoFrameDrawOnly(void); extern int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU -extern void (*PicoWriteSound)(int len); // called once per frame at the best time to send sound buffer (PsndOut) to hardware +extern void (*PicoWriteSound)(int bytes); // called once per frame at the best time to send sound buffer (PsndOut) to hardware extern void (*PicoMessage)(const char *msg); // callback to output text message from emu typedef enum { PI_ROM, PI_ISPAL, PI_IS40_CELL, PI_IS240_LINES } pint_t; typedef union { int vint; void *vptr; } pint_ret_t; @@ -170,10 +170,9 @@ typedef enum } pdso_t; void PicoDrawSetOutFormat(pdso_t which, int allow_32x); 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; -extern int (*PicoScanBegin)(unsigned int num); -extern int (*PicoScanEnd)(unsigned int num); // utility #ifdef _ASM_DRAW_C void vidConvCpyRGB565(void *to, void *from, int pixels); @@ -219,8 +218,6 @@ extern int p32x_ssh2_multiplier; // 32x/draw.c void PicoDraw32xSetFrameMode(int is_on, int only_32x); -extern int (*PicoScan32xBegin)(unsigned int num); -extern int (*PicoScan32xEnd)(unsigned int num); // sound.c extern int PsndRate,PsndLen;