X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fplugins.h;h=c5140cce1d4a4a98e01ae6770a1982b81dd001c3;hb=2db412ade2b09ca04da81d91b75bbf6475dbde5a;hp=e3bffc77620f1c1d9a64dcbae511a61a820f053a;hpb=c9c7a925d158284eb3febf3cccc9789e94231430;p=pcsx_rearmed.git

diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index e3bffc77..c5140cce 100644
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -25,21 +25,10 @@ extern "C" {
 #endif
 
 #include "psxcommon.h"
+#include "psemu_plugin_defs.h"
 
 //#define ENABLE_SIO1API 1
 
-#ifndef _WIN32
-
-typedef void* HWND;
-#define CALLBACK
-
-#else
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#endif
-
 typedef long (CALLBACK *GPUopen)(unsigned long *, char *, char *);
 typedef long (CALLBACK *SPUopen)(void);
 typedef long (CALLBACK *PADopen)(unsigned long *);
@@ -47,8 +36,6 @@ typedef long (CALLBACK *NETopen)(unsigned long *);
 typedef long (CALLBACK *SIO1open)(unsigned long *);
 
 #include "spu.h"
-
-#include "psemu_plugin_defs.h"
 #include "decode_xa.h"
 
 int LoadPlugins();
@@ -71,7 +58,7 @@ typedef void (CALLBACK* GPUwriteDataMem)(uint32_t *, int);
 typedef uint32_t (CALLBACK* GPUreadStatus)(void);
 typedef uint32_t (CALLBACK* GPUreadData)(void);
 typedef void (CALLBACK* GPUreadDataMem)(uint32_t *, int);
-typedef long (CALLBACK* GPUdmaChain)(uint32_t *,uint32_t);
+typedef long (CALLBACK* GPUdmaChain)(uint32_t *,uint32_t, uint32_t *);
 typedef void (CALLBACK* GPUupdateLace)(void);
 typedef long (CALLBACK* GPUconfigure)(void);
 typedef long (CALLBACK* GPUtest)(void);
@@ -88,7 +75,6 @@ typedef struct {
 typedef long (CALLBACK* GPUfreeze)(uint32_t, GPUFreeze_t *);
 typedef long (CALLBACK* GPUgetScreenPic)(unsigned char *);
 typedef long (CALLBACK* GPUshowScreenPic)(unsigned char *);
-typedef void (CALLBACK* GPUclearDynarec)(void (CALLBACK *callback)(void));
 typedef void (CALLBACK* GPUvBlank)(int, int);
 
 // GPU function pointers
@@ -113,7 +99,6 @@ extern GPUmakeSnapshot  GPU_makeSnapshot;
 extern GPUfreeze        GPU_freeze;
 extern GPUgetScreenPic  GPU_getScreenPic;
 extern GPUshowScreenPic GPU_showScreenPic;
-extern GPUclearDynarec  GPU_clearDynarec;
 extern GPUvBlank        GPU_vBlank;
 
 // CD-ROM Functions
@@ -125,7 +110,7 @@ typedef long (CALLBACK* CDRgetTN)(unsigned char *);
 typedef long (CALLBACK* CDRgetTD)(unsigned char, unsigned char *);
 typedef boolean (CALLBACK* CDRreadTrack)(unsigned char *);
 typedef unsigned char* (CALLBACK* CDRgetBuffer)(void);
-typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);
+typedef unsigned char* (CALLBACK* CDRgetBufferSub)(int sector);
 typedef long (CALLBACK* CDRconfigure)(void);
 typedef long (CALLBACK* CDRtest)(void);
 typedef void (CALLBACK* CDRabout)(void);
@@ -178,19 +163,18 @@ extern CDRgetTE              CDR_getTE;
 typedef long (CALLBACK* SPUinit)(void);				
 typedef long (CALLBACK* SPUshutdown)(void);	
 typedef long (CALLBACK* SPUclose)(void);			
-typedef void (CALLBACK* SPUplaySample)(unsigned char);		
 typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short, unsigned int);
 typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long);
-typedef void (CALLBACK* SPUwriteDMA)(unsigned short);
-typedef unsigned short (CALLBACK* SPUreadDMA)(void);
 typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int, unsigned int);
 typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int, unsigned int);
-typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *);
+typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *, unsigned int, int);
 typedef void (CALLBACK* SPUregisterCallback)(void (CALLBACK *callback)(void));
 typedef void (CALLBACK* SPUregisterScheduleCb)(void (CALLBACK *callback)(unsigned int cycles_after));
-typedef long (CALLBACK* SPUconfigure)(void);
-typedef long (CALLBACK* SPUtest)(void);
-typedef void (CALLBACK* SPUabout)(void);
+typedef struct {
+	unsigned char PluginName[8];
+	uint32_t PluginVersion;
+	uint32_t Size;
+} SPUFreezeHdr_t;
 typedef struct {
 	unsigned char PluginName[8];
 	uint32_t PluginVersion;
@@ -202,21 +186,15 @@ typedef struct {
 } SPUFreeze_t;
 typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *, uint32_t);
 typedef void (CALLBACK* SPUasync)(uint32_t, uint32_t);
-typedef int  (CALLBACK* SPUplayCDDAchannel)(short *, int);
+typedef int  (CALLBACK* SPUplayCDDAchannel)(short *, int, unsigned int, int);
 
 // SPU function pointers
-extern SPUconfigure        SPU_configure;
-extern SPUabout            SPU_about;
 extern SPUinit             SPU_init;
 extern SPUshutdown         SPU_shutdown;
-extern SPUtest             SPU_test;
 extern SPUopen             SPU_open;
 extern SPUclose            SPU_close;
-extern SPUplaySample       SPU_playSample;
 extern SPUwriteRegister    SPU_writeRegister;
 extern SPUreadRegister     SPU_readRegister;
-extern SPUwriteDMA         SPU_writeDMA;
-extern SPUreadDMA          SPU_readDMA;
 extern SPUwriteDMAMem      SPU_writeDMAMem;
 extern SPUreadDMAMem       SPU_readDMAMem;
 extern SPUplayADPCMchannel SPU_playADPCMchannel;
@@ -238,7 +216,7 @@ typedef long (CALLBACK* PADreadPort1)(PadDataS*);
 typedef long (CALLBACK* PADreadPort2)(PadDataS*);
 typedef long (CALLBACK* PADkeypressed)(void);
 typedef unsigned char (CALLBACK* PADstartPoll)(int);
-typedef unsigned char (CALLBACK* PADpoll)(unsigned char);
+typedef unsigned char (CALLBACK* PADpoll)(unsigned char, int *);
 typedef void (CALLBACK* PADsetSensitive)(int);
 
 // PAD function pointers
@@ -396,13 +374,14 @@ extern SIO1registerCallback   SIO1_registerCallback;
 
 #endif
 
-void CALLBACK clearDynarec(void);
-
 void SetIsoFile(const char *filename);
 const char *GetIsoFile(void);
 boolean UsingIso(void);
 void SetCdOpenCaseTime(s64 time);
 
+extern void pl_gun_byte2(int port, unsigned char byte);
+extern void plat_trigger_vibrate(int pad, int low, int high);
+
 #ifdef __cplusplus
 }
 #endif