From b268bbc53172c6d1790246b84a9baa9010b3afd8 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Wed, 2 Dec 2009 15:02:08 +0000 Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@38673 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- ChangeLog | 5 +++ macosx/plugins/HIDInput/src/PlugPAD.c | 72 +---------------------------------- plugins/dfinput/pad.c | 72 +---------------------------------- 3 files changed, 7 insertions(+), 142 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa451212..8581d075 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +December 2, 2009 Wei Mingzhi + + * plugins/dfinput/pad.c: Removed DualShock2-specific stuff in PADpoll(). + * macosx/plugins/HIDInput/src/PlugPAD.c: Likewise. + December 1, 2009 Wei Mingzhi * plugins/dfcdrom/cdr-linux.c: Fixed crash bug when resuming emulation in diff --git a/macosx/plugins/HIDInput/src/PlugPAD.c b/macosx/plugins/HIDInput/src/PlugPAD.c index c294993d..4b63a990 100644 --- a/macosx/plugins/HIDInput/src/PlugPAD.c +++ b/macosx/plugins/HIDInput/src/PlugPAD.c @@ -378,82 +378,12 @@ unsigned char PADpoll(unsigned char value) { stdpar[CurPad][3] = data.buttonStatus >> 8; if (padid[CurPad] != 0x41) { - CmdLen = 20; + CmdLen = 8; stdpar[CurPad][4] = data.rightJoyX; stdpar[CurPad][5] = data.rightJoyY; stdpar[CurPad][6] = data.leftJoyX; stdpar[CurPad][7] = data.leftJoyY; - - switch (stdpar[CurPad][3]) { - case 0xBF: // X - stdpar[CurPad][14] = 0xFF; - break; - - case 0xDF: // Circle - stdpar[CurPad][13] = 0xFF; - break; - - case 0xEF: // Triangle - stdpar[CurPad][12] = 0xFF; - break; - - case 0x7F: // Square - stdpar[CurPad][15] = 0xFF; - break; - - case 0xFB: // L1 - stdpar[CurPad][16] = 0xFF; - break; - - case 0xF7: // R1 - stdpar[CurPad][17] = 0xFF; - break; - - case 0xFE: // L2 - stdpar[CurPad][18] = 0xFF; - break; - - case 0xFD: // R2 - stdpar[CurPad][19] = 0xFF; - break; - - default: - stdpar[CurPad][14] = 0x00; // Not pressed - stdpar[CurPad][13] = 0x00; // Not pressed - stdpar[CurPad][12] = 0x00; // Not pressed - stdpar[CurPad][15] = 0x00; // Not pressed - stdpar[CurPad][16] = 0x00; // Not pressed - stdpar[CurPad][17] = 0x00; // Not pressed - stdpar[CurPad][18] = 0x00; // Not pressed - stdpar[CurPad][19] = 0x00; // Not pressed - break; - } - - switch (stdpar[CurPad][2] >> 4) { - case 0x0E: // UP - stdpar[CurPad][10] = 0xFF; - break; - - case 0x0B: // DOWN - stdpar[CurPad][11] = 0xFF; - break; - - case 0x07: // LEFT - stdpar[CurPad][9] = 0xFF; - break; - - case 0x0D: // RIGHT - stdpar[CurPad][8] = 0xFF; - break; - - default: - stdpar[CurPad][8] = 0x00; // Not pressed - stdpar[CurPad][9] = 0x00; // Not pressed - stdpar[CurPad][10] = 0x00; // Not pressed - stdpar[CurPad][11] = 0x00; // Not pressed - break; - } } else { CmdLen = 4; } diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c index e6ced19a..59068aa4 100644 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -257,82 +257,12 @@ unsigned char PADpoll(unsigned char value) { stdpar[CurPad][3] = n >> 8; if (g.PadState[CurPad].PadMode == 1) { - CmdLen = 20; + CmdLen = 8; stdpar[CurPad][4] = g.PadState[CurPad].AnalogStatus[ANALOG_RIGHT][ANALOG_X]; stdpar[CurPad][5] = g.PadState[CurPad].AnalogStatus[ANALOG_RIGHT][ANALOG_Y]; stdpar[CurPad][6] = g.PadState[CurPad].AnalogStatus[ANALOG_LEFT][ANALOG_X]; stdpar[CurPad][7] = g.PadState[CurPad].AnalogStatus[ANALOG_LEFT][ANALOG_Y]; - - switch (stdpar[CurPad][3]) { - case 0xBF: // X - stdpar[CurPad][14] = 0xFF; - break; - - case 0xDF: // Circle - stdpar[CurPad][13] = 0xFF; - break; - - case 0xEF: // Triangle - stdpar[CurPad][12] = 0xFF; - break; - - case 0x7F: // Square - stdpar[CurPad][15] = 0xFF; - break; - - case 0xFB: // L1 - stdpar[CurPad][16] = 0xFF; - break; - - case 0xF7: // R1 - stdpar[CurPad][17] = 0xFF; - break; - - case 0xFE: // L2 - stdpar[CurPad][18] = 0xFF; - break; - - case 0xFD: // R2 - stdpar[CurPad][19] = 0xFF; - break; - - default: - stdpar[CurPad][14] = 0x00; // Not pressed - stdpar[CurPad][13] = 0x00; // Not pressed - stdpar[CurPad][12] = 0x00; // Not pressed - stdpar[CurPad][15] = 0x00; // Not pressed - stdpar[CurPad][16] = 0x00; // Not pressed - stdpar[CurPad][17] = 0x00; // Not pressed - stdpar[CurPad][18] = 0x00; // Not pressed - stdpar[CurPad][19] = 0x00; // Not pressed - break; - } - - switch (stdpar[CurPad][2] >> 4) { - case 0x0E: // UP - stdpar[CurPad][10] = 0xFF; - break; - - case 0x0B: // DOWN - stdpar[CurPad][11] = 0xFF; - break; - - case 0x07: // LEFT - stdpar[CurPad][9] = 0xFF; - break; - - case 0x0D: // RIGHT - stdpar[CurPad][8] = 0xFF; - break; - - default: - stdpar[CurPad][8] = 0x00; // Not pressed - stdpar[CurPad][9] = 0x00; // Not pressed - stdpar[CurPad][10] = 0x00; // Not pressed - stdpar[CurPad][11] = 0x00; // Not pressed - break; - } } else { CmdLen = 4; } -- cgit v1.2.3