X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=b3ad3bd98db95e4d44d49b1a6121255252929ea4;hb=HEAD;hp=bcf3885aaedbea6bc3c637b2c0bae31dbb2b745d;hpb=fa9cfe0a7ff390f15bfdc6add7e57841173d1954;p=pcsx_rearmed.git diff --git a/frontend/plugin.c b/frontend/plugin.c index bcf3885a..b3ad3bd9 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -9,51 +9,107 @@ #include #include +#include "plugin_lib.h" #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 -static long CDRreadTrack(unsigned char *time) { - fprintf(stderr, "CDRreadTrack\n"); - return -1; -} +/* 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 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 void SPUplayCDDAchannel(short *, int); +#include "../plugins/dfsound/spu.h" /* PAD */ -static uint8_t CurByte; +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; -static unsigned char PADstartPoll(int pad) { - CurByte = 0; - return 0xFF; + 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 unsigned char PADpoll(unsigned char value) { - static uint8_t buf[] = {0x41, 0x5A, 0xFF, 0xFF, 0x80, 0x80, 0x80, 0x80}; - if (CurByte >= 4) - return 0; - return buf[CurByte++]; +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; } /* GPU */ @@ -67,29 +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 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 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_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) @@ -100,68 +145,63 @@ 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(PLUGIN_CDR, CDRreadTrack), + 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), DIRECT_SPU(SPUfreeze), DIRECT_SPU(SPUregisterCallback), + DIRECT_SPU(SPUregisterScheduleCb), DIRECT_SPU(SPUasync), DIRECT_SPU(SPUplayCDDAchannel), + DIRECT_SPU(SPUsetCDvol), /* PAD */ - DUMMY_PAD(PADconfigure), - DUMMY_PAD(PADabout), - DUMMY_PAD(PADinit), - DUMMY_PAD(PADshutdown), - DUMMY_PAD(PADtest), - DUMMY_PAD(PADopen), - DUMMY_PAD(PADclose), - DUMMY_PAD(PADquery), - DUMMY_PAD(PADreadPort1), - DUMMY_PAD(PADreadPort2), - DUMMY_PAD(PADkeypressed), - DUMMY_PAD(PADsetSensitive), + DIRECT_PAD(PADinit), + DIRECT_PAD(PADshutdown), + DIRECT_PAD(PADopen), + DIRECT_PAD(PADclose), + DIRECT_PAD(PADsetSensitive), + DIRECT_PAD(PADreadPort1), + DIRECT_PAD(PADreadPort2), +/* + 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), 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,20 +211,28 @@ static const struct { DIRECT_GPU(GPUwriteData), DIRECT_GPU(GPUwriteDataMem), DIRECT_GPU(GPUdmaChain), - DIRECT_GPU(GPUkeypressed), + DIRECT_GPU(GPUfreeze), + DIRECT_GPU(GPUvBlank), + DIRECT_GPU(GPUgetScreenInfo), + DIRECT_GPU(GPUrearmedCallbacks), + DIRECT_GPU(GPUdisplayText), +/* + DIRECT_GPU(GPUkeypressed), DIRECT_GPU(GPUmakeSnapshot), - DIRECT_GPU(GPUfreeze), + DIRECT_GPU(GPUconfigure), DIRECT_GPU(GPUgetScreenPic), DIRECT_GPU(GPUshowScreenPic), -// DIRECT_GPU(GPUclearDynarec), -// DIRECT_GPU(GPUvBlank), +*/ }; void *plugin_link(enum builtint_plugins_e id, const char *sym) { int i; + if (id == PLUGIN_CDRCIMG) + return cdrcimg_get_sym(sym); + for (i = 0; i < ARRAY_SIZE(plugin_funcs); i++) { if (id != plugin_funcs[i].id) continue; @@ -195,10 +243,23 @@ void *plugin_link(enum builtint_plugins_e id, const char *sym) return plugin_funcs[i].func; } - fprintf(stderr, "plugin_link: missing symbol %d %s\n", id, sym); + //fprintf(stderr, "plugin_link: missing symbol %d %s\n", id, sym); return NULL; } +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); +} + #ifdef PCNT /* basic profile stuff */ @@ -238,15 +299,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_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 (SPU_playCDDAchannel, (short *a0, int 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, , 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) +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; \ @@ -255,8 +314,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); @@ -268,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); @@ -277,4 +333,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