The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-12-26 19:21:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Core/IO] improved 6-buttons controller emulation (fixes 'ToeJam & Earl in Panic on Funkotron')

Browse Source
This commit is contained in:
EkeEke 2018-08-11 02:09:13 +02:00
parent 3ec4b627e8
commit ee4494a815
5 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
builds/genesis_plus_gx_libretro.dll
View File

Binary file not shown.

BIN
builds/genplus_cube.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

BIN
builds/genplus_wii.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

55
core/input_hw/gamepad.c
View File

@ -3,7 +3,7 @@
* 2-Buttons, 3-Buttons & 6-Buttons controller support * 2-Buttons, 3-Buttons & 6-Buttons controller support
* with support for J-Cart, 4-Way Play & Master Tap adapters * with support for J-Cart, 4-Way Play & Master Tap adapters
* *
* Copyright (C) 2007-2016 Eke-Eke (Genesis Plus GX) * Copyright (C) 2007-2018 Eke-Eke (Genesis Plus GX)
* *
* Redistribution and use of this code or any derivative works are permitted * Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met: * provided that the following conditions are met:
@ -122,35 +122,24 @@ INLINE unsigned char gamepad_read(int port)
/* D-PAD or extra buttons status is returned on D3-D0 (active low) */ /* D-PAD or extra buttons status is returned on D3-D0 (active low) */
switch (step) switch (step)
{ {
case 1: /*** First High ***/ /* From gen_hw.txt (*):
case 3: /*** Second High ***/
case 5: /*** Third High ***/
{
/* TH = 1 : ?1CBRLDU */
data &= ~(pad & 0x3F);
break;
}
case 0: /*** 3-button only ***/ A 6-button gamepad allows the extra buttons to be read based on how
case 2: /*** First Low ***/ many times TH is switched from (and not 0 to 1). Observe the
case 4: /*** Second Low ***/ following sequence:
{
/* TH = 0 : ?0SA00DU */
data &= ~((pad & 0x03) | ((pad >> 2) & 0x30) | 0x0C);
break;
}
/* A 6-button gamepad allows the extra buttons to be read based on how */
/* many times TH is switched from 1 to 0. Observe the following sequence */
/*
TH = 1 : ?1CBRLDU 3-button pad return value
TH = 0 : ?0SA00DU 3-button pad return value
TH = 1 : ?1CBRLDU 3-button pad return value TH = 1 : ?1CBRLDU 3-button pad return value
TH = 0 : ?0SA00DU 3-button pad return value TH = 0 : ?0SA00DU 3-button pad return value
TH = 1 : ?1CBRLDU 3-button pad return value (*)
TH = 0 : ?0SA00DU 3-button pad return value (*)
TH = 1 : ?1CBRLDU 3-button pad return value TH = 1 : ?1CBRLDU 3-button pad return value
TH = 0 : ?0SA0000 D3-D0 are forced to '0' TH = 0 : ?0SA0000 D3-D0 are forced to '0'
TH = 1 : ?1CBMXYZ Extra buttons returned in D3-0 TH = 1 : ?1CBMXYZ Extra buttons returned in D3-0
TH = 0 : ?0SA1111 D3-D0 are forced to '1' TH = 0 : ?0SA1111 D3-D0 are forced to '1'
From this point on, the standard 3-button pad values will be returned if any further TH transitions are done.
(*) additional High-to-Low transition is necessary to access extra buttons according to official MK-1653-50 specification
*/ */
case 6: /*** Third Low ***/ case 6: /*** Third Low ***/
{ {
@ -166,18 +155,26 @@ INLINE unsigned char gamepad_read(int port)
break; break;
} }
default: /*** D3-D0 forced to '1' ***/ case 8: /*** Fourth Low ***/
{ {
if (data & 0x40) /* TH = 0 : ?0SA1111 D3-D0 forced to '1' */
data &= ~((pad >> 2) & 0x30);
break;
}
default: /*** 3-button mode ***/
{
if (step & 1)
{ {
/* TH = 1 : ?0CB1111 */ /* TH = 1 : ?1CBRLDU */
data &= ~(pad & 0x30); data &= ~(pad & 0x3F);
} }
else else
{ {
/* TH = 0 : ?0SA1111 */ /* TH = 0 : ?0SA00DU */
data &= ~((pad >> 2) & 0x30); data &= ~((pad & 0x03) | ((pad >> 2) & 0x30) | 0x0C);
} }
break;
} }
} }
@ -196,7 +193,7 @@ INLINE void gamepad_write(int port, unsigned char data, unsigned char mask)
gamepad[port].Latency = 0; gamepad[port].Latency = 0;
/* 6-Buttons controller specific */ /* 6-Buttons controller specific */
if (input.dev[port] == DEVICE_PAD6B) if ((input.dev[port] == DEVICE_PAD6B) && (gamepad[port].Counter < 10))
{ {
/* TH 1->0 transition */ /* TH 1->0 transition */
if (!data && gamepad[port].State) if (!data && gamepad[port].State)

2
core/input_hw/gamepad.h
View File

@ -3,7 +3,7 @@
* 2-Buttons, 3-Buttons & 6-Buttons controller support * 2-Buttons, 3-Buttons & 6-Buttons controller support
* with support for J-Cart, 4-Way Play & Master Tap adapters * with support for J-Cart, 4-Way Play & Master Tap adapters
* *
* Copyright (C) 2007-2016 Eke-Eke (Genesis Plus GX) * Copyright (C) 2007-2018 Eke-Eke (Genesis Plus GX)
* *
* Redistribution and use of this code or any derivative works are permitted * Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met: * provided that the following conditions are met: