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

GBHawk: Serial port cleanup

This commit is contained in:
alyosha-tas 2019-09-29 21:08:05 -04:00
parent 9b161ced56
commit 1520529acf
3 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public bool serial_start;
public int serial_clock;
public int serial_bits;
public bool clk_internal;
public int clk_rate;
public byte going_out;
public byte coming_in;
@ -30,7 +29,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
return 0xFF;
}
public void WriteReg(int addr, byte value)
@ -48,7 +46,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
serial_bits = 8;
if ((value & 1) > 0)
{
clk_internal = true;
if (((value & 2) > 0) && Core.GBC_compat)
{
clk_rate = 256;
@ -61,8 +58,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
else
{
clk_internal = false;
clk_rate = get_external_clock();
clk_rate = -1;
serial_clock = clk_rate;
}
}
@ -70,7 +66,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
if ((value & 1) > 0)
{
clk_internal = true;
if (((value & 2) > 0) && Core.GBC_compat)
{
clk_rate = 256;
@ -83,8 +78,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
else
{
clk_internal = false;
clk_rate = get_external_clock();
clk_rate = -1;
serial_clock = clk_rate;
}
}
@ -113,7 +107,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
if (serial_bits > 0)
{
byte temp = get_external_bit();
byte temp = coming_in;
serial_data = (byte)((serial_data << 1) | temp);
serial_bits--;
@ -135,26 +129,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
// call this function to get the clock rate of a connected device
// if no external device, the clocking doesn't occur
public int get_external_clock()
{
return -1;
}
// call this function to get the next bit from the connected device
// no device connected returns 0xFF
public byte get_external_bit()
{
return coming_in;
}
// calling this function buts an external bit on the cable line
public void send_external_bit(byte bit_send)
{
going_out = (byte)(bit_send >> 7);
}
public void Reset()
{
serial_control = 0x7E;
@ -171,7 +145,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync(nameof(serial_start), ref serial_start);
ser.Sync(nameof(serial_clock), ref serial_clock);
ser.Sync(nameof(serial_bits), ref serial_bits);
ser.Sync(nameof(clk_internal), ref clk_internal);
ser.Sync(nameof(clk_rate), ref clk_rate);
ser.Sync(nameof(going_out), ref going_out);
ser.Sync(nameof(coming_in), ref coming_in);

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

@ -105,12 +105,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
// the signal to shift out a bit is when serial_clock = 1
if (((L.serialport.serial_clock == 1) || (L.serialport.serial_clock == 2)) && !do_r_next)
{
L.serialport.send_external_bit((byte)(L.serialport.serial_data & 0x80));
L.serialport.going_out = (byte)(L.serialport.serial_data >> 7);
if ((R.serialport.clk_rate == -1) && R.serialport.serial_start)
{
R.serialport.serial_clock = L.serialport.serial_clock;
R.serialport.send_external_bit((byte)(R.serialport.serial_data & 0x80));
R.serialport.going_out = (byte)(R.serialport.serial_data >> 7);
R.serialport.coming_in = L.serialport.going_out;
}
@ -120,12 +120,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
{
do_r_next = false;
R.serialport.send_external_bit((byte)(R.serialport.serial_data & 0x80));
R.serialport.going_out = (byte)(R.serialport.serial_data >> 7);
if ((L.serialport.clk_rate == -1) && L.serialport.serial_start)
{
L.serialport.serial_clock = R.serialport.serial_clock;
L.serialport.send_external_bit((byte)(L.serialport.serial_data & 0x80));
L.serialport.going_out = (byte)(L.serialport.serial_data >> 7);
L.serialport.coming_in = R.serialport.going_out;
}

24
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs
View File

@ -140,12 +140,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
// the signal to shift out a bit is when serial_clock = 1
if (((L.serialport.serial_clock == 1) || (L.serialport.serial_clock == 2)) && !do_2_next)
{
L.serialport.send_external_bit((byte)(L.serialport.serial_data & 0x80));
L.serialport.going_out = (byte)(L.serialport.serial_data >> 7);
if ((C.serialport.clk_rate == -1) && C.serialport.serial_start)
{
C.serialport.serial_clock = L.serialport.serial_clock;
C.serialport.send_external_bit((byte)(C.serialport.serial_data & 0x80));
C.serialport.going_out = (byte)(C.serialport.serial_data >> 7);
C.serialport.coming_in = L.serialport.going_out;
}
@ -155,12 +155,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
{
do_2_next = false;
C.serialport.send_external_bit((byte)(C.serialport.serial_data & 0x80));
C.serialport.going_out = (byte)(C.serialport.serial_data >> 7);
if ((L.serialport.clk_rate == -1) && L.serialport.serial_start)
{
L.serialport.serial_clock = C.serialport.serial_clock;
L.serialport.send_external_bit((byte)(L.serialport.serial_data & 0x80));
L.serialport.going_out = (byte)(L.serialport.serial_data >> 7);
L.serialport.coming_in = C.serialport.going_out;
}
@ -182,12 +182,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
// the signal to shift out a bit is when serial_clock = 1
if (((C.serialport.serial_clock == 1) || (C.serialport.serial_clock == 2)) && !do_2_next)
{
C.serialport.send_external_bit((byte)(C.serialport.serial_data & 0x80));
C.serialport.going_out = (byte)(C.serialport.serial_data >> 7);
if ((R.serialport.clk_rate == -1) && R.serialport.serial_start)
{
R.serialport.serial_clock = C.serialport.serial_clock;
R.serialport.send_external_bit((byte)(R.serialport.serial_data & 0x80));
R.serialport.going_out = (byte)(R.serialport.serial_data >> 7);
R.serialport.coming_in = C.serialport.going_out;
}
@ -197,12 +197,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
{
do_2_next = false;
R.serialport.send_external_bit((byte)(R.serialport.serial_data & 0x80));
R.serialport.going_out = (byte)(R.serialport.serial_data >> 7);
if ((C.serialport.clk_rate == -1) && C.serialport.serial_start)
{
C.serialport.serial_clock = R.serialport.serial_clock;
C.serialport.send_external_bit((byte)(C.serialport.serial_data & 0x80));
C.serialport.going_out = (byte)(C.serialport.serial_data >> 7);
C.serialport.coming_in = R.serialport.going_out;
}
@ -224,12 +224,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
// the signal to shift out a bit is when serial_clock = 1
if (((R.serialport.serial_clock == 1) || (R.serialport.serial_clock == 2)) && !do_2_next)
{
R.serialport.send_external_bit((byte)(R.serialport.serial_data & 0x80));
R.serialport.going_out = (byte)(R.serialport.serial_data >> 7);
if ((L.serialport.clk_rate == -1) && L.serialport.serial_start)
{
L.serialport.serial_clock = R.serialport.serial_clock;
L.serialport.send_external_bit((byte)(L.serialport.serial_data & 0x80));
L.serialport.going_out = (byte)(L.serialport.serial_data >> 7);
L.serialport.coming_in = R.serialport.going_out;
}
@ -239,12 +239,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
{
do_2_next = false;
L.serialport.send_external_bit((byte)(L.serialport.serial_data & 0x80));
L.serialport.going_out = (byte)(L.serialport.serial_data >> 7);
if ((R.serialport.clk_rate == -1) && R.serialport.serial_start)
{
R.serialport.serial_clock = L.serialport.serial_clock;
R.serialport.send_external_bit((byte)(R.serialport.serial_data & 0x80));
R.serialport.going_out = (byte)(R.serialport.serial_data >> 7);
R.serialport.coming_in = L.serialport.going_out;
}