From 216e38258220cc788a3da68ddf1c3abab5cb5444 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Fri, 3 Apr 2020 17:24:20 -0400 Subject: [PATCH] O2Hawk: reset fix --- BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs | 2 ++ BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs | 12 ++++++++++-- .../Consoles/Magnavox/Odyssey2/O2Hawk.cs | 11 +++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs index 9ff3152107..36d76d4b28 100644 --- a/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs +++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs @@ -42,6 +42,8 @@ namespace BizHawk.Emulation.Cores.Components.I8048 IntEn = false; TimIntEn = false; INT_MSTR = true; + IRQPending = false; + TIRQPending = false; } } } \ No newline at end of file diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs index 0dbe17d46d..95c8aa8d5d 100644 --- a/BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs +++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs @@ -82,7 +82,6 @@ namespace BizHawk.Emulation.Cores.Components.I8048 { RB = 0; } - } } @@ -193,9 +192,18 @@ namespace BizHawk.Emulation.Cores.Components.I8048 F1 = false; - T0 = T1 = false; + T0 = T1 = T1_old = false; Flag3 = true; + + EA = false; + + TF = false; + timer_en = false; + counter_en = false; + timer_prescale = 0; + + RB = MB = 0; } } } \ No newline at end of file diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs index 06ef1f45fa..68348c7018 100644 --- a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs +++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs @@ -134,6 +134,17 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk ppu.Reset(); cpu.Reset(); + + RAM = new byte[0x80]; + + ticker = 0; + + addr_latch = 0; + kb_byte = 0;; + ppu_en = RAM_en = kybrd_en = copy_en = cart_b0 = cart_b1; + rom_bank = 0; + + kb_state_row = kb_state_col = 0; } public void SoftReset()