From 6b8190a6952cd9d6c411e5b2b5ef95e103cd2c8d Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Tue, 6 May 2008 22:05:21 +0000
Subject: [PATCH]

---
 source/Cosmos.Kernel.FileSystems/MBT.cs    | 2 +-
 source/Cosmos/Cosmos.Hardware/PC/Global.cs | 8 ++++----
 source/Cosmos/Cosmos.Kernel/Boot.cs        | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/source/Cosmos.Kernel.FileSystems/MBT.cs b/source/Cosmos.Kernel.FileSystems/MBT.cs
index c5551a65f..ac8ed40cf 100644
--- a/source/Cosmos.Kernel.FileSystems/MBT.cs
+++ b/source/Cosmos.Kernel.FileSystems/MBT.cs
@@ -47,7 +47,7 @@ namespace Cosmos.FileSystem {
 				}
 			}
 		}
-        public static void Initialize() 
+        public static void Init() 
         {
             //DebugUtil.SendMessage("MBT", "Initializing");
             //DebugUtil.SendNumber("MBT", "DeviceCount", (uint)Device.Devices.Count, 32);
diff --git a/source/Cosmos/Cosmos.Hardware/PC/Global.cs b/source/Cosmos/Cosmos.Hardware/PC/Global.cs
index f6e5993af..aab31a639 100644
--- a/source/Cosmos/Cosmos.Hardware/PC/Global.cs
+++ b/source/Cosmos/Cosmos.Hardware/PC/Global.cs
@@ -40,12 +40,12 @@ namespace Cosmos.Hardware.PC {
 			// MTW new end
 
             HW.Device.Add(new Bus.CPU.Keyboard());
+            Cosmos.Hardware.PC.Bus.PCIBus.Init();
         }
-		[Obsolete("Use Init(noATA, noATAOld, noATA2)")]
-		public static void Init()
-		{
+
+        public static void Init() {
 			Init(false, false, false);
-		}
+        }
 
         public static uint TickCount {
             get;
diff --git a/source/Cosmos/Cosmos.Kernel/Boot.cs b/source/Cosmos/Cosmos.Kernel/Boot.cs
index 250694de3..5ca4aa515 100644
--- a/source/Cosmos/Cosmos.Kernel/Boot.cs
+++ b/source/Cosmos/Cosmos.Kernel/Boot.cs
@@ -26,12 +26,10 @@ namespace Cosmos.Kernel {
 			// MTW: you could use partial methods for this, but then you dont
 			// have control of the order in which the individual methods are called..
             Cosmos.Hardware.PC.Global.Init();
-			MBT.Initialize();
+			MBT.Init();
 
             // Now init kernel devices and rest of kernel
             Keyboard.Initialize();
-
-            Cosmos.Hardware.PC.Bus.PCIBus.Init();
         }
     }
 }