From 61c4962abc49e430aabea5e565d93436a57cfa0a Mon Sep 17 00:00:00 2001 From: alexis-puska Date: Mon, 9 May 2016 10:33:05 +0100 Subject: Initial multitap support --- frontend/plugin.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'frontend/plugin.c') diff --git a/frontend/plugin.c b/frontend/plugin.c index 03fd47b..acc5601 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -49,28 +49,35 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int); extern int CALLBACK SPUplayCDDAchannel(short *, int); /* PAD */ -static long PADreadPort1(PadDataS *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_type1; - pad->buttonStatus = ~in_keystate; - if (in_type1 == PSE_PAD_TYPE_ANALOGPAD || in_type1 == PSE_PAD_TYPE_NEGCON) { - pad->leftJoyX = in_a1[0]; - pad->leftJoyY = in_a1[1]; - pad->rightJoyX = in_a2[0]; - pad->rightJoyY = in_a2[1]; + 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; } static long PADreadPort2(PadDataS *pad) { - pad->controllerType = in_type2; - pad->buttonStatus = ~in_keystate >> 16; - if (in_type2 == PSE_PAD_TYPE_ANALOGPAD || in_type2 == PSE_PAD_TYPE_NEGCON) { - pad->leftJoyX = in_a3[0]; - pad->leftJoyY = in_a3[1]; - pad->rightJoyX = in_a4[0]; - pad->rightJoyY = in_a4[1]; + 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; } -- cgit v1.2.3 From ace14ab3172ad90809a3cc5e8fe67d5cac9e294b Mon Sep 17 00:00:00 2001 From: cbransden Date: Mon, 9 May 2016 10:39:45 +0100 Subject: Added multitap core option & style nits --- frontend/plugin.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) (limited to 'frontend/plugin.c') 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 */ -- cgit v1.2.3 From 29f3675b9b2f24b8a16db73588b8b04d628eabd8 Mon Sep 17 00:00:00 2001 From: alexis-puska Date: Thu, 12 May 2016 01:45:26 +0200 Subject: second implementation of multitap add game/core option to enabled or disabled multitap. Test with micro machine V3 and 5 devices, 2 multitap enabled, all device react good i can’t test the 6 7 8 select player but i can select 8 gamer. The 2 multitap works fine. i detect a bug, when we change the game pad type to analog, the library crash, see it next time --- frontend/plugin.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'frontend/plugin.c') diff --git a/frontend/plugin.c b/frontend/plugin.c index d713452..cf93df8 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -49,10 +49,14 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int); extern int CALLBACK SPUplayCDDAchannel(short *, int); /* PAD */ -static long PADreadPort1(PadDataS *pad, int pad_index) -{ +static long PADreadPort1(PadDataS *pad, int pad_index) { pad->controllerType = in_type[pad_index]; pad->buttonStatus = ~in_keystate[pad_index]; + if(multitap1==1){ + pad->portMultitap=1; + }else{ + pad->portMultitap=0; + } 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]; @@ -62,15 +66,19 @@ static long PADreadPort1(PadDataS *pad, int pad_index) return 0; } -static long PADreadPort2(PadDataS *pad) -{ - 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]; +static long PADreadPort2(PadDataS *pad, int pad_index) { + pad->controllerType = in_type[pad_index]; + pad->buttonStatus = ~in_keystate[pad_index]; + if(multitap2==1){ + pad->portMultitap=2; + }else{ + pad->portMultitap=0; + } + 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; } -- cgit v1.2.3 From bebaef4be9a87d92b11bc29a002a531a9d1fa5d7 Mon Sep 17 00:00:00 2001 From: dankcushions Date: Fri, 13 May 2016 16:21:37 +0100 Subject: Defensive code to avoid SEGFAULT --- frontend/plugin.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'frontend/plugin.c') diff --git a/frontend/plugin.c b/frontend/plugin.c index cf93df8..53ecac9 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -67,7 +67,12 @@ static long PADreadPort1(PadDataS *pad, int pad_index) { } static long PADreadPort2(PadDataS *pad, int pad_index) { - pad->controllerType = in_type[pad_index]; + /* Temporary hack to avoid segfault when pad_index is a crazy number */ + if (pad_index <= 1 || pad_index > 8) { + pad_index = 1; + } + + pad->controllerType = in_type[pad_index]; pad->buttonStatus = ~in_keystate[pad_index]; if(multitap2==1){ pad->portMultitap=2; -- cgit v1.2.3 From 3b1a5e21b399fcb38c5d8ead3c16603f566d7ffa Mon Sep 17 00:00:00 2001 From: cbransden Date: Fri, 13 May 2016 17:50:34 +0100 Subject: Style nits --- frontend/plugin.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'frontend/plugin.c') diff --git a/frontend/plugin.c b/frontend/plugin.c index 53ecac9..5663e6d 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -52,12 +52,13 @@ extern int CALLBACK SPUplayCDDAchannel(short *, int); static long PADreadPort1(PadDataS *pad, int pad_index) { pad->controllerType = in_type[pad_index]; pad->buttonStatus = ~in_keystate[pad_index]; - if(multitap1==1){ - pad->portMultitap=1; - }else{ - pad->portMultitap=0; - } - if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) { + if (multitap1 == 1) + pad->portMultitap = 1; + else + pad->portMultitap = 0; + + 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]; @@ -74,12 +75,13 @@ static long PADreadPort2(PadDataS *pad, int pad_index) { pad->controllerType = in_type[pad_index]; pad->buttonStatus = ~in_keystate[pad_index]; - if(multitap2==1){ - pad->portMultitap=2; - }else{ - pad->portMultitap=0; - } - if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) { + if (multitap2 ==1 ) + pad->portMultitap = 2; + else + pad->portMultitap = 0; + + 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]; -- cgit v1.2.3