X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=d9eb04a40be1070f06700a79daf1293c6de16af8;hp=d2d3dbab2dcd6c6d439e14fde580f039b5995ef3;hb=HEAD;hpb=980f7a58b47fefd3424bf8d55f6345128dc3774c diff --git a/frontend/plugin.c b/frontend/plugin.c index d2d3dbab..b3ad3bd9 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -13,56 +13,102 @@ #include "plugin.h" #include "psemu_plugin_defs.h" #include "../libpcsxcore/system.h" +#include "../libpcsxcore/psxcommon.h" #include "../plugins/cdrcimg/cdrcimg.h" // this can't be __stdcall like it was in PSEmu API as too many functions are mixed up #undef CALLBACK #define CALLBACK -static long CALLBACK dummy_func() { - return 0; -} +/* 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; } +static long CALLBACK CDRprefetch(unsigned char m, unsigned char s, unsigned char f) { return 1; } + +/* GPU */ +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 SPUplaySample(unsigned char); -extern void CALLBACK SPUwriteRegister(unsigned long, unsigned short, unsigned int); -extern unsigned short CALLBACK SPUreadRegister(unsigned long); -extern void CALLBACK SPUwriteDMA(unsigned short); -extern unsigned short CALLBACK SPUreadDMA(void); -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 SPUconfigure(void); -extern long CALLBACK SPUtest(void); -extern void CALLBACK SPUabout(void); -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 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 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]; + + 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; } @@ -77,22 +123,18 @@ 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); -#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) @@ -103,38 +145,33 @@ 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), + DIRECT_CDR(CDRprefetch), /* 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), @@ -143,22 +180,23 @@ static const struct { DIRECT_SPU(SPUregisterScheduleCb), DIRECT_SPU(SPUasync), DIRECT_SPU(SPUplayCDDAchannel), + DIRECT_SPU(SPUsetCDvol), /* 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), @@ -175,15 +213,14 @@ static const struct { DIRECT_GPU(GPUdmaChain), DIRECT_GPU(GPUfreeze), DIRECT_GPU(GPUvBlank), + DIRECT_GPU(GPUgetScreenInfo), DIRECT_GPU(GPUrearmedCallbacks), - DUMMY_GPU(GPUdisplayText), + DIRECT_GPU(GPUdisplayText), /* DIRECT_GPU(GPUkeypressed), DIRECT_GPU(GPUmakeSnapshot), DIRECT_GPU(GPUconfigure), - DIRECT_GPU(GPUtest), - DIRECT_GPU(GPUabout), DIRECT_GPU(GPUgetScreenPic), DIRECT_GPU(GPUshowScreenPic), */ @@ -215,6 +252,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); @@ -260,9 +300,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 (SPU_writeDMA, (unsigned short a0), (a0), PCNT_SPU) -pc_hook_func_ret(unsigned short,SPU_readDMA, (void), (), 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) @@ -288,8 +326,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);