X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=cf3d575dce6292370d73a4ae0edc64c98f730163;hp=6c83a4477833cfc312dccc2455c60f0986f4a4e7;hb=e06ee7f47a951fd8abe122969bedeb2983bf8dc2;hpb=201c21e2ad6be25a4b843d1434eabb432ce72884 diff --git a/frontend/plugin.c b/frontend/plugin.c index 6c83a447..cf3d575d 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -11,7 +11,7 @@ #include "plugin_lib.h" #include "plugin.h" -#include "../libpcsxcore/psemu_plugin_defs.h" +#include "psemu_plugin_defs.h" #include "../libpcsxcore/system.h" #include "../plugins/cdrcimg/cdrcimg.h" @@ -25,33 +25,40 @@ 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 void SPUwriteRegister(unsigned long, unsigned short, unsigned int); 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 SPUwriteDMAMem(unsigned short *, int, unsigned int); +extern void SPUreadDMAMem(unsigned short *, int, unsigned int); extern void SPUplayADPCMchannel(void *); -extern void SPUregisterCallback(void (*callback)(void)); +extern void SPUregisterCallback(void (*cb)(void)); +extern void SPUregisterScheduleCb(void (*cb)(unsigned int)); extern long SPUconfigure(void); extern long SPUtest(void); extern void SPUabout(void); -extern long SPUfreeze(unsigned int, void *); -extern void SPUasync(unsigned int); -extern void SPUplayCDDAchannel(short *, int); +extern long SPUfreeze(unsigned int, void *, unsigned int); +extern void SPUasync(unsigned int, unsigned int); +extern int SPUplayCDDAchannel(short *, int); /* PAD */ static long PADreadPort1(PadDataS *pad) { - pad->controllerType = PSE_PAD_TYPE_STANDARD; - pad->buttonStatus = ~keystate; + 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]; + } return 0; } static long PADreadPort2(PadDataS *pad) { - pad->controllerType = PSE_PAD_TYPE_STANDARD; - pad->buttonStatus = ~keystate >> 16; + pad->controllerType = in_type2; + pad->buttonStatus = ~in_keystate >> 16; return 0; } @@ -68,17 +75,9 @@ extern uint32_t GPUreadData(void); extern void GPUreadDataMem(uint32_t *, int); extern long GPUdmaChain(uint32_t *,uint32_t); extern void GPUupdateLace(void); -extern long GPUconfigure(void); -extern long GPUtest(void); -extern void GPUabout(void); -extern void GPUmakeSnapshot(void); -extern void GPUkeypressed(int); -extern void GPUdisplayText(char *); extern long GPUfreeze(uint32_t, void *); -extern long GPUgetScreenPic(unsigned char *); -extern long GPUshowScreenPic(unsigned char *); -extern void GPUclearDynarec(void (*callback)(void)); -extern void GPUvBlank(int); +extern void GPUvBlank(int, int); +extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs); #define DUMMY(id, name) \ @@ -87,6 +86,7 @@ extern void GPUvBlank(int); #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_SPU(name) DIRECT(PLUGIN_SPU, name) @@ -136,6 +136,7 @@ static const struct { DIRECT_SPU(SPUplayADPCMchannel), DIRECT_SPU(SPUfreeze), DIRECT_SPU(SPUregisterCallback), + DIRECT_SPU(SPUregisterScheduleCb), DIRECT_SPU(SPUasync), DIRECT_SPU(SPUplayCDDAchannel), /* PAD */ @@ -159,9 +160,6 @@ static const struct { DIRECT_GPU(GPUupdateLace), DIRECT_GPU(GPUinit), DIRECT_GPU(GPUshutdown), - DIRECT_GPU(GPUconfigure), - DIRECT_GPU(GPUtest), - DIRECT_GPU(GPUabout), DIRECT_GPU(GPUopen), DIRECT_GPU(GPUclose), DIRECT_GPU(GPUreadStatus), @@ -171,14 +169,21 @@ static const struct { DIRECT_GPU(GPUwriteData), DIRECT_GPU(GPUwriteDataMem), DIRECT_GPU(GPUdmaChain), + DIRECT_GPU(GPUfreeze), + DIRECT_GPU(GPUvBlank), + DIRECT_GPU(GPUrearmedCallbacks), + + DUMMY_GPU(GPUdisplayText), +/* DIRECT_GPU(GPUkeypressed), - DIRECT_GPU(GPUdisplayText), DIRECT_GPU(GPUmakeSnapshot), - DIRECT_GPU(GPUfreeze), + DIRECT_GPU(GPUconfigure), + DIRECT_GPU(GPUtest), + DIRECT_GPU(GPUabout), DIRECT_GPU(GPUgetScreenPic), DIRECT_GPU(GPUshowScreenPic), +*/ // DIRECT_GPU(GPUclearDynarec), -// DIRECT_GPU(GPUvBlank), }; void *plugin_link(enum builtint_plugins_e id, const char *sym) @@ -251,15 +256,15 @@ 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_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), (a0), PCNT_SPU) -pc_hook_func (SPU_async, (unsigned int a0), (a0), PCNT_SPU) -pc_hook_func (SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), 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), (a0, a1), PCNT_SPU) #define hook_it(name) { \ o_##name = name; \ @@ -268,8 +273,7 @@ pc_hook_func (SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), P void pcnt_hook_plugins(void) { - /* test it first */ - pcnt_get(); + pcnt_init(); hook_it(GPU_writeStatus); hook_it(GPU_writeData); @@ -290,4 +294,15 @@ void pcnt_hook_plugins(void) hook_it(SPU_playCDDAchannel); } +// hooked into recompiler +void pcnt_gte_start(int op) +{ + pcnt_start(PCNT_GTE); +} + +void pcnt_gte_end(int op) +{ + pcnt_end(PCNT_GTE); +} + #endif