ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plugin APIs: Added the changes in r788 to PluginCallbacks.h. Changed the config path function to be one of the general functions, not plugin specific, and it now passes the whole pcsx2 config, not just the ini path. I can see all sorts of uses for that... 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@789 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-03-15 05:57:16 +00:00
parent 579a907edf
commit 85a1c605fa
10 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/include/Pcsx2Api.h
View File

@ -31,6 +31,7 @@
#include "Pcsx2Types.h" #include "Pcsx2Types.h"
#include "Pcsx2Defs.h" #include "Pcsx2Defs.h"
#include "Pcsx2Config.h"
// Indicate to use the new versions. // Indicate to use the new versions.
#define NEW_PLUGIN_APIS #define NEW_PLUGIN_APIS
@ -45,6 +46,12 @@ EXPORT_C(u32) PS2EgetLibType(void);
EXPORT_C(u32) PS2EgetLibVersion2(u32 type); EXPORT_C(u32) PS2EgetLibVersion2(u32 type);
EXPORT_C(char*) PS2EgetLibName(void); EXPORT_C(char*) PS2EgetLibName(void);
// Extended functions.
// allows the plugin to see the whole configuration when started up.
// Intended for them to get the ini and plugin paths, but could allow for other things as well.
EXPORT_C_(void) PS2EpassConfig(PcsxConfig Config);
// PS2EgetLibType returns (may be OR'd) // PS2EgetLibType returns (may be OR'd)
enum { enum {
PS2E_LT_GS = 0x01, PS2E_LT_GS = 0x01,

30
common/include/PluginCallbacks.h
View File

@ -20,10 +20,13 @@
#ifndef __PLUGINCALLBACKS_H__ #ifndef __PLUGINCALLBACKS_H__
#define __PLUGINCALLBACKS_H__ #define __PLUGINCALLBACKS_H__
extern "C" { extern "C"
{
// General
typedef u32 (CALLBACK* _PS2EgetLibType)(void); typedef u32 (CALLBACK* _PS2EgetLibType)(void);
typedef u32 (CALLBACK* _PS2EgetLibVersion2)(u32 type); typedef u32 (CALLBACK* _PS2EgetLibVersion2)(u32 type);
typedef char*(CALLBACK* _PS2EgetLibName)(void); typedef char*(CALLBACK* _PS2EgetLibName)(void);
typedef void (CALLBACK* _PS2EpassConfig)(PcsxConfig Config);
// GS // GS
// NOTE: GSreadFIFOX/GSwriteCSR functions CANNOT use XMM/MMX regs // NOTE: GSreadFIFOX/GSwriteCSR functions CANNOT use XMM/MMX regs
@ -60,7 +63,6 @@ typedef void (CALLBACK* _GSmakeSnapshot)(const char *path);
typedef void (CALLBACK* _GSmakeSnapshot2)(const char *path, int*, int); typedef void (CALLBACK* _GSmakeSnapshot2)(const char *path, int*, int);
typedef s32 (CALLBACK* _GSfreeze)(u8 mode, freezeData *data); typedef s32 (CALLBACK* _GSfreeze)(u8 mode, freezeData *data);
typedef void (CALLBACK* _GSconfigure)(); typedef void (CALLBACK* _GSconfigure)();
typedef void (CALLBACK* _GSconfigpath)(char *configpath);
typedef s32 (CALLBACK* _GStest)(); typedef s32 (CALLBACK* _GStest)();
typedef void (CALLBACK* _GSabout)(); typedef void (CALLBACK* _GSabout)();
@ -78,12 +80,11 @@ typedef void (CALLBACK* _PADupdate)(u8 pad);
typedef void (CALLBACK* _PADgsDriverInfo)(GSdriverInfo *info); typedef void (CALLBACK* _PADgsDriverInfo)(GSdriverInfo *info);
typedef s32 (CALLBACK* _PADfreeze)(u8 mode, freezeData *data); typedef s32 (CALLBACK* _PADfreeze)(u8 mode, freezeData *data);
typedef void (CALLBACK* _PADconfigure)(); typedef void (CALLBACK* _PADconfigure)();
typedef void (CALLBACK* _PADconfigpath)(char *configpath);
typedef s32 (CALLBACK* _PADtest)(); typedef s32 (CALLBACK* _PADtest)();
typedef void (CALLBACK* _PADabout)(); typedef void (CALLBACK* _PADabout)();
// SIO // SIO
typedef s32 (CALLBACK* _SIOinit)(); typedef s32 (CALLBACK* _SIOinit)(int types, SIOchangeSlotCB f);
typedef s32 (CALLBACK* _SIOopen)(void *pDisplay); typedef s32 (CALLBACK* _SIOopen)(void *pDisplay);
typedef void (CALLBACK* _SIOclose)(); typedef void (CALLBACK* _SIOclose)();
typedef void (CALLBACK* _SIOshutdown)(); typedef void (CALLBACK* _SIOshutdown)();
@ -94,7 +95,6 @@ typedef u32 (CALLBACK* _SIOquery)();
typedef void (CALLBACK* _SIOkeyEvent)(keyEvent* ev); typedef void (CALLBACK* _SIOkeyEvent)(keyEvent* ev);
typedef s32 (CALLBACK* _SIOfreeze)(u8 mode, freezeData *data); typedef s32 (CALLBACK* _SIOfreeze)(u8 mode, freezeData *data);
typedef void (CALLBACK* _SIOconfigure)(); typedef void (CALLBACK* _SIOconfigure)();
typedef void (CALLBACK* _SIOconfigpath)(char *configpath);
typedef s32 (CALLBACK* _SIOtest)(); typedef s32 (CALLBACK* _SIOtest)();
typedef void (CALLBACK* _SIOabout)(); typedef void (CALLBACK* _SIOabout)();
@ -131,7 +131,6 @@ typedef void (CALLBACK* _SPU2async)(u32 cycles);
typedef s32 (CALLBACK* _SPU2freeze)(u8 mode, freezeData *data); typedef s32 (CALLBACK* _SPU2freeze)(u8 mode, freezeData *data);
typedef void (CALLBACK* _SPU2keyEvent)(keyEvent* ev); typedef void (CALLBACK* _SPU2keyEvent)(keyEvent* ev);
typedef void (CALLBACK* _SPU2configure)(); typedef void (CALLBACK* _SPU2configure)();
typedef void (CALLBACK* _SPU2configpath)(char *configpath);
typedef s32 (CALLBACK* _SPU2test)(); typedef s32 (CALLBACK* _SPU2test)();
typedef void (CALLBACK* _SPU2about)(); typedef void (CALLBACK* _SPU2about)();
@ -156,7 +155,6 @@ typedef s32 (CALLBACK* _CDVDctrlTrayClose)();
typedef void (CALLBACK* _CDVDkeyEvent)(keyEvent* ev); typedef void (CALLBACK* _CDVDkeyEvent)(keyEvent* ev);
typedef s32 (CALLBACK* _CDVDfreeze)(u8 mode, freezeData *data); typedef s32 (CALLBACK* _CDVDfreeze)(u8 mode, freezeData *data);
typedef void (CALLBACK* _CDVDconfigure)(); typedef void (CALLBACK* _CDVDconfigure)();
typedef void (CALLBACK* _CDVDconfigpath)(char *configpath);
typedef s32 (CALLBACK* _CDVDtest)(); typedef s32 (CALLBACK* _CDVDtest)();
typedef void (CALLBACK* _CDVDabout)(); typedef void (CALLBACK* _CDVDabout)();
typedef void (CALLBACK* _CDVDnewDiskCB)(void (*callback)()); typedef void (CALLBACK* _CDVDnewDiskCB)(void (*callback)());
@ -182,7 +180,6 @@ typedef DEV9handler (CALLBACK* _DEV9irqHandler)(void);
typedef void (CALLBACK* _DEV9keyEvent)(keyEvent* ev); typedef void (CALLBACK* _DEV9keyEvent)(keyEvent* ev);
typedef s32 (CALLBACK* _DEV9freeze)(int mode, freezeData *data); typedef s32 (CALLBACK* _DEV9freeze)(int mode, freezeData *data);
typedef void (CALLBACK* _DEV9configure)(); typedef void (CALLBACK* _DEV9configure)();
typedef void (CALLBACK* _DEV9configpath)(char *configpath);
typedef s32 (CALLBACK* _DEV9test)(); typedef s32 (CALLBACK* _DEV9test)();
typedef void (CALLBACK* _DEV9about)(); typedef void (CALLBACK* _DEV9about)();
@ -209,7 +206,6 @@ typedef void (CALLBACK* _USBsetRAM)(void *mem);
typedef void (CALLBACK* _USBkeyEvent)(keyEvent* ev); typedef void (CALLBACK* _USBkeyEvent)(keyEvent* ev);
typedef s32 (CALLBACK* _USBfreeze)(int mode, freezeData *data); typedef s32 (CALLBACK* _USBfreeze)(int mode, freezeData *data);
typedef void (CALLBACK* _USBconfigure)(); typedef void (CALLBACK* _USBconfigure)();
typedef void (CALLBACK* _USBconfigpath)(char *configpath);
typedef s32 (CALLBACK* _USBtest)(); typedef s32 (CALLBACK* _USBtest)();
typedef void (CALLBACK* _USBabout)(); typedef void (CALLBACK* _USBabout)();
@ -225,10 +221,15 @@ typedef void (CALLBACK* _FWirqCallback)(void (*callback)());
typedef void (CALLBACK* _FWkeyEvent)(keyEvent* ev); typedef void (CALLBACK* _FWkeyEvent)(keyEvent* ev);
typedef s32 (CALLBACK* _FWfreeze)(int mode, freezeData *data); typedef s32 (CALLBACK* _FWfreeze)(int mode, freezeData *data);
typedef void (CALLBACK* _FWconfigure)(); typedef void (CALLBACK* _FWconfigure)();
typedef void (CALLBACK* _FWconfigpath)(char *configpath);
typedef s32 (CALLBACK* _FWtest)(); typedef s32 (CALLBACK* _FWtest)();
typedef void (CALLBACK* _FWabout)(); typedef void (CALLBACK* _FWabout)();
// General
extern _PS2EgetLibType PS2EgetLibType;
extern _PS2EgetLibVersion2 PS2EgetLibVersion2;
extern _PS2EgetLibName PS2EgetLibName;
extern _PS2EpassConfig PS2EpassConfig;
// GS // GS
extern _GSinit GSinit; extern _GSinit GSinit;
extern _GSopen GSopen; extern _GSopen GSopen;
@ -261,7 +262,6 @@ extern _GSsetWindowInfo GSsetWindowInfo;
#endif #endif
extern _GSfreeze GSfreeze; extern _GSfreeze GSfreeze;
extern _GSconfigure GSconfigure; extern _GSconfigure GSconfigure;
extern _GSconfigpath GSconfigpath;
extern _GStest GStest; extern _GStest GStest;
extern _GSabout GSabout; extern _GSabout GSabout;
@ -279,7 +279,6 @@ extern _PADupdate PAD1update;
extern _PADfreeze PAD1freeze; extern _PADfreeze PAD1freeze;
extern _PADgsDriverInfo PAD1gsDriverInfo; extern _PADgsDriverInfo PAD1gsDriverInfo;
extern _PADconfigure PAD1configure; extern _PADconfigure PAD1configure;
extern _PADconfigpath PAD1configpath;
extern _PADtest PAD1test; extern _PADtest PAD1test;
extern _PADabout PAD1about; extern _PADabout PAD1about;
@ -297,7 +296,6 @@ extern _PADupdate PAD2update;
extern _PADfreeze PAD2freeze; extern _PADfreeze PAD2freeze;
extern _PADgsDriverInfo PAD2gsDriverInfo; extern _PADgsDriverInfo PAD2gsDriverInfo;
extern _PADconfigure PAD2configure; extern _PADconfigure PAD2configure;
extern _PADconfigpath PAD2configpath;
extern _PADtest PAD2test; extern _PADtest PAD2test;
extern _PADabout PAD2about; extern _PADabout PAD2about;
@ -313,7 +311,6 @@ extern _SIOkeyEvent SIOkeyEvent;
extern _SIOfreeze SIOfreeze[2][9]; extern _SIOfreeze SIOfreeze[2][9];
extern _SIOconfigure SIOconfigure[2][9]; extern _SIOconfigure SIOconfigure[2][9];
extern _SIOconfigpath SIOconfigpath[2][9];
extern _SIOtest SIOtest[2][9]; extern _SIOtest SIOtest[2][9];
extern _SIOabout SIOabout[2][9]; extern _SIOabout SIOabout[2][9];
@ -343,7 +340,6 @@ extern _SPU2keyEvent SPU2keyEvent;
extern _SPU2async SPU2async; extern _SPU2async SPU2async;
extern _SPU2freeze SPU2freeze; extern _SPU2freeze SPU2freeze;
extern _SPU2configure SPU2configure; extern _SPU2configure SPU2configure;
extern _SPU2configpath SPU2configpath;
extern _SPU2test SPU2test; extern _SPU2test SPU2test;
extern _SPU2about SPU2about; extern _SPU2about SPU2about;
@ -366,7 +362,6 @@ extern _CDVDctrlTrayClose CDVDctrlTrayClose;
extern _CDVDkeyEvent CDVDkeyEvent; extern _CDVDkeyEvent CDVDkeyEvent;
extern _CDVDfreeze CDVDfreeze; extern _CDVDfreeze CDVDfreeze;
extern _CDVDconfigure CDVDconfigure; extern _CDVDconfigure CDVDconfigure;
extern _CDVDconfigpath CDVDconfigpath;
extern _CDVDtest CDVDtest; extern _CDVDtest CDVDtest;
extern _CDVDabout CDVDabout; extern _CDVDabout CDVDabout;
extern _CDVDnewDiskCB CDVDnewDiskCB; extern _CDVDnewDiskCB CDVDnewDiskCB;
@ -389,7 +384,6 @@ extern _DEV9irqHandler DEV9irqHandler;
extern _DEV9keyEvent DEV9keyEvent; extern _DEV9keyEvent DEV9keyEvent;
extern _DEV9configure DEV9configure; extern _DEV9configure DEV9configure;
extern _DEV9configpath DEV9configpath;
extern _DEV9freeze DEV9freeze; extern _DEV9freeze DEV9freeze;
extern _DEV9test DEV9test; extern _DEV9test DEV9test;
extern _DEV9about DEV9about; extern _DEV9about DEV9about;
@ -413,7 +407,6 @@ extern _USBsetRAM USBsetRAM;
extern _USBkeyEvent USBkeyEvent; extern _USBkeyEvent USBkeyEvent;
extern _USBconfigure USBconfigure; extern _USBconfigure USBconfigure;
extern _USBconfigpath USBconfigpath;
extern _USBfreeze USBfreeze; extern _USBfreeze USBfreeze;
extern _USBtest USBtest; extern _USBtest USBtest;
extern _USBabout USBabout; extern _USBabout USBabout;
@ -429,7 +422,6 @@ extern _FWirqCallback FWirqCallback;
extern _FWkeyEvent FWkeyEvent; extern _FWkeyEvent FWkeyEvent;
extern _FWconfigure FWconfigure; extern _FWconfigure FWconfigure;
extern _FWconfigpath FWconfigpath;
extern _FWfreeze FWfreeze; extern _FWfreeze FWfreeze;
extern _FWtest FWtest; extern _FWtest FWtest;
extern _FWabout FWabout; extern _FWabout FWabout;

1
common/include/api/CDVDApi.h
View File

@ -58,7 +58,6 @@ EXPORT_C_(s32) CDVDctrlTrayClose(); //close disc tray
EXPORT_C_(void) CDVDkeyEvent(keyEvent *ev); EXPORT_C_(void) CDVDkeyEvent(keyEvent *ev);
EXPORT_C_(void) CDVDconfigure(); EXPORT_C_(void) CDVDconfigure();
EXPORT_C_(s32) CDVDfreeze(u8 mode, freezeData *data); EXPORT_C_(s32) CDVDfreeze(u8 mode, freezeData *data);
EXPORT_C_(void) CDVDconfigpath(char *configpath);
EXPORT_C_(void) CDVDabout(); EXPORT_C_(void) CDVDabout();
EXPORT_C_(s32) CDVDtest(); EXPORT_C_(s32) CDVDtest();
EXPORT_C_(void) CDVDnewDiskCB(void (*callback)()); EXPORT_C_(void) CDVDnewDiskCB(void (*callback)());

1
common/include/api/Dev9Api.h
View File

@ -62,7 +62,6 @@ EXPORT_C_(DEV9handler) DEV9irqHandler(void);
EXPORT_C_(void) DEV9keyEvent(keyEvent *ev); EXPORT_C_(void) DEV9keyEvent(keyEvent *ev);
EXPORT_C_(s32) DEV9freeze(u8 mode, freezeData *data); EXPORT_C_(s32) DEV9freeze(u8 mode, freezeData *data);
EXPORT_C_(void) DEV9configure(); EXPORT_C_(void) DEV9configure();
EXPORT_C_(void) DEV9configpath(char *configpath);
EXPORT_C_(void) DEV9about(); EXPORT_C_(void) DEV9about();
EXPORT_C_(s32) DEV9test(); EXPORT_C_(s32) DEV9test();

1
common/include/api/FWApi.h
View File

@ -51,7 +51,6 @@ EXPORT_C_(void) FWirqCallback(void (*callback)());
EXPORT_C_(void) FWkeyEvent(keyEvent *ev); EXPORT_C_(void) FWkeyEvent(keyEvent *ev);
EXPORT_C_(s32) FWfreeze(u8 mode, freezeData *data); EXPORT_C_(s32) FWfreeze(u8 mode, freezeData *data);
EXPORT_C_(void) FWconfigure(); EXPORT_C_(void) FWconfigure();
EXPORT_C_(void) SPU2configpath(char *configpath);
EXPORT_C_(void) FWabout(); EXPORT_C_(void) FWabout();
EXPORT_C_(s32) FWtest(); EXPORT_C_(s32) FWtest();
#endif #endif

1
common/include/api/GSApi.h
View File

@ -79,7 +79,6 @@ EXPORT_C_(s32) CALLBACK GSsetWindowInfo(winInfo *info);
#endif #endif
EXPORT_C_(s32) GSfreeze(u8 mode, freezeData *data); EXPORT_C_(s32) GSfreeze(u8 mode, freezeData *data);
EXPORT_C_(void) GSconfigure(); EXPORT_C_(void) GSconfigure();
EXPORT_C_(void) GSconfigpath(char *configpath);
EXPORT_C_(void) GSabout(); EXPORT_C_(void) GSabout();
EXPORT_C_(s32) GStest(); EXPORT_C_(s32) GStest();

1
common/include/api/PadApi.h
View File

@ -62,7 +62,6 @@ EXPORT_C_(void) PADupdate(u8 pad);
EXPORT_C_(void) PADgsDriverInfo(GSdriverInfo *info); EXPORT_C_(void) PADgsDriverInfo(GSdriverInfo *info);
EXPORT_C_(s32) PADfreeze(u8 mode, freezeData *data); EXPORT_C_(s32) PADfreeze(u8 mode, freezeData *data);
EXPORT_C_(void) PADconfigure(); EXPORT_C_(void) PADconfigure();
EXPORT_C_(void) PADconfigpath(char *configpath);
EXPORT_C_(void) PADabout(); EXPORT_C_(void) PADabout();
EXPORT_C_(s32) PADtest(); EXPORT_C_(s32) PADtest();

1
common/include/api/SIOApi.h
View File

@ -68,7 +68,6 @@ EXPORT_C_(u32) SIOquery();
EXPORT_C_(void) SIOconfigure(); EXPORT_C_(void) SIOconfigure();
EXPORT_C_(keyEvent*) CALLBACK SIOkeyEvent(); EXPORT_C_(keyEvent*) CALLBACK SIOkeyEvent();
EXPORT_C_(s32) SIOfreeze(u8 mode, freezeData *data); EXPORT_C_(s32) SIOfreeze(u8 mode, freezeData *data);
EXPORT_C_(void) SIOconfigpath(char *configpath);
EXPORT_C_(void) SIOabout(); EXPORT_C_(void) SIOabout();
EXPORT_C_(s32) SIOtest(); EXPORT_C_(s32) SIOtest();

1
common/include/api/Spu2Api.h
View File

@ -71,7 +71,6 @@ EXPORT_C_(void) SPU2setClockPtr(u32* ptr);
EXPORT_C_(void) SPU2async(u32 cycles); EXPORT_C_(void) SPU2async(u32 cycles);
EXPORT_C_(s32) SPU2freeze(u8 mode, freezeData *data); EXPORT_C_(s32) SPU2freeze(u8 mode, freezeData *data);
EXPORT_C_(void) SPU2configure(); EXPORT_C_(void) SPU2configure();
EXPORT_C_(void) SPU2configpath(char *configpath);
EXPORT_C_(void) SPU2about(); EXPORT_C_(void) SPU2about();
EXPORT_C_(s32) SPU2test(); EXPORT_C_(s32) SPU2test();

1
common/include/api/USBApi.h
View File

@ -59,7 +59,6 @@ EXPORT_C_(void) USBsetRAM(void *mem);
EXPORT_C_(void) USBkeyEvent(keyEvent *ev); EXPORT_C_(void) USBkeyEvent(keyEvent *ev);
EXPORT_C_(s32) USBfreeze(u8 mode, freezeData *data); EXPORT_C_(s32) USBfreeze(u8 mode, freezeData *data);
EXPORT_C_(void) USBconfigure(); EXPORT_C_(void) USBconfigure();
EXPORT_C_(void) USBconfigpath(char *configpath);
EXPORT_C_(void) USBabout(); EXPORT_C_(void) USBabout();
EXPORT_C_(s32) USBtest(); EXPORT_C_(s32) USBtest();