From 60a57a1ac59e2b07d783e4516f5c2c20cef45b4e Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Wed, 7 May 2008 01:34:31 +0000
Subject: [PATCH] Processor merge

---
 .../Cosmos.Hardware/Cosmos.Hardware.csproj      |  2 --
 source/Cosmos/Cosmos.Hardware/Global.cs         |  5 -----
 source/Cosmos/Cosmos.Hardware/PC/Global.cs      |  2 +-
 source/Cosmos/Cosmos.Hardware/PC/Processor.cs   | 15 ---------------
 source/Cosmos/Cosmos.Hardware/Processor.cs      |  8 --------
 source/Cosmos/Cosmos.Kernel.Plugs/CPU.cs        |  3 +++
 .../Cosmos.Kernel.Plugs.csproj                  |  1 -
 .../Hardware/PC/Processor.cs                    | 12 ------------
 source/Cosmos/Cosmos.Kernel/CPU.cs              | 17 +++++++++++++----
 9 files changed, 17 insertions(+), 48 deletions(-)
 delete mode 100644 source/Cosmos/Cosmos.Hardware/PC/Processor.cs
 delete mode 100644 source/Cosmos/Cosmos.Hardware/Processor.cs
 delete mode 100644 source/Cosmos/Cosmos.Kernel.Plugs/Hardware/PC/Processor.cs

diff --git a/source/Cosmos/Cosmos.Hardware/Cosmos.Hardware.csproj b/source/Cosmos/Cosmos.Hardware/Cosmos.Hardware.csproj
index 3efadc3e1..14a22aca2 100644
--- a/source/Cosmos/Cosmos.Hardware/Cosmos.Hardware.csproj
+++ b/source/Cosmos/Cosmos.Hardware/Cosmos.Hardware.csproj
@@ -89,7 +89,6 @@
     <Compile Include="PC\DebugUtil.cs" />
     <Compile Include="PC\Global.cs" />
     <Compile Include="PC\Interrupts.cs" />
-    <Compile Include="PC\Processor.cs" />
     <Compile Include="TempDictionary.cs" />
     <Compile Include="Global.cs" />
     <Compile Include="Old\DebugUtil.cs" />
@@ -97,7 +96,6 @@
     <Compile Include="Old\Keyboard.cs" />
     <Compile Include="Old\PIT.cs" />
     <Compile Include="Bus\PCIBus.cs" />
-    <Compile Include="Processor.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Old\RTC.cs" />
     <Compile Include="Old\Screen\Text.cs" />
diff --git a/source/Cosmos/Cosmos.Hardware/Global.cs b/source/Cosmos/Cosmos.Hardware/Global.cs
index 19629b10b..210a90e1f 100644
--- a/source/Cosmos/Cosmos.Hardware/Global.cs
+++ b/source/Cosmos/Cosmos.Hardware/Global.cs
@@ -4,10 +4,5 @@ using System.Text;
 
 namespace Cosmos.Hardware {
     public class Global {
-        protected static Processor mProcessor;
-        public static Processor Processor {
-            get { return mProcessor; }
-        }
-
     }
 }
diff --git a/source/Cosmos/Cosmos.Hardware/PC/Global.cs b/source/Cosmos/Cosmos.Hardware/PC/Global.cs
index e405b68e5..39aac9c71 100644
--- a/source/Cosmos/Cosmos.Hardware/PC/Global.cs
+++ b/source/Cosmos/Cosmos.Hardware/PC/Global.cs
@@ -7,7 +7,7 @@ using HW = Cosmos.Hardware;
 namespace Cosmos.Hardware.PC {
     public class Global : Cosmos.Hardware.Global {
         public static void Init(bool noATA, bool noATAOld, bool noATA2) {
-            mProcessor = new Processor();
+            Kernel.CPU.CreateGDT();
             Bus.CPU.PIC.Init(); 
 
             //All old.. need to port ----------------
diff --git a/source/Cosmos/Cosmos.Hardware/PC/Processor.cs b/source/Cosmos/Cosmos.Hardware/PC/Processor.cs
deleted file mode 100644
index 5ca1e41ba..000000000
--- a/source/Cosmos/Cosmos.Hardware/PC/Processor.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Cosmos.Hardware.PC {
-    public class Processor : Cosmos.Hardware.Processor {
-        public Processor() {
-            Processor.CreateGDT();
-        }
-
-        // Plugged
-        public static void CreateGDT() { }
-    }
-}
diff --git a/source/Cosmos/Cosmos.Hardware/Processor.cs b/source/Cosmos/Cosmos.Hardware/Processor.cs
deleted file mode 100644
index 55328d8cc..000000000
--- a/source/Cosmos/Cosmos.Hardware/Processor.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Cosmos.Hardware {
-    public abstract class Processor {
-    }
-}
diff --git a/source/Cosmos/Cosmos.Kernel.Plugs/CPU.cs b/source/Cosmos/Cosmos.Kernel.Plugs/CPU.cs
index 4aa8c051c..30ab1b800 100644
--- a/source/Cosmos/Cosmos.Kernel.Plugs/CPU.cs
+++ b/source/Cosmos/Cosmos.Kernel.Plugs/CPU.cs
@@ -11,6 +11,9 @@ namespace Cosmos.Kernel.Plugs {
 		public static void CreateIDT() {
 		}
 
+        [PlugMethod(MethodAssembler = typeof(Assemblers.CreateGDT))]
+        public static void CreateGDT() { }
+
         [PlugMethod(MethodAssembler = typeof(Assemblers.GetAmountOfRAM))]
         public static uint GetAmountOfRAM() {
             return 0;
diff --git a/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj b/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
index 90ebe1af0..de54d2489 100644
--- a/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
+++ b/source/Cosmos/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
@@ -64,7 +64,6 @@
     <Compile Include="Assemblers\ZeroFill.cs" />
     <Compile Include="CultureInfo.cs" />
     <Compile Include="Hardware\PC\Bus\CPUBus.cs" />
-    <Compile Include="Hardware\PC\Processor.cs" />
     <Compile Include="HeapImpl.cs" />
     <Compile Include="String.cs" />
     <Compile Include="Console.cs" />
diff --git a/source/Cosmos/Cosmos.Kernel.Plugs/Hardware/PC/Processor.cs b/source/Cosmos/Cosmos.Kernel.Plugs/Hardware/PC/Processor.cs
deleted file mode 100644
index 032f2400b..000000000
--- a/source/Cosmos/Cosmos.Kernel.Plugs/Hardware/PC/Processor.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Indy.IL2CPU.Plugs;
-
-namespace Cosmos.Kernel.Plugs.Hardware.PC {
-    [Plug(Target = typeof(Cosmos.Hardware.PC.Processor))]
-    class Processor {
-        [PlugMethod(MethodAssembler = typeof(Assemblers.CreateGDT))]
-        public static void CreateGDT() { }
-    }
-}
diff --git a/source/Cosmos/Cosmos.Kernel/CPU.cs b/source/Cosmos/Cosmos.Kernel/CPU.cs
index acc30d789..7b41b1213 100644
--- a/source/Cosmos/Cosmos.Kernel/CPU.cs
+++ b/source/Cosmos/Cosmos.Kernel/CPU.cs
@@ -11,14 +11,19 @@ namespace Cosmos.Kernel {
         /// Gets the amount of RAM in MB's.
         /// </summary>
         /// <returns></returns>
+        // Plugged
         protected static uint GetAmountOfRAM() {
             return 0;
         }
 
+        // Plugged
         protected static uint GetEndOfKernel() {
             return 0;
         }
-        
+
+        // Plugged
+        public static void CreateGDT() { }
+
         public static uint AmountOfMemory {
 			get {
 				return GetAmountOfRAM();
@@ -31,17 +36,21 @@ namespace Cosmos.Kernel {
 			}
 		}
 
-		public static void ZeroFill(uint aStartAddress, uint aLength) {
+        // Plugged
+        public static void ZeroFill(uint aStartAddress, uint aLength) {
 		}
 
-		public static uint GetCurrentESP() {
+        // Plugged
+        public static uint GetCurrentESP() {
 			return 0;
 		}
 
-		public static uint GetEndOfStack() {
+        // Plugged
+        public static uint GetEndOfStack() {
 			return 0;
 		}
 
+        // Plugged
 		public static void DoTest() {
 		}
 	}