#include "../libpcsxcore/system.h"
#include "../plugins/cdrcimg/cdrcimg.h"
-static int dummy_func() {
+// 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;
}
/* 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, unsigned int);
-extern unsigned short SPUreadRegister(unsigned long);
-extern void SPUwriteDMA(unsigned short);
-extern unsigned short SPUreadDMA(void);
-extern void SPUwriteDMAMem(unsigned short *, int, unsigned int);
-extern void SPUreadDMAMem(unsigned short *, int, unsigned int);
-extern void SPUplayADPCMchannel(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 *, unsigned int);
-extern void SPUasync(unsigned int, 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)
+static long CALLBACK 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];
+ 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];
}
return 0;
}
-static long PADreadPort2(PadDataS *pad)
+static long CALLBACK PADreadPort2(PadDataS *pad)
{
- pad->controllerType = in_type2;
- pad->buttonStatus = ~in_keystate >> 16;
+ pad->controllerType = in_type[1];
+ pad->buttonStatus = ~in_keystate[0] >> 16;
return 0;
}
DUMMY_CDR(CDRreadCDDA),
DUMMY_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_GPU(GPUgetScreenPic),
DIRECT_GPU(GPUshowScreenPic),
*/
-// DIRECT_GPU(GPUclearDynarec),
};
void *plugin_link(enum builtint_plugins_e id, const char *sym)
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, 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_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), (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; \
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);