ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBHawk: CGB double speed linking

This commit is contained in:
alyosha-tas 2019-01-05 08:23:16 -06:00
parent b9094545db
commit e2ccff1c82
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/SerialPort.cs
View File

@ -49,7 +49,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if ((value & 1) > 0)
{
clk_internal = true;
clk_rate = 512;
if (((value & 2) > 0) && Core.GBC_compat)
{
clk_rate = 256;
}
else
{
clk_rate = 512;
}
serial_clock = clk_rate;
}
else
@ -64,7 +71,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if ((value & 1) > 0)
{
clk_internal = true;
clk_rate = 512;
if (((value & 2) > 0) && Core.GBC_compat)
{
clk_rate = 256;
}
else
{
clk_rate = 512;
}
serial_clock = clk_rate;
}
else
@ -75,7 +89,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
serial_control = (byte)(0x7E | (value & 0x81)); // middle six bits always 1
if (Core.GBC_compat)
{
serial_control = (byte)(0x7C | (value & 0x83)); // extra CGB bit
}
else
{
serial_control = (byte)(0x7E | (value & 0x81)); // middle six bits always 1
}
break;
}
}

8
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs
View File

@ -105,7 +105,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
R.do_single_step();
// the signal to shift out a bit is when serial_clock = 1
if (L.serialport.serial_clock == 1)
if ((L.serialport.serial_clock == 1) || (L.serialport.serial_clock == 2))
{
if (LinkConnected)
{
@ -113,7 +113,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
if ((R.serialport.clk_rate == -1) && R.serialport.serial_start)
{
R.serialport.serial_clock = 1;
R.serialport.serial_clock = L.serialport.serial_clock;
R.serialport.send_external_bit((byte)(R.serialport.serial_data & 0x80));
R.serialport.coming_in = L.serialport.going_out;
}
@ -121,7 +121,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
L.serialport.coming_in = R.serialport.going_out;
}
}
else if (R.serialport.serial_clock == 1)
else if ((R.serialport.serial_clock == 1) || (R.serialport.serial_clock == 2))
{
if (LinkConnected)
{
@ -129,7 +129,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
if ((L.serialport.clk_rate == -1) && L.serialport.serial_start)
{
L.serialport.serial_clock = 1;
L.serialport.serial_clock = R.serialport.serial_clock;
L.serialport.send_external_bit((byte)(L.serialport.serial_data & 0x80));
L.serialport.coming_in = R.serialport.going_out;
}