diff options
| author | cbransden | 2016-05-09 10:39:45 +0100 |
|---|---|---|
| committer | cbransden | 2016-05-13 18:29:27 +0100 |
| commit | ace14ab3172ad90809a3cc5e8fe67d5cac9e294b (patch) | |
| tree | 881e4a806d2745bb90b8caeba3918e4e155c1b06 /frontend/plugin.c | |
| parent | 61c4962abc49e430aabea5e565d93436a57cfa0a (diff) | |
| download | pcsx_rearmed-ace14ab3172ad90809a3cc5e8fe67d5cac9e294b.tar.gz pcsx_rearmed-ace14ab3172ad90809a3cc5e8fe67d5cac9e294b.tar.bz2 pcsx_rearmed-ace14ab3172ad90809a3cc5e8fe67d5cac9e294b.zip | |
Added multitap core option & style nits
Diffstat (limited to 'frontend/plugin.c')
| -rw-r--r-- | frontend/plugin.c | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/frontend/plugin.c b/frontend/plugin.c index acc5601..d713452 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -49,37 +49,30 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int); extern int CALLBACK SPUplayCDDAchannel(short *, int); /* PAD */ - - -// Lecture du port de la playstation, etat des boutons lu à cette endroit ! -// Distribution des manettes en fonction du port. Si 2, une sur chacun des ports. -// Si supérieur a deux on en connecte 4 sur port 1 et le reste sur port 2 static long PADreadPort1(PadDataS *pad, int pad_index) { - pad->controllerType = in_type[pad_index]; - pad->buttonStatus = ~in_keystate[pad_index]; - //pad->buttonStatus = ~in_keystate; - if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) { - 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]; - } - return 0; + pad->controllerType = in_type[pad_index]; + pad->buttonStatus = ~in_keystate[pad_index]; + if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) { + 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]; + } + return 0; } static long PADreadPort2(PadDataS *pad) { - pad->controllerType = in_type[4]; - pad->buttonStatus = ~in_keystate[4]; - //pad->buttonStatus = ~in_keystate >> 16; - if (in_type[4] == PSE_PAD_TYPE_ANALOGPAD || in_type[4] == PSE_PAD_TYPE_NEGCON) { - pad->leftJoyX = in_analog_left[4][0]; - pad->leftJoyY = in_analog_left[4][1]; - pad->rightJoyX = in_analog_right[4][0]; - pad->rightJoyY = in_analog_right[4][1]; - } - return 0; + pad->controllerType = in_type[4]; + pad->buttonStatus = ~in_keystate[4]; + if (in_type[4] == PSE_PAD_TYPE_ANALOGPAD || in_type[4] == PSE_PAD_TYPE_NEGCON) { + pad->leftJoyX = in_analog_left[4][0]; + pad->leftJoyY = in_analog_left[4][1]; + pad->rightJoyX = in_analog_right[4][0]; + pad->rightJoyY = in_analog_right[4][1]; + } + return 0; } /* GPU */ |