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

Merge pull request #48 from ekeeke/master

Browse Source 
Merge latest core change
This commit is contained in:
Twinaphex 2016-03-20 21:00:01 +01:00
commit f573d21092
5 changed files with 16 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.2 MiB

After

Width:  |  Height:  |  Size: 3.2 MiB

BIN
builds/genplus_wii.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

23
core/input_hw/gamepad.c
View File

@ -65,8 +65,8 @@ void gamepad_reset(int port)
gamepad[port].Timeout = 0; gamepad[port].Timeout = 0;
gamepad[port].Latency = 0; gamepad[port].Latency = 0;
/* reset 4-WayPlay latch */ /* reset 4-WayPlay latch (controller #0 used by default) */
latch = 0; latch = 0x00;
/* reset Master Tap flip-flop */ /* reset Master Tap flip-flop */
flipflop[port>>2].Latch = 0; flipflop[port>>2].Latch = 0;
@ -211,7 +211,7 @@ INLINE void gamepad_write(int port, unsigned char data, unsigned char mask)
/* retrieve current timestamp */ /* retrieve current timestamp */
unsigned int cycles = ((system_hw & SYSTEM_PBC) == SYSTEM_MD) ? m68k.cycles : Z80.cycles; unsigned int cycles = ((system_hw & SYSTEM_PBC) == SYSTEM_MD) ? m68k.cycles : Z80.cycles;
/* TH is pulled high when not configured as output by I/O controller output */ /* TH is pulled high when not configured as output by I/O controller */
data = 0x40; data = 0x40;
/* TH 0->1 internal switching does not occur immediately (verified on MK-1650 model) */ /* TH 0->1 internal switching does not occur immediately (verified on MK-1650 model) */
@ -255,14 +255,14 @@ void gamepad_2_write(unsigned char data, unsigned char mask)
unsigned char wayplay_1_read(void) unsigned char wayplay_1_read(void)
{ {
/* check if TH on port B is HIGH */ /* check if latched TH input on port B is HIGH */
if (latch & 0x04) if (latch & 0x04)
{ {
/* 4-WayPlay detection : xxxxx00 */ /* 4-WayPlay detection : xxxxx00 */
return 0x7C; return 0x7C;
} }
/* TR & TL on port B select controller # (0-3) */ /* latched TR & TL input state on port B select controller # (0-3) on port A */
return gamepad_read(latch); return gamepad_read(latch);
} }
@ -273,14 +273,21 @@ unsigned char wayplay_2_read(void)
void wayplay_1_write(unsigned char data, unsigned char mask) void wayplay_1_write(unsigned char data, unsigned char mask)
{ {
/* TR & TL on port B select controller # (0-3) */ /* latched TR & TL input state on port B select controller # (0-3) on port A */
gamepad_write(latch & 0x03, data, mask); gamepad_write(latch & 0x03, data, mask);
} }
void wayplay_2_write(unsigned char data, unsigned char mask) void wayplay_2_write(unsigned char data, unsigned char mask)
{ {
/* latch TH, TR & TL state on port B */ /* pins not configured as output by I/O controller are pulled HIGH */
latch = ((data & mask) >> 4) & 0x07; data |= ~mask;
/* check if both UP & DOWN inputs are LOW */
if (!(data & 0x03))
{
/* latch TH, TR & TL input state */
latch = (data >> 4) & 0x07;
}
} }

2
sdl/fileio.c
View File

@ -121,7 +121,7 @@ int load_archive(char *filename, unsigned char *buffer, int maxsize, char *exten
else else
{ {
/* Open file */ /* Open file */
gzFile *gd = gzopen(filename, "rb"); gzFile gd = gzopen(filename, "rb");
if (!gd) return 0; if (!gd) return 0;
/* Read file data */ /* Read file data */