dma: add optional slow linked list walking

[pcsx_rearmed.git] / libpcsxcore / plugins.h

diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index 9df55bf..c997c61 100644 (file)
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -25,35 +25,17 @@ extern "C" {
 #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
-typedef long (*GPUopen)(unsigned long *, char *, char *);\r
-typedef long (*SPUopen)(void);\r
-typedef long (*PADopen)(unsigned long *);\r
-typedef long (*NETopen)(unsigned long *);\r
-typedef long (*SIO1open)(unsigned long *);\r
-\r
-#else\r
-\r
-#include <windows.h>\r
-\r
-typedef long (CALLBACK* GPUopen)(HWND);\r
-typedef long (CALLBACK* SPUopen)(HWND);\r
-typedef long (CALLBACK* PADopen)(HWND);\r
-typedef long (CALLBACK* NETopen)(HWND);\r
-typedef long (CALLBACK* SIO1open)(HWND);\r
-\r
-#endif\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 *NETopen)(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
@@ -76,7 +58,7 @@ typedef void (CALLBACK* GPUwriteDataMem)(uint32_t *, int);
 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
@@ -128,9 +110,9 @@ typedef long (CALLBACK* CDRopen)(void);
 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
@@ -184,13 +166,13 @@ typedef long (CALLBACK* SPUinit)(void);
 typedef long (CALLBACK* SPUshutdown)(void);    \r
 typedef long (CALLBACK* SPUclose)(void);                       \r
 typedef void (CALLBACK* SPUplaySample)(unsigned char);         \r
-typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short);\r
+typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short, unsigned int);\r
 typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long);\r
 typedef void (CALLBACK* SPUwriteDMA)(unsigned short);\r
 typedef unsigned short (CALLBACK* SPUreadDMA)(void);\r
-typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int);\r
-typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int);\r
-typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *);\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 *, 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
@@ -205,9 +187,9 @@ typedef struct {
        xa_decode_t xa;\r
        unsigned char *SPUInfo;\r
 } SPUFreeze_t;\r
-typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *);\r
-typedef void (CALLBACK* SPUasync)(uint32_t);\r
-typedef int  (CALLBACK* SPUplayCDDAchannel)(short *, int);\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, unsigned int, int);\r
 \r
 // SPU function pointers\r
 extern SPUconfigure        SPU_configure;\r