4 files changed, 29 insertions, 42 deletions
diff --git a/native/Noddybox.Emulation.EightBit.Z80.Test/Noddybox.Emulation.EightBit.Z80.Test.csproj b/native/Noddybox.Emulation.EightBit.Z80.Test/Noddybox.Emulation.EightBit.Z80.Test.csproj
index 4744ad0..a162641 100644
--- a/native/Noddybox.Emulation.EightBit.Z80.Test/Noddybox.Emulation.EightBit.Z80.Test.csproj
+++ b/native/Noddybox.Emulation.EightBit.Z80.Test/Noddybox.Emulation.EightBit.Z80.Test.csproj
@@ -45,8 +45,7 @@
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestDevice.cs" />
-    <Compile Include="TestMemory.cs" />
+    <Compile Include="TestMachine.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Noddybox.Emulation.EightBit.Z80\Noddybox.Emulation.EightBit.Z80.csproj">
diff --git a/native/Noddybox.Emulation.EightBit.Z80.Test/README b/native/Noddybox.Emulation.EightBit.Z80.Test/README
index ecb4c18..d260441 100644
--- a/native/Noddybox.Emulation.EightBit.Z80.Test/README
+++ b/native/Noddybox.Emulation.EightBit.Z80.Test/README
@@ -1,3 +1,12 @@
+*************************************
+THESE TESTS ARE BASED ON THE
+TESTS FROM THE FUSE EMULATOR
+http://fuse-emulator.sourceforge.net/
+
+ANY MISTAKES ARE MINE
+*************************************
+
+
 File formats
 ============
 
diff --git a/native/Noddybox.Emulation.EightBit.Z80.Test/TestDevice.cs b/native/Noddybox.Emulation.EightBit.Z80.Test/TestDevice.cs
deleted file mode 100644
index fb24552..0000000
--- a/native/Noddybox.Emulation.EightBit.Z80.Test/TestDevice.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// This file is part of the Noddybox.Emulation C# suite.
-//
-// Noddybox.Emulation is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Noddybox.Emulation is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Noddybox.Emulation.  If not, see <http://www.gnu.org/licenses/>.
-//
-// Copyright (c) 2012 Ian Cowburn
-//
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Noddybox.Emulation.EightBit.Z80.Test
-{
-    class TestDevice : IDevice
-    {
-        public byte Read(ushort device)
-        {
-            return 0x00;
-        }
-
-        public void Write(ushort device, byte value)
-        {
-            // Nothing
-        }
-    }
-}
diff --git a/native/Noddybox.Emulation.EightBit.Z80.Test/TestMemory.cs b/native/Noddybox.Emulation.EightBit.Z80.Test/TestMachine.cs
index 0cf1e4a..4b74d9f 100644
--- a/native/Noddybox.Emulation.EightBit.Z80.Test/TestMemory.cs
+++ b/native/Noddybox.Emulation.EightBit.Z80.Test/TestMachine.cs
@@ -22,18 +22,34 @@ using System.Text;
 
 namespace Noddybox.Emulation.EightBit.Z80.Test
 {
-    class TestMemory : IMemory
+    class TestMachine : IMemory, IDevice
     {
         private readonly byte[] mem = new byte[0x10000];
+        private readonly Z80Cpu z80 = new Z80Cpu();
+        private readonly Clock clock = new Clock(100000, 50);
 
-        public byte Read(ushort address)
+        byte IMemory.Read(ushort address)
         {
             return mem[address];
         }
 
-        public void Write(ushort address, byte value)
+        void IMemory.Write(ushort address, byte value)
         {
             mem[address] = value;
         }
+
+        byte IDevice.Read(ushort device)
+        {
+            return 0;
+        }
+
+        void IDevice.Write(ushort device, byte value)
+        {
+            // Nothing
+        }
+
+        public TestMachine()
+        {
+        }
     }
 }