X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=c400165f3f6168eeeab80339f363c559ea004b8e;hb=8412166f53abb220b85e0aff47924c04724abfa4;hp=f77b6e1e810cf076c0f0ef74a51a83296790639a;hpb=b23cf6d99d6023da79344b3438278cf3fb35092f;p=pcsx_rearmed.git diff --git a/frontend/plugin.c b/frontend/plugin.c index f77b6e1e..c400165f 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -46,20 +46,7 @@ static long CALLBACK CDRgetTE(unsigned char _, unsigned char *__, unsigned char static void CALLBACK GPUdisplayText(char *_) { return; } /* SPU */ -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); +#include "../plugins/dfsound/spu.h" /* PAD */ static long CALLBACK PADinit(long _) { return 0; } @@ -68,23 +55,59 @@ 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) -{ - pad->controllerType = in_type[0]; - pad->buttonStatus = ~in_keystate[0]; - if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD) { - pad->leftJoyX = in_analog_left[0][0]; - pad->leftJoyY = in_analog_left[0][1]; - pad->rightJoyX = in_analog_right[0][0]; - pad->rightJoyY = in_analog_right[0][1]; +static long CALLBACK PADreadPort1(PadDataS *pad) { + int pad_index = pad->requestPadIndex; + + pad->controllerType = in_type[pad_index]; + pad->buttonStatus = ~in_keystate[pad_index]; + + pad->portMultitap = multitap1; + + 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 || in_type[pad_index] == PSE_PAD_TYPE_GUN) + { + 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 CALLBACK PADreadPort2(PadDataS *pad) -{ - pad->controllerType = in_type[1]; - pad->buttonStatus = ~in_keystate[0] >> 16; +static long CALLBACK PADreadPort2(PadDataS *pad) { + int pad_index = pad->requestPadIndex; + + pad->controllerType = in_type[pad_index]; + pad->buttonStatus = ~in_keystate[pad_index]; + + pad->portMultitap = multitap2; + + 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 || in_type[pad_index] == PSE_PAD_TYPE_GUN) + { + 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; } @@ -99,10 +122,11 @@ extern void GPUwriteDataMem(uint32_t *, int); extern uint32_t GPUreadStatus(void); extern uint32_t GPUreadData(void); extern void GPUreadDataMem(uint32_t *, int); -extern long GPUdmaChain(uint32_t *,uint32_t); +extern long GPUdmaChain(uint32_t *, uint32_t, uint32_t *, int32_t *); extern void GPUupdateLace(void); extern long GPUfreeze(uint32_t, void *); extern void GPUvBlank(int, int); +extern void GPUgetScreenInfo(int *y, int *base_hres); extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs); @@ -154,6 +178,7 @@ static const struct { DIRECT_SPU(SPUregisterScheduleCb), DIRECT_SPU(SPUasync), DIRECT_SPU(SPUplayCDDAchannel), + DIRECT_SPU(SPUsetCDvol), /* PAD */ DIRECT_PAD(PADinit), DIRECT_PAD(PADshutdown), @@ -186,6 +211,7 @@ static const struct { DIRECT_GPU(GPUdmaChain), DIRECT_GPU(GPUfreeze), DIRECT_GPU(GPUvBlank), + DIRECT_GPU(GPUgetScreenInfo), DIRECT_GPU(GPUrearmedCallbacks), DIRECT_GPU(GPUdisplayText), @@ -193,8 +219,6 @@ static const struct { DIRECT_GPU(GPUkeypressed), DIRECT_GPU(GPUmakeSnapshot), DIRECT_GPU(GPUconfigure), - DIRECT_GPU(GPUtest), - DIRECT_GPU(GPUabout), DIRECT_GPU(GPUgetScreenPic), DIRECT_GPU(GPUshowScreenPic), */ @@ -226,6 +250,9 @@ void plugin_call_rearmed_cbs(void) extern void *hGPUDriver; void (*rearmed_set_cbs)(const struct rearmed_cbs *cbs); + pl_rearmed_cbs.screen_centering_type_default = + Config.hacks.gpu_centering ? C_INGAME : C_AUTO; + rearmed_set_cbs = SysLoadSym(hGPUDriver, "GPUrearmedCallbacks"); if (rearmed_set_cbs != NULL) rearmed_set_cbs(&pl_rearmed_cbs); @@ -271,7 +298,7 @@ pc_hook_func_ret(long, GPU_dmaChain, (uint32_t *a0, int32_t a1), (a0, a1), P pc_hook_func (GPU_updateLace, (void), (), PCNT_GPU) 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_ret(unsigned short,SPU_readRegister, (unsigned long a0, , unsigned 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)