From 74ccda1ffcc60b3bf79a144b87ff4117434f7dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Wed, 24 Aug 2016 20:04:07 +0100
Subject: [PATCH] Finished merging

---
 source/Cosmos.System/Cosmos.System.csproj     | 10 ++++-----
 source/Cosmos.System/Keyboard/KeyMapping.cs   | 22 +++++++++----------
 .../{ => Keyboard}/ScanMaps/DE_Standard.cs    |  0
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename source/Cosmos.System/{ => Keyboard}/ScanMaps/DE_Standard.cs (100%)

diff --git a/source/Cosmos.System/Cosmos.System.csproj b/source/Cosmos.System/Cosmos.System.csproj
index acf2d453c..35e3fda0e 100644
--- a/source/Cosmos.System/Cosmos.System.csproj
+++ b/source/Cosmos.System/Cosmos.System.csproj
@@ -107,6 +107,9 @@
     <Compile Include="Keyboard\KeyEvent.cs" />
     <Compile Include="Keyboard\KeyMapping.cs" />
     <Compile Include="Keyboard\ScanMapBase.cs" />
+    <Compile Include="Keyboard\ScanMaps\FR_Standard.cs" />
+    <Compile Include="Keyboard\ScanMaps\US_Standard.cs" />
+    <Compile Include="Keyboard\ScanMaps\DE_Standard.cs" />
     <Compile Include="MathEx.cs" />
     <Compile Include="Network\ARP\ARPCache.cs" />
     <Compile Include="Network\ARP\ARPPacket.cs" />
@@ -124,9 +127,6 @@
     <Compile Include="Network\UdpClient.cs" />
     <Compile Include="Power.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ScanMaps\DE_Standard.cs" />
-    <Compile Include="ScanMaps\FR_Standard.cs" />
-    <Compile Include="ScanMaps\US_Standard.cs" />
     <Compile Include="TestingHelpers.cs" />
     <Compile Include="Graphics\VBEScreen.cs" />
     <Compile Include="Graphics\VGAScreen.cs" />
@@ -154,11 +154,11 @@
     <None Include="Cosmos.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/source/Cosmos.System/Keyboard/KeyMapping.cs b/source/Cosmos.System/Keyboard/KeyMapping.cs
index 77bbbdc51..937b326fa 100644
--- a/source/Cosmos.System/Keyboard/KeyMapping.cs
+++ b/source/Cosmos.System/Keyboard/KeyMapping.cs
@@ -16,7 +16,7 @@ namespace Cosmos.System
         public ConsoleKeyEx Key;
         public ConsoleKeyEx NumLockKey;
 
-        public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, char ctrl, char shiftctrl, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
+        public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, char ctrl, char shiftctrl, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
         {
             Scancode = aScanCode;
             Value = norm;
@@ -34,37 +34,37 @@ namespace Cosmos.System
             NumLockKey = numKey;
         }
 
-        public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
+        public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
             : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, '\0', '\0', aKey, numKey)
         {
         }
 
-        public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
+        public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
             : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, '\0', '\0', '\0', aKey, numKey)
         {
         }
 
-        public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, char ctrl, char shiftctrl, ConsoleKeyEx aKey)
+        public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, char ctrl, char shiftctrl, ConsoleKeyEx aKey)
             : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, ctrl, shiftctrl, aKey, aKey)
         {
         }
 
-        public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, ConsoleKeyEx aKey)
-            : this (aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, '\0', '\0', aKey)
+        public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, ConsoleKeyEx aKey)
+            : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, '\0', '\0', aKey)
         {
         }
 
-        public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, ConsoleKeyEx aKey)
+        public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, ConsoleKeyEx aKey)
             : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, '\0', '\0', '\0', aKey)
         {
         }
 
-        public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, ConsoleKeyEx aKey)
+        public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, ConsoleKeyEx aKey)
             : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, '\0', '\0', '\0', '\0', aKey)
         {
         }
 
-        public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
+        public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
             : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, '\0', aKey, numKey)
         {
         }
@@ -74,12 +74,12 @@ namespace Cosmos.System
         {
         }
 
-        public KeyMapping(uint aScanCode, char num, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
+        public KeyMapping(byte aScanCode, char num, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
             : this(aScanCode, '\0', '\0', num, '\0', '\0', '\0', aKey, numKey)
         {
         }
 
-        public KeyMapping(uint aScanCode, char n, ConsoleKeyEx aKey) 
+        public KeyMapping(byte aScanCode, char n, ConsoleKeyEx aKey)
             : this(aScanCode, n, n, n, n, n, n, aKey)
         {
         }
diff --git a/source/Cosmos.System/ScanMaps/DE_Standard.cs b/source/Cosmos.System/Keyboard/ScanMaps/DE_Standard.cs
similarity index 100%
rename from source/Cosmos.System/ScanMaps/DE_Standard.cs
rename to source/Cosmos.System/Keyboard/ScanMaps/DE_Standard.cs