#endif\r
\r
#include "psxcommon.h"\r
+#include "psemu_plugin_defs.h"\r
\r
//#define ENABLE_SIO1API 1\r
\r
-#ifndef _WIN32\r
-\r
-typedef void* HWND;\r
-#define CALLBACK\r
-\r
-#else\r
-\r
-#define WIN32_LEAN_AND_MEAN\r
-#include <windows.h>\r
-\r
-#endif\r
-\r
typedef long (CALLBACK *GPUopen)(unsigned long *, char *, char *);\r
typedef long (CALLBACK *SPUopen)(void);\r
typedef long (CALLBACK *PADopen)(unsigned long *);\r
typedef long (CALLBACK *SIO1open)(unsigned long *);\r
\r
#include "spu.h"\r
-\r
-#include "psemu_plugin_defs.h"\r
#include "decode_xa.h"\r
\r
int LoadPlugins();\r
typedef uint32_t (CALLBACK* GPUreadStatus)(void);\r
typedef uint32_t (CALLBACK* GPUreadData)(void);\r
typedef void (CALLBACK* GPUreadDataMem)(uint32_t *, int);\r
-typedef long (CALLBACK* GPUdmaChain)(uint32_t *,uint32_t);\r
+typedef long (CALLBACK* GPUdmaChain)(uint32_t *,uint32_t, uint32_t *);\r
typedef void (CALLBACK* GPUupdateLace)(void);\r
typedef long (CALLBACK* GPUconfigure)(void);\r
typedef long (CALLBACK* GPUtest)(void);\r
typedef long (CALLBACK* CDRclose)(void);\r
typedef long (CALLBACK* CDRgetTN)(unsigned char *);\r
typedef long (CALLBACK* CDRgetTD)(unsigned char, unsigned char *);\r
-typedef long (CALLBACK* CDRreadTrack)(unsigned char *);\r
+typedef boolean (CALLBACK* CDRreadTrack)(unsigned char *);\r
typedef unsigned char* (CALLBACK* CDRgetBuffer)(void);\r
-typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);\r
+typedef unsigned char* (CALLBACK* CDRgetBufferSub)(int sector);\r
typedef long (CALLBACK* CDRconfigure)(void);\r
typedef long (CALLBACK* CDRtest)(void);\r
typedef void (CALLBACK* CDRabout)(void);\r
typedef unsigned short (CALLBACK* SPUreadDMA)(void);\r
typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int, unsigned int);\r
typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int, unsigned int);\r
-typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *);\r
+typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *, unsigned int, int);\r
typedef void (CALLBACK* SPUregisterCallback)(void (CALLBACK *callback)(void));\r
typedef void (CALLBACK* SPUregisterScheduleCb)(void (CALLBACK *callback)(unsigned int cycles_after));\r
typedef long (CALLBACK* SPUconfigure)(void);\r
} SPUFreeze_t;\r
typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *, uint32_t);\r
typedef void (CALLBACK* SPUasync)(uint32_t, uint32_t);\r
-typedef int (CALLBACK* SPUplayCDDAchannel)(short *, int);\r
+typedef int (CALLBACK* SPUplayCDDAchannel)(short *, int, unsigned int, int);\r
\r
// SPU function pointers\r
extern SPUconfigure SPU_configure;\r