X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=2c95a67aff2bcca22c7607925c7136c420e0a0f9;hb=2db412ade2b09ca04da81d91b75bbf6475dbde5a;hp=7e8e5c3f99a9840f5389b2e2c823f5470b4f22b3;hpb=da710571b75db7031b82924ab3ad47eb645ce215;p=pcsx_rearmed.git diff --git a/frontend/plugin.c b/frontend/plugin.c index 7e8e5c3f..2c95a67a 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -13,51 +13,120 @@ #include "plugin.h" #include "psemu_plugin_defs.h" #include "../libpcsxcore/system.h" +#include "../libpcsxcore/psxcommon.h" #include "../plugins/cdrcimg/cdrcimg.h" -static int dummy_func() { - return 0; -} +// this can't be __stdcall like it was in PSEmu API as too many functions are mixed up +#undef CALLBACK +#define CALLBACK + +/* CDR */ +struct CdrStat; +static long CALLBACK CDRinit(void) { return 0; } +static long CALLBACK CDRshutdown(void) { return 0; } +static long CALLBACK CDRopen(void) { return 0; } +static long CALLBACK CDRclose(void) { return 0; } +static long CALLBACK CDRgetTN(unsigned char *_) { return 0; } +static long CALLBACK CDRgetTD(unsigned char _, unsigned char *__) { return 0; } +static boolean CALLBACK CDRreadTrack(unsigned char *_) { return FALSE; } +static unsigned char * CALLBACK CDRgetBuffer(void) { return NULL; } +static unsigned char * CALLBACK CDRgetBufferSub(int sector) { return NULL; } +static long CALLBACK CDRconfigure(void) { return 0; } +static long CALLBACK CDRtest(void) { return 0; } +static void CALLBACK CDRabout(void) { return; } +static long CALLBACK CDRplay(unsigned char *_) { return 0; } +static long CALLBACK CDRstop(void) { return 0; } +static long CALLBACK CDRsetfilename(char *_) { return 0; } +static long CALLBACK CDRgetStatus(struct CdrStat *_) { return 0; } +static char * CALLBACK CDRgetDriveLetter(void) { return NULL; } +static long CALLBACK CDRreadCDDA(unsigned char _, unsigned char __, unsigned char ___, unsigned char *____) { return 0; } +static long CALLBACK CDRgetTE(unsigned char _, unsigned char *__, unsigned char *___, unsigned char *____) { return 0; } + +/* GPU */ +static void CALLBACK GPUdisplayText(char *_) { return; } /* SPU */ -extern long SPUopen(void); -extern long SPUinit(void); -extern long SPUshutdown(void); -extern long SPUclose(void); -extern void SPUplaySample(unsigned char); -extern void SPUwriteRegister(unsigned long, unsigned short); -extern unsigned short SPUreadRegister(unsigned long); -extern void SPUwriteDMA(unsigned short); -extern unsigned short SPUreadDMA(void); -extern void SPUwriteDMAMem(unsigned short *, int); -extern void SPUreadDMAMem(unsigned short *, int); -extern void SPUplayADPCMchannel(void *); -extern void SPUregisterCallback(void (*callback)(void)); -extern long SPUconfigure(void); -extern long SPUtest(void); -extern void SPUabout(void); -extern long SPUfreeze(unsigned int, void *); -extern void SPUasync(unsigned int); -extern int SPUplayCDDAchannel(short *, int); +extern long CALLBACK SPUopen(void); +extern long CALLBACK SPUinit(void); +extern long CALLBACK SPUshutdown(void); +extern long CALLBACK SPUclose(void); +extern void CALLBACK SPUwriteRegister(unsigned long, unsigned short, unsigned int); +extern unsigned short CALLBACK SPUreadRegister(unsigned long); +extern void CALLBACK SPUwriteDMAMem(unsigned short *, int, unsigned int); +extern void CALLBACK SPUreadDMAMem(unsigned short *, int, unsigned int); +extern void CALLBACK SPUplayADPCMchannel(void *, unsigned int, int); +extern void CALLBACK SPUregisterCallback(void (*cb)(void)); +extern void CALLBACK SPUregisterScheduleCb(void (*cb)(unsigned int)); +extern long CALLBACK SPUfreeze(unsigned int, void *, unsigned int); +extern void CALLBACK SPUasync(unsigned int, unsigned int); +extern int CALLBACK SPUplayCDDAchannel(short *, int, unsigned int, int); /* PAD */ -static long PADreadPort1(PadDataS *pad) -{ - pad->controllerType = in_type1; - pad->buttonStatus = ~in_keystate; - if (in_type1 == PSE_PAD_TYPE_ANALOGPAD) { - pad->leftJoyX = in_a1[0]; - pad->leftJoyY = in_a1[1]; - pad->rightJoyX = in_a2[0]; - pad->rightJoyY = in_a2[1]; +static long CALLBACK PADinit(long _) { return 0; } +static long CALLBACK PADopen(unsigned long *_) { return 0; } +static long CALLBACK PADshutdown(void) { return 0; } +static long CALLBACK PADclose(void) { return 0; } +static void CALLBACK PADsetSensitive(int _) { return; } + +static long CALLBACK PADreadPort1(PadDataS *pad) { + int pad_index = pad->requestPadIndex; + + pad->controllerType = in_type[pad_index]; + pad->buttonStatus = ~in_keystate[pad_index]; + + if (multitap1 == 1) + pad->portMultitap = 1; + else + pad->portMultitap = 0; + + if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON) + { + pad->leftJoyX = in_analog_left[pad_index][0]; + pad->leftJoyY = in_analog_left[pad_index][1]; + pad->rightJoyX = in_analog_right[pad_index][0]; + pad->rightJoyY = in_analog_right[pad_index][1]; + + pad->absoluteX = in_analog_left[pad_index][0]; + pad->absoluteY = in_analog_left[pad_index][1]; } + + if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE) + { + pad->moveX = in_mouse[pad_index][0]; + pad->moveY = in_mouse[pad_index][1]; + } + return 0; } -static long PADreadPort2(PadDataS *pad) -{ - pad->controllerType = in_type2; - pad->buttonStatus = ~in_keystate >> 16; +static long CALLBACK PADreadPort2(PadDataS *pad) { + int pad_index = pad->requestPadIndex; + + pad->controllerType = in_type[pad_index]; + pad->buttonStatus = ~in_keystate[pad_index]; + + if (multitap2 == 1) + pad->portMultitap = 2; + else + pad->portMultitap = 0; + + if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON) + { + pad->leftJoyX = in_analog_left[pad_index][0]; + pad->leftJoyY = in_analog_left[pad_index][1]; + pad->rightJoyX = in_analog_right[pad_index][0]; + pad->rightJoyY = in_analog_right[pad_index][1]; + + pad->absoluteX = in_analog_left[pad_index][0]; + pad->absoluteY = in_analog_left[pad_index][1]; + } + + if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE) + { + pad->moveX = in_mouse[pad_index][0]; + pad->moveY = in_mouse[pad_index][1]; + } + return 0; } @@ -79,15 +148,10 @@ extern void GPUvBlank(int, int); extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs); -#define DUMMY(id, name) \ - { id, #name, dummy_func } - #define DIRECT(id, name) \ { id, #name, name } -#define DUMMY_GPU(name) DUMMY(PLUGIN_GPU, name) -#define DUMMY_CDR(name) DUMMY(PLUGIN_CDR, name) -#define DUMMY_PAD(name) DUMMY(PLUGIN_PAD, name) +#define DIRECT_CDR(name) DIRECT(PLUGIN_CDR, name) #define DIRECT_SPU(name) DIRECT(PLUGIN_SPU, name) #define DIRECT_GPU(name) DIRECT(PLUGIN_GPU, name) #define DIRECT_PAD(name) DIRECT(PLUGIN_PAD, name) @@ -98,61 +162,56 @@ static const struct { void *func; } plugin_funcs[] = { /* CDR */ - DUMMY_CDR(CDRinit), - DUMMY_CDR(CDRshutdown), - DUMMY_CDR(CDRopen), - DUMMY_CDR(CDRclose), - DUMMY_CDR(CDRtest), - DUMMY_CDR(CDRgetTN), - DUMMY_CDR(CDRgetTD), - DUMMY_CDR(CDRreadTrack), - DUMMY_CDR(CDRgetBuffer), - DUMMY_CDR(CDRgetBufferSub), - DUMMY_CDR(CDRplay), - DUMMY_CDR(CDRstop), - DUMMY_CDR(CDRgetStatus), - DUMMY_CDR(CDRgetDriveLetter), - DUMMY_CDR(CDRconfigure), - DUMMY_CDR(CDRabout), - DUMMY_CDR(CDRsetfilename), - DUMMY_CDR(CDRreadCDDA), - DUMMY_CDR(CDRgetTE), + DIRECT_CDR(CDRinit), + DIRECT_CDR(CDRshutdown), + DIRECT_CDR(CDRopen), + DIRECT_CDR(CDRclose), + DIRECT_CDR(CDRtest), + DIRECT_CDR(CDRgetTN), + DIRECT_CDR(CDRgetTD), + DIRECT_CDR(CDRreadTrack), + DIRECT_CDR(CDRgetBuffer), + DIRECT_CDR(CDRgetBufferSub), + DIRECT_CDR(CDRplay), + DIRECT_CDR(CDRstop), + DIRECT_CDR(CDRgetStatus), + DIRECT_CDR(CDRgetDriveLetter), + DIRECT_CDR(CDRconfigure), + DIRECT_CDR(CDRabout), + DIRECT_CDR(CDRsetfilename), + DIRECT_CDR(CDRreadCDDA), + DIRECT_CDR(CDRgetTE), /* SPU */ - DIRECT_SPU(SPUconfigure), - DIRECT_SPU(SPUabout), DIRECT_SPU(SPUinit), DIRECT_SPU(SPUshutdown), - DIRECT_SPU(SPUtest), DIRECT_SPU(SPUopen), DIRECT_SPU(SPUclose), -// DIRECT_SPU(SPUplaySample), // unused? DIRECT_SPU(SPUwriteRegister), DIRECT_SPU(SPUreadRegister), - DIRECT_SPU(SPUwriteDMA), - DIRECT_SPU(SPUreadDMA), DIRECT_SPU(SPUwriteDMAMem), DIRECT_SPU(SPUreadDMAMem), DIRECT_SPU(SPUplayADPCMchannel), DIRECT_SPU(SPUfreeze), DIRECT_SPU(SPUregisterCallback), + DIRECT_SPU(SPUregisterScheduleCb), DIRECT_SPU(SPUasync), DIRECT_SPU(SPUplayCDDAchannel), /* PAD */ - DUMMY_PAD(PADinit), - DUMMY_PAD(PADshutdown), - DUMMY_PAD(PADopen), - DUMMY_PAD(PADclose), - DUMMY_PAD(PADsetSensitive), + DIRECT_PAD(PADinit), + DIRECT_PAD(PADshutdown), + DIRECT_PAD(PADopen), + DIRECT_PAD(PADclose), + DIRECT_PAD(PADsetSensitive), DIRECT_PAD(PADreadPort1), DIRECT_PAD(PADreadPort2), /* - DUMMY_PAD(PADquery), - DUMMY_PAD(PADconfigure), - DUMMY_PAD(PADtest), - DUMMY_PAD(PADabout), - DUMMY_PAD(PADkeypressed), - DUMMY_PAD(PADstartPoll), - DUMMY_PAD(PADpoll), + DIRECT_PAD(PADquery), + DIRECT_PAD(PADconfigure), + DIRECT_PAD(PADtest), + DIRECT_PAD(PADabout), + DIRECT_PAD(PADkeypressed), + DIRECT_PAD(PADstartPoll), + DIRECT_PAD(PADpoll), */ /* GPU */ DIRECT_GPU(GPUupdateLace), @@ -171,7 +230,7 @@ static const struct { DIRECT_GPU(GPUvBlank), DIRECT_GPU(GPUrearmedCallbacks), - DUMMY_GPU(GPUdisplayText), + DIRECT_GPU(GPUdisplayText), /* DIRECT_GPU(GPUkeypressed), DIRECT_GPU(GPUmakeSnapshot), @@ -181,7 +240,6 @@ static const struct { DIRECT_GPU(GPUgetScreenPic), DIRECT_GPU(GPUshowScreenPic), */ -// DIRECT_GPU(GPUclearDynarec), }; void *plugin_link(enum builtint_plugins_e id, const char *sym) @@ -254,15 +312,13 @@ pc_hook_func (GPU_readDataMem, (uint32_t *a0, int a1), (a0, a1), PC pc_hook_func_ret(long, GPU_dmaChain, (uint32_t *a0, int32_t a1), (a0, a1), PCNT_GPU) pc_hook_func (GPU_updateLace, (void), (), PCNT_GPU) -pc_hook_func (SPU_writeRegister, (unsigned long a0, unsigned short a1), (a0, a1), PCNT_SPU) +pc_hook_func (SPU_writeRegister, (unsigned long a0, unsigned short a1, uint32_t a2), (a0, a1, a2), PCNT_SPU) pc_hook_func_ret(unsigned short,SPU_readRegister, (unsigned long a0), (a0), PCNT_SPU) -pc_hook_func (SPU_writeDMA, (unsigned short a0), (a0), PCNT_SPU) -pc_hook_func_ret(unsigned short,SPU_readDMA, (void), (), PCNT_SPU) -pc_hook_func (SPU_writeDMAMem, (unsigned short *a0, int a1), (a0, a1), PCNT_SPU) -pc_hook_func (SPU_readDMAMem, (unsigned short *a0, int a1), (a0, a1), PCNT_SPU) -pc_hook_func (SPU_playADPCMchannel, (void *a0), (a0), PCNT_SPU) -pc_hook_func (SPU_async, (unsigned int a0), (a0), PCNT_SPU) -pc_hook_func_ret(int, SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), PCNT_SPU) +pc_hook_func (SPU_writeDMAMem, (unsigned short *a0, int a1, uint32_t a2), (a0, a1, a2), PCNT_SPU) +pc_hook_func (SPU_readDMAMem, (unsigned short *a0, int a1, uint32_t a2), (a0, a1, a2), PCNT_SPU) +pc_hook_func (SPU_playADPCMchannel, (void *a0, unsigned int a1, int a2), (a0, a1, a2), PCNT_SPU) +pc_hook_func (SPU_async, (uint32_t a0, uint32_t a1), (a0, a1), PCNT_SPU) +pc_hook_func_ret(int, SPU_playCDDAchannel, (short *a0, int a1, unsigned int a2, int a3), (a0, a1, a2, a3), PCNT_SPU) #define hook_it(name) { \ o_##name = name; \ @@ -283,8 +339,6 @@ void pcnt_hook_plugins(void) hook_it(GPU_updateLace); hook_it(SPU_writeRegister); hook_it(SPU_readRegister); - hook_it(SPU_writeDMA); - hook_it(SPU_readDMA); hook_it(SPU_writeDMAMem); hook_it(SPU_readDMAMem); hook_it(SPU_playADPCMchannel);