The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-11-13 06:15:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Core/IO] fixed regression with 6-buttons control pad emulation (fixes Duke Nukem 3D)

Browse Source
This commit is contained in:
ekeeke 2019-01-21 23:24:36 +01:00
parent 932a40923c
commit 5c0c613bbc
5 changed files with 8 additions and 9 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

15
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-2018 Eke-Eke (Genesis Plus GX) * Copyright (C) 2007-2019 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:
@ -125,8 +125,7 @@ INLINE unsigned char gamepad_read(int port)
/* From gen_hw.txt (*): /* From gen_hw.txt (*):
A 6-button gamepad allows the extra buttons to be read based on how A 6-button gamepad allows the extra buttons to be read based on how
many times TH is switched from (and not 0 to 1). Observe the many times TH is switched from 0 to 1. Observe the following sequence:
following sequence:
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
@ -141,7 +140,7 @@ INLINE unsigned char gamepad_read(int port)
(*) additional High-to-Low transition is necessary to access extra buttons according to official MK-1653-50 specification (*) additional High-to-Low transition is necessary to access extra buttons according to official MK-1653-50 specification
*/ */
case 6: /*** Third Low ***/ case 4: /*** Third Low ***/
{ {
/* TH = 0 : ?0SA0000 D3-D0 forced to '0' */ /* TH = 0 : ?0SA0000 D3-D0 forced to '0' */
data &= ~(((pad >> 2) & 0x30) | 0x0F); data &= ~(((pad >> 2) & 0x30) | 0x0F);
@ -155,7 +154,7 @@ INLINE unsigned char gamepad_read(int port)
break; break;
} }
case 8: /*** Fourth Low ***/ case 6: /*** Fourth Low ***/
{ {
/* TH = 0 : ?0SA1111 D3-D0 forced to '1' */ /* TH = 0 : ?0SA1111 D3-D0 forced to '1' */
data &= ~((pad >> 2) & 0x30); data &= ~((pad >> 2) & 0x30);
@ -193,10 +192,10 @@ 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) && (gamepad[port].Counter < 10)) if ((input.dev[port] == DEVICE_PAD6B) && (gamepad[port].Counter < 8))
{ {
/* TH 1->0 transition */ /* TH 0->1 transition */
if (!data && gamepad[port].State) if (data && !gamepad[port].State)
{ {
gamepad[port].Counter += 2; gamepad[port].Counter += 2;
gamepad[port].Timeout = 0; gamepad[port].Timeout = 0;

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-2018 Eke-Eke (Genesis Plus GX) * Copyright (C) 2007-2019 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: