cdrom: change pause timing again

[pcsx_rearmed.git] / libpcsxcore / plugins.h

diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index cb9b88a..4054bf6 100644 (file)
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -58,11 +58,8 @@ 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, uint32_t *);\r
+typedef long (CALLBACK* GPUdmaChain)(uint32_t *, uint32_t, uint32_t *, int32_t *);\r
 typedef void (CALLBACK* GPUupdateLace)(void);\r
-typedef long (CALLBACK* GPUconfigure)(void);\r
-typedef long (CALLBACK* GPUtest)(void);\r
-typedef void (CALLBACK* GPUabout)(void);\r
 typedef void (CALLBACK* GPUmakeSnapshot)(void);\r
 typedef void (CALLBACK* GPUkeypressed)(int);\r
 typedef void (CALLBACK* GPUdisplayText)(char *);\r
@@ -82,9 +79,6 @@ typedef void (CALLBACK* GPUgetScreenInfo)(int *, int *);
 extern GPUupdateLace    GPU_updateLace;\r
 extern GPUinit          GPU_init;\r
 extern GPUshutdown      GPU_shutdown; \r
-extern GPUconfigure     GPU_configure;\r
-extern GPUtest          GPU_test;\r
-extern GPUabout         GPU_about;\r
 extern GPUopen          GPU_open;\r
 extern GPUclose         GPU_close;\r
 extern GPUreadStatus    GPU_readStatus;\r
@@ -120,9 +114,9 @@ typedef long (CALLBACK* CDRplay)(unsigned char *);
 typedef long (CALLBACK* CDRstop)(void);\r
 typedef long (CALLBACK* CDRsetfilename)(char *);\r
 struct CdrStat {\r
-       uint32_t Type;\r
-       uint32_t Status;\r
-       unsigned char Time[3];\r
+       uint32_t Type; // DATA, CDDA\r
+       uint32_t Status; // same as cdr.StatP\r
+       unsigned char Time_[3]; // unused\r
 };\r
 typedef long (CALLBACK* CDRgetStatus)(struct CdrStat *);\r
 typedef char* (CALLBACK* CDRgetDriveLetter)(void);\r
@@ -139,6 +133,7 @@ struct SubQ {
 };\r
 typedef long (CALLBACK* CDRreadCDDA)(unsigned char, unsigned char, unsigned char, unsigned char *);\r
 typedef long (CALLBACK* CDRgetTE)(unsigned char, unsigned char *, unsigned char *, unsigned char *);\r
+typedef long (CALLBACK* CDRprefetch)(unsigned char, unsigned char, unsigned char);\r
 \r
 // CD-ROM function pointers\r
 extern CDRinit               CDR_init;\r
@@ -160,6 +155,9 @@ extern CDRabout              CDR_about;
 extern CDRsetfilename        CDR_setfilename;\r
 extern CDRreadCDDA           CDR_readCDDA;\r
 extern CDRgetTE              CDR_getTE;\r
+extern CDRprefetch           CDR_prefetch;\r
+\r
+long CALLBACK CDR__getStatus(struct CdrStat *stat);\r
 \r
 // SPU Functions\r
 typedef long (CALLBACK* SPUinit)(void);                                \r
@@ -170,14 +168,14 @@ typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long, unsigned int);
 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* SPUregisterCallback)(void (CALLBACK *callback)(int));\r
 typedef void (CALLBACK* SPUregisterScheduleCb)(void (CALLBACK *callback)(unsigned int cycles_after));\r
 typedef struct {\r
        unsigned char PluginName[8];\r
        uint32_t PluginVersion;\r
        uint32_t Size;\r
 } SPUFreezeHdr_t;\r
-typedef struct {\r
+typedef struct SPUFreeze {\r
        unsigned char PluginName[8];\r
        uint32_t PluginVersion;\r
        uint32_t Size;\r
@@ -186,9 +184,10 @@ typedef struct {
        xa_decode_t xa;\r
        unsigned char *unused;\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 long (CALLBACK* SPUfreeze)(unsigned int, struct SPUFreeze *, unsigned int);\r
+typedef void (CALLBACK* SPUasync)(unsigned int, unsigned int);\r
 typedef int  (CALLBACK* SPUplayCDDAchannel)(short *, int, unsigned int, int);\r
+typedef void (CALLBACK* SPUsetCDvol)(unsigned char, unsigned char, unsigned char, unsigned char, unsigned int);\r
 \r
 // SPU function pointers\r
 extern SPUinit             SPU_init;\r
@@ -205,6 +204,7 @@ extern SPUregisterCallback SPU_registerCallback;
 extern SPUregisterScheduleCb SPU_registerScheduleCb;\r
 extern SPUasync            SPU_async;\r
 extern SPUplayCDDAchannel  SPU_playCDDAchannel;\r
+extern SPUsetCDvol         SPU_setCDvol;\r
 \r
 // PAD Functions\r
 typedef long (CALLBACK* PADconfigure)(void);\r
@@ -382,6 +382,7 @@ boolean UsingIso(void);
 void SetCdOpenCaseTime(s64 time);\r
 \r
 int padFreeze(void *f, int Mode);\r
+int padToggleAnalog(unsigned int index);\r
 \r
 extern void pl_gun_byte2(int port, unsigned char byte);\r
 extern void plat_trigger_vibrate(int pad, int low, int high);\r