From eea7a57ecff754caefe416653cdb03c51caf921f Mon Sep 17 00:00:00 2001 From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498> Date: Sun, 21 Sep 2008 16:58:31 +0000 Subject: [PATCH] Changed registry key names to avoid conflicts --- source/Boot/Playgrounds/Kudzu/KudzuTest/Program.cs | 7 ++++--- source/Cosmos.Build.Windows/Options.cs | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/source/Boot/Playgrounds/Kudzu/KudzuTest/Program.cs b/source/Boot/Playgrounds/Kudzu/KudzuTest/Program.cs index adb7f2af8..5c6a01c86 100644 --- a/source/Boot/Playgrounds/Kudzu/KudzuTest/Program.cs +++ b/source/Boot/Playgrounds/Kudzu/KudzuTest/Program.cs @@ -14,15 +14,16 @@ namespace Cosmos.Playground.Kudzu { public static void Init() { var xBoot = new Cosmos.Sys.Boot(); - xBoot.Execute(); - //System.Diagnostics.Debugger.Break(); + xBoot.Execute(); Console.WriteLine("Boot complete"); //PCITest.Test(); //Tests.DoAll(); //RTL8139.Test(); - Debugger.Main(); + //Debugger.Main(); + Console.WriteLine("Done - Waiting"); + Console.ReadLine(); //TODO: Make this automatically called after Init if no other shut downs are called Cosmos.Sys.Deboot.Halt(); } diff --git a/source/Cosmos.Build.Windows/Options.cs b/source/Cosmos.Build.Windows/Options.cs index 909380222..5b1b8b3c8 100644 --- a/source/Cosmos.Build.Windows/Options.cs +++ b/source/Cosmos.Build.Windows/Options.cs @@ -33,13 +33,13 @@ namespace Cosmos.Build.Windows { DebugMode = (string)xKey.GetValue("Debug Mode"); UseGDB = Boolean.Parse((string)xKey.GetValue("UseGDB", "false")); CreateHDImage = Boolean.Parse((string)xKey.GetValue("Use HD Image", "false")); - UseNetworkTAP = Boolean.Parse((string)xKey.GetValue("Use Network TAP", "false")); + UseNetworkTAP = Boolean.Parse((string)xKey.GetValue("Use TAP", "false")); NetworkCard = (string)xKey.GetValue("NetworkCard", Builder.QemuNetworkCard.rtl8139.ToString()); AudioCard = (string)xKey.GetValue("AudioCard", Builder.QemuAudioCard.es1370.ToString()); VMWareEdition = (string)xKey.GetValue("VMWare Edition"); USBDevice = (string)xKey.GetValue("USB Device"); ShowOptions = Boolean.Parse((string)xKey.GetValue("Show Options", "true")); - ShowConsoleWindow = Boolean.Parse((string)xKey.GetValue("Show Console Window", "false")); + ShowConsoleWindow = Boolean.Parse((string)xKey.GetValue("Show Console", "false")); CompileIL = Boolean.Parse((string)xKey.GetValue("CompileIL", "true")); } } @@ -52,13 +52,13 @@ namespace Cosmos.Build.Windows { xKey.SetValue("Debug Mode", DebugMode); xKey.SetValue("UseGDB", UseGDB.ToString()); xKey.SetValue("Use HD Image", CreateHDImage.ToString()); - xKey.SetValue("Use Network TAP", UseNetworkTAP.ToString()); + xKey.SetValue("Use TAP", UseNetworkTAP.ToString()); xKey.SetValue("NetworkCard", NetworkCard); xKey.SetValue("AudioCard", AudioCard); xKey.SetValue("VMWare Edition", VMWareEdition ?? ""); xKey.SetValue("USB Device", USBDevice??""); xKey.SetValue("Show Options", ShowOptions.ToString()); - xKey.SetValue("Show Console Window", ShowConsoleWindow.ToString()); + xKey.SetValue("Show Console", ShowConsoleWindow.ToString()); xKey.SetValue("CompileIL", CompileIL.ToString()); xKey.Flush(); }