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 @@
-
@@ -97,7 +96,6 @@
-
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 @@
-
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.
///
///
+ // 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() {
}
}