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

Plugin APIs: Now that I've figured out how multitaps work, fixed SIO API so it can theoretically actually work. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@788 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
mattmenke 2009-03-15 03:18:31 +00:00
parent fadeb5d86f
commit 579a907edf
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __GSAPI_H__ #ifndef __GSAPI_H__
#define __GSAPI_H__ #define __GSAPI_H__
@ -28,7 +28,7 @@
* shadowpcsx2@yahoo.gr, * shadowpcsx2@yahoo.gr,
* and florinsasu@hotmail.com * and florinsasu@hotmail.com
*/ */
#include "Pcsx2Api.h" #include "Pcsx2Api.h"
typedef struct _GSdriverInfo { typedef struct _GSdriverInfo {
@ -79,7 +79,7 @@ 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) SGSconfigpath(char *configpath); EXPORT_C_(void) GSconfigpath(char *configpath);
EXPORT_C_(void) GSabout(); EXPORT_C_(void) GSabout();
EXPORT_C_(s32) GStest(); EXPORT_C_(s32) GStest();

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

@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __SIOAPI_H__ #ifndef __SIOAPI_H__
#define __SIOAPI_H__ #define __SIOAPI_H__
@ -28,14 +28,23 @@
* shadowpcsx2@yahoo.gr, * shadowpcsx2@yahoo.gr,
* and florinsasu@hotmail.com * and florinsasu@hotmail.com
*/ */
#include "Pcsx2Api.h" #include "Pcsx2Api.h"
/* SIO plugin API */ /* SIO plugin API */
// Called by SIO_TYPE_MTAP plugins to change the slot.
// Slot is then passed to memcard and pad plugins on SIOstartPoll.
// MTAP SIO plugins should ignore slot vvalues on startPoll, as should RMs (probably).
typedef int (CALLBACK * SIOchangeSlotCB)(int slot);
// Basic functions. // Basic functions.
EXPORT_C_(s32) SIOinit(); // Types is an or-ed combination of SioTypes to initialize. It'd probably be simplest
// just to make each SIO plugin support only one type, for simplicity.
// SIOchangeSlotCB should *only* be called by MTAP plugins.
EXPORT_C_(s32) SIOinit(int types, SIOchangeSlotCB f);
// Single plugin can only be PAD, MTAP, RM, or MC. Only load one plugin of each type, // Single plugin can only be PAD, MTAP, RM, or MC. Only load one plugin of each type,
// but not both a PAD and MTAP. Simplifies plugin selection and interface, as well // but not both a PAD and MTAP. Simplifies plugin selection and interface, as well
// as API. // as API.
@ -43,9 +52,11 @@ EXPORT_C_(s32) SIOinit();
EXPORT_C_(s32) SIOopen(void *pDisplay); EXPORT_C_(s32) SIOopen(void *pDisplay);
EXPORT_C_(void) SIOclose(); EXPORT_C_(void) SIOclose();
EXPORT_C_(void) SIOshutdown(); EXPORT_C_(void) SIOshutdown();
// Returns 0 if device doesn't exist. Simplifies things. Also means you don't
// have to distinguish between MTAP and PAD SIO plugins. // Returns 0 if device doesn't exist. Means old pad plugins can just say nothing
// connected to other slots, and SIOpoll won't be called on those slots, ideally.
EXPORT_C_(s32) SIOstartPoll(u8 deviceType, u32 port, u32 slot, u8 *returnValue); EXPORT_C_(s32) SIOstartPoll(u8 deviceType, u32 port, u32 slot, u8 *returnValue);
// Returns 0 on the last output byte. // Returns 0 on the last output byte.
EXPORT_C_(s32) SIOpoll(u8 value, u8 *returnValue); EXPORT_C_(s32) SIOpoll(u8 value, u8 *returnValue);