Rings.

nathanpapke · Aug 16, 2017 · 374cd26 · 374cd26
1 parent 2831abb
commit 374cd26
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Test.sln b/Test.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.0
+VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{DAEF99B5-22F0-4885-B45B-9B600B857E1C}"
 EndProject
@@ -130,7 +130,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "40 System", "40 System", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "50 Application", "50 Application", "{02FF94AF-6BA3-49ED-A027-A63F591C310D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "91 Plugs", "91 Plugs", "{1FC213DE-5033-40E1-9C16-5F1A0CDC9693}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "91 Plug", "91 Plug", "{1FC213DE-5033-40E1-9C16-5F1A0CDC9693}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU.x86", "source\Kernel-X86\10-CPU\Cosmos.CPU.x86\Cosmos.CPU.x86.csproj", "{4D219A6D-4528-4622-AF29-96F830C4D076}"
 EndProject
@@ -150,6 +150,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU_Asm", "source\Ke
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheRingMaster", "source\TheRingMaster\TheRingMaster.csproj", "{3DD192AF-2D72-449F-936C-ED8734225B18}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "92 CpuPlug", "92 CpuPlug", "{929EE8ED-6AD3-4442-A0C1-EC70665F2DCF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -635,9 +637,10 @@ Global
 		{F588033A-6B7D-4ABF-96C4-73D8B2271A6B} = {DE38917F-969B-486C-AF83-C59E5E52400A}
 		{9E58E949-7B71-45ED-9610-11DA287EE933} = {02FF94AF-6BA3-49ED-A027-A63F591C310D}
 		{756ECECD-B213-42F0-BF58-4A91B4C47FAA} = {1FC213DE-5033-40E1-9C16-5F1A0CDC9693}
-		{C000BFB2-DFDE-4B1E-BDA6-988B30370C7A} = {1FC213DE-5033-40E1-9C16-5F1A0CDC9693}
+		{C000BFB2-DFDE-4B1E-BDA6-988B30370C7A} = {929EE8ED-6AD3-4442-A0C1-EC70665F2DCF}
 		{0C7C9F9D-6498-45E8-B77B-FF4D381C3297} = {29B893F7-6C0F-4710-A60E-7FB3498BCA63}
 		{3DD192AF-2D72-449F-936C-ED8734225B18} = {C286932C-3F6D-47F0-BEEF-26843D1BB11B}
+		{929EE8ED-6AD3-4442-A0C1-EC70665F2DCF} = {99192440-2DD7-4E71-B730-D44A73F46533}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4418C803-277E-448F-A0A0-52788FA215AD}

diff --git a/source/TheRingMaster/Program.cs b/source/TheRingMaster/Program.cs
@@ -20,8 +20,8 @@ enum Ring
             HAL = 30,
             System = 40,
             Application = 50,
-            Shared = 90,
-            Plugs = 91,
+            Plug = 91,
+            CpuPlug = 92,
             Debug
         }
 
@@ -124,7 +124,7 @@ void CheckRings(Assembly aAssembly, Ring aRing, string aSourceAssemblyName = nul
                     throw new Exception(xExceptionMessage);
                 }
 
-                if (xRing != Ring.CPU && xRing != Ring.Plugs)
+                if (xRing != Ring.CPU && xRing != Ring.CpuPlug)
                 {
                     foreach (var xModule in aAssembly.Modules)
                     {
@@ -134,7 +134,7 @@ void CheckRings(Assembly aAssembly, Ring aRing, string aSourceAssemblyName = nul
 
                 foreach (var xType in aAssembly.GetTypes())
                 {
-                    if (xRing != Ring.Plugs)
+                    if (xRing != Ring.Plug)
                     {
                         if (xType.GetTypeInfo().GetCustomAttribute<Plug>() != null)
                         {