notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libretro: Split update_controller_port_device()
[pcsx_rearmed.git]
/
libpcsxcore
/
plugins.c
diff --git
a/libpcsxcore/plugins.c
b/libpcsxcore/plugins.c
index
9b6de03
..
007b61e
100644
(file)
--- a/
libpcsxcore/plugins.c
+++ b/
libpcsxcore/plugins.c
@@
-612,7
+612,7
@@
void vibrate(int padIndex){
pad[padIndex].VibF[0] = pad[padIndex].Vib[0];
pad[padIndex].VibF[1] = pad[padIndex].Vib[1];
plat_trigger_vibrate(padIndex, pad[padIndex].VibF[0], pad[padIndex].VibF[1]);
pad[padIndex].VibF[0] = pad[padIndex].Vib[0];
pad[padIndex].VibF[1] = pad[padIndex].Vib[1];
plat_trigger_vibrate(padIndex, pad[padIndex].VibF[0], pad[padIndex].VibF[1]);
- printf("vibration pad %i", padIndex);
+
//
printf("vibration pad %i", padIndex);
}
}
}
}
@@
-764,7
+764,7
@@
unsigned char CALLBACK PAD1__startPoll(int pad) {
}
_PADstartPollMultitap(padd);
\r
}
}
_PADstartPollMultitap(padd);
\r
}
- printf("\npad 1 : ");
+
//
printf("\npad 1 : ");
return 0x00;
\r
}
\r
\r
return 0x00;
\r
}
\r
\r
@@
-775,7
+775,7
@@
unsigned char CALLBACK PAD1__poll(unsigned char value) {
}else{
tmp = _PADpoll(0, value);
}
}else{
tmp = _PADpoll(0, value);
}
- printf("%2x:%2x, ",value,tmp);
\r
+
//
printf("%2x:%2x, ",value,tmp);
\r
return tmp;
\r
\r
}
\r
return tmp;
\r
\r
}
\r
@@
-826,11
+826,16
@@
static int LoadPAD1plugin(const char *PAD1dll) {
unsigned char CALLBACK PAD2__startPoll(int pad) {
reqPos = 0;
\r
int pad_index = 0;
unsigned char CALLBACK PAD2__startPoll(int pad) {
reqPos = 0;
\r
int pad_index = 0;
- if(multitap2 == 2){
+ if(multitap1 == 0 && multitap2 == 0){
+ pad_index += 1;
+ }else if(multitap1 == 1 && multitap2 == 0){
+ pad_index += 4;
+ }else if(multitap1 == 0 && multitap2 == 2){
+ pad_index += 1;
+ }else if(multitap1 == 1 && multitap2 == 2){
pad_index += 4;
pad_index += 4;
- }else{
- pad_index = 1;
}
}
+
//first call the pad provide if a multitap is connected between the psx and himself
if(multitap2 == -1){
PadDataS padd;
//first call the pad provide if a multitap is connected between the psx and himself
if(multitap2 == -1){
PadDataS padd;
@@
-856,7
+861,7
@@
unsigned char CALLBACK PAD2__startPoll(int pad) {
}
_PADstartPollMultitap(padd);
\r
}
}
_PADstartPollMultitap(padd);
\r
}
- printf("\npad 2 : ");
+
//
printf("\npad 2 : ");
return 0x00;
\r
}
\r
\r
return 0x00;
\r
}
\r
\r
@@
-867,7
+872,7
@@
unsigned char CALLBACK PAD2__poll(unsigned char value) {
}else{
tmp = _PADpoll(1, value);
}
}else{
tmp = _PADpoll(1, value);
}
- printf("%2x:%2x, ",value,tmp);
\r
+
//
printf("%2x:%2x, ",value,tmp);
\r
return tmp;
\r
}
\r
\r
return tmp;
\r
}
\r
\r