From 0314e4c183f02e655cdc2a88cebd4892ef930c83 Mon Sep 17 00:00:00 2001 From: HKS_cp <804d57068da1b85c21a2aa7102263f0b712556b1DWcdp7Ps> Date: Tue, 14 Feb 2012 10:24:41 +0000 Subject: [PATCH] Added my own project to the sln --- source/Cosmos.sln | 41 ++++++++++++++++++- .../HKSplayground/..svnbridge/.svnbridge | 8 ++++ .../HKSplayground/HKSplaygroundBoot.Cosmos | 25 ++++++++--- source2/Users/HKSplayground/Kernel.cs | 29 ++++++++----- 4 files changed, 86 insertions(+), 17 deletions(-) create mode 100644 source2/Users/HKSplayground/..svnbridge/.svnbridge diff --git a/source/Cosmos.sln b/source/Cosmos.sln index 6ec337d7a..0d8cdff4e 100644 --- a/source/Cosmos.sln +++ b/source/Cosmos.sln @@ -92,7 +92,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Docs", "..\Docs", "{67E7DEF Release.AspNetCompiler.ForceOverwrite = "true" Release.AspNetCompiler.FixedNames = "false" Release.AspNetCompiler.Debug = "False" - VWDPort = "42930" + VWDPort = "32311" EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.Consts", "..\source2\IL2CPU\Cosmos.IL2CPU.Debug\Cosmos.Debug.Consts.csproj", "{9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}" @@ -190,6 +190,12 @@ Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "SSchockeTestBoot", "..\sour EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.IL2CPU.Profiler", "..\source2\IL2CPU\Cosmos.IL2CPU.Profiler\Cosmos.IL2CPU.Profiler.csproj", "{F708C866-1C9B-4579-8C28-0728ECCFC1ED}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HKSplayground", "HKSplayground", "{9588D51E-243F-4ABA-AED2-A77DA0634209}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HKSplayground", "..\source2\Users\HKSplayground\HKSplayground.csproj", "{79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}" +EndProject +Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "HKSplaygroundBoot", "..\source2\Users\HKSplayground\HKSplaygroundBoot.Cosmos", "{D048E0B1-8B2B-4A99-8376-7FC8A0656A05}" +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 49 @@ -1156,6 +1162,36 @@ Global {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Release|x86.ActiveCfg = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Bootstrap|Any CPU.ActiveCfg = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Bootstrap|Any CPU.Build.0 = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Bootstrap|Mixed Platforms.ActiveCfg = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Bootstrap|Mixed Platforms.Build.0 = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Bootstrap|x86.ActiveCfg = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Debug|Any CPU.Build.0 = Debug|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Debug|x86.ActiveCfg = Debug|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Release|Any CPU.ActiveCfg = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Release|Any CPU.Build.0 = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395}.Release|x86.ActiveCfg = Release|Any CPU + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Bootstrap|Any CPU.ActiveCfg = Release|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Bootstrap|Mixed Platforms.ActiveCfg = Release|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Bootstrap|Mixed Platforms.Build.0 = Release|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Bootstrap|x86.ActiveCfg = Release|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Bootstrap|x86.Build.0 = Release|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Debug|Any CPU.ActiveCfg = Debug|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Debug|x86.ActiveCfg = Debug|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Debug|x86.Build.0 = Debug|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Release|Any CPU.ActiveCfg = Release|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Release|Mixed Platforms.Build.0 = Release|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Release|x86.ActiveCfg = Release|x86 + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1193,6 +1229,7 @@ Global {2DF5F17F-4890-4856-ADFD-4DE23282C3B7} = {A4478219-065D-4928-BB4D-4358CAD39A03} {0CF14D0F-6054-4D3D-9062-E3D2EB064A4E} = {A4478219-065D-4928-BB4D-4358CAD39A03} {4831F868-2418-4277-A91F-4F599604CB29} = {A4478219-065D-4928-BB4D-4358CAD39A03} + {9588D51E-243F-4ABA-AED2-A77DA0634209} = {A4478219-065D-4928-BB4D-4358CAD39A03} {3EEE2ABA-87B3-4DD7-B6C5-BEF23D411136} = {9D82B35C-7133-4ADE-AA5C-0FFB2BFA8BA6} {91CBD640-C07D-4556-B4CB-6F8CD88C67C9} = {9D82B35C-7133-4ADE-AA5C-0FFB2BFA8BA6} {61535AF6-4A1E-4691-B2BC-039851EF4850} = {CD3F5E45-8B24-424F-ADF1-0211712F4CB7} @@ -1229,5 +1266,7 @@ Global {9C96A7B5-19E5-4923-9569-DB9454E69C82} = {B521E2A2-81E4-4B2D-A471-7AB550E9551E} {0AAD9114-6F08-4344-A282-CD6BC77595E5} = {4831F868-2418-4277-A91F-4F599604CB29} {4527D60E-25F4-4617-B463-7CDA3C219097} = {4831F868-2418-4277-A91F-4F599604CB29} + {79D1C0AE-BB85-4F85-ACCD-8AEDD8D7B395} = {9588D51E-243F-4ABA-AED2-A77DA0634209} + {D048E0B1-8B2B-4A99-8376-7FC8A0656A05} = {9588D51E-243F-4ABA-AED2-A77DA0634209} EndGlobalSection EndGlobal diff --git a/source2/Users/HKSplayground/..svnbridge/.svnbridge b/source2/Users/HKSplayground/..svnbridge/.svnbridge new file mode 100644 index 000000000..44262bd47 --- /dev/null +++ b/source2/Users/HKSplayground/..svnbridge/.svnbridge @@ -0,0 +1,8 @@ +svn:ignore[Bb]in +obj +[Dd]ebug +[Rr]elease +*.user +*.aps +*.eto + \ No newline at end of file diff --git a/source2/Users/HKSplayground/HKSplaygroundBoot.Cosmos b/source2/Users/HKSplayground/HKSplaygroundBoot.Cosmos index 430529acf..3b87ed869 100644 --- a/source2/Users/HKSplayground/HKSplaygroundBoot.Cosmos +++ b/source2/Users/HKSplayground/HKSplaygroundBoot.Cosmos @@ -18,7 +18,9 @@ User VMWare Player - false + False + + All true @@ -36,12 +38,23 @@ - - HKSplayground - HKSplayground.dll - bin\Debug\HKSplayground.dll + + + + Cosmos.Kernel.Plugs + {b168bedd-c6a6-4e7c-b9a5-0144286e9e42} True - + + + Cosmos.Kernel + {a1f83d9f-2d44-4264-a08b-416797123018} + True + + + HKSplayground (source2\Users\HKSplayground\HKSplayground) + {79d1c0ae-bb85-4f85-accd-8aedd8d7b395} + True + \ No newline at end of file diff --git a/source2/Users/HKSplayground/Kernel.cs b/source2/Users/HKSplayground/Kernel.cs index ec26f6f91..9c62f9dfe 100644 --- a/source2/Users/HKSplayground/Kernel.cs +++ b/source2/Users/HKSplayground/Kernel.cs @@ -2,30 +2,39 @@ using System.Collections.Generic; using System.Text; using Sys = Cosmos.System; +using Cosmos.Hardware; namespace HKSplayground { public class Kernel : Sys.Kernel { - byte[] ba = {1,2,3}; - + Mouse m = new Mouse(); + int x=0, y=0; + int z = 0; protected override void BeforeRun() { - Cosmos.Hardware2.PCIBus.Init(); Console.WriteLine("Cosmos booted successfully. Type a line of text to get it echoed back."); + m.Initialize(); + Console.WriteLine("Mouse initialized"); } - int i = 1; protected override void Run() { while (true) { - if (i == 1) - { - Cosmos.Hardware2.Network.Devices.AMDPCNetII.AMDPCNet.FindAll(); - i++; - } - else + //Do nothing + if (x != m.X || y != m.Y) { + x = m.X; + y = m.Y; + if (z != Int16.MaxValue - 1) + { + z++; + } + else + { + z = 0; + } + Console.WriteLine(z); } } }