From 2ec181e50f073e6066e351f800e47e37ef95ff9e Mon Sep 17 00:00:00 2001
From: beirich <beirich@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Fri, 21 Jan 2011 07:14:42 +0000
Subject: [PATCH] cleanup some code after removing HardReset from IEmulator API

---
 BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs  | 15 ++-------------
 .../Consoles/Sega/Genesis/Genesis.cs              |  5 -----
 BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs        | 14 +-------------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs
index b97f9cf689..f3d249aaef 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs	
@@ -51,16 +51,11 @@ namespace BizHawk.Emulation.Consoles.TurboGrafx
         {
             Type = type;
             Controller = NullController.GetNullController();
-            Init();
-        }
-
-        private void Init()
-        {
             Cpu = new HuC6280();
             VCE = new VCE();
             VDC1 = new VDC(Cpu, VCE);
             PSG = new HuC6280PSG();
-            
+
             if (TurboGrafx || TurboCD)
             {
                 Ram = new byte[0x2000];
@@ -79,7 +74,7 @@ namespace BizHawk.Emulation.Consoles.TurboGrafx
                 Cpu.WriteVDC = VDC1.WriteVDC;
             }
         }
-        
+
         public void LoadGame(IGame game)
         {
             if (game.GetRomData().Length == 0x60000)
@@ -124,12 +119,6 @@ namespace BizHawk.Emulation.Consoles.TurboGrafx
             PSG.EndFrame(Cpu.TotalExecutedCycles);
         }
 
-        public void HardReset()
-        {
-            Init();
-            Cpu.ResetPC();
-        }
-
         public IVideoProvider VideoProvider
         {
             get { return (IVideoProvider) VPC ?? VDC1; }
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
index 3d1b4c126c..33645b3249 100644
--- a/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
+++ b/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
@@ -142,11 +142,6 @@ namespace BizHawk.Emulation.Consoles.Sega
         public int Frame { get; set; }
         public bool DeterministicEmulation { get; set; }
 
-        public void HardReset()
-        {
-            throw new NotImplementedException();
-        }
-
         public byte[] SaveRam
         {
             get { throw new NotImplementedException(); }
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
index 52e7610ae3..8046d56d3e 100644
--- a/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
+++ b/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
@@ -74,6 +74,7 @@ namespace BizHawk.Emulation.Consoles.Sega
                 Controller = NullController.GetNullController();
 
             Cpu = new Z80A();
+            Cpu.RegisterSP = 0xDFF0;
             Cpu.ReadHardware = ReadPort;
             Cpu.WriteHardware = WritePort;
 
@@ -81,28 +82,15 @@ namespace BizHawk.Emulation.Consoles.Sega
             PSG = new SN76489();
             YM2413 = new YM2413();
             SoundMixer = new SoundMixer(PSG, YM2413);
-
             if (HasYM2413 && Options.Contains("WhenFMDisablePSG"))
                 SoundMixer.DisableSource(PSG);
-
             ActiveSoundProvider = PSG;
-            HardReset();
-        }
 
-        public void HardReset()
-        {
-            Cpu.Reset();
-            Cpu.RegisterSP = 0xDFF0;
-            Vdp = new VDP(Cpu, Vdp.VdpMode, DisplayType);
-            PSG.Reset();
-            YM2413.Reset();
             SystemRam = new byte[0x2000];
-
             if (Options.Contains("CMMapper") == false)
                 InitSegaMapper();
             else
                 InitCodeMastersMapper();
-
             SetupMemoryDomains();
         }