From 4beb3b6fd474d9daffa838fb870492993cd2cd29 Mon Sep 17 00:00:00 2001
From: Sergey Isakov <isakov-sl@bk.ru>
Date: Fri, 4 Oct 2019 17:09:15 +0300
Subject: [PATCH] few corrections

Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
---
 Clover.dsc                                     | 1 +
 CloverPkg.dec                                  | 3 +++
 Protocols/AptioInputFix/AptioInputFix.inf      | 5 +++--
 Protocols/AptioInputFix/Keycode/AIKData.h      | 1 +
 Protocols/AptioInputFix/Keycode/AIKShim.h      | 1 +
 Protocols/AptioInputFix/Keycode/AIKTarget.h    | 1 +
 Protocols/AptioInputFix/Keycode/AIKTranslate.h | 1 +
 7 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Clover.dsc b/Clover.dsc
index d382b5cb7..428d28ddc 100644
--- a/Clover.dsc
+++ b/Clover.dsc
@@ -152,6 +152,7 @@
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
 
   OcGuardLib|Library/OcGuardLib/OcGuardLib.inf
+  MachoLib|Library/MachoLib/MachoLib.inf
 
   #
   # Our libs
diff --git a/CloverPkg.dec b/CloverPkg.dec
index 2689221a3..ccabf4a94 100644
--- a/CloverPkg.dec
+++ b/CloverPkg.dec
@@ -68,6 +68,9 @@
   gAppleApfsPartitionTypeGuid   = {0x7C3457EF, 0x0000, 0x11AA, {0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC}}
   gAppleApfsContainerInfoGuid   = {0x3533CF0D, 0x685F, 0x5EBF, {0x8D, 0xC6, 0x73, 0x93, 0x48, 0x5B, 0xAF, 0xA2}}
   gAppleApfsVolumeInfoGuid      = {0x900C7693, 0x8C14, 0x58BA, {0xB4, 0x4E, 0x97, 0x45, 0x15, 0xD2, 0x7C, 0x78}}
+    # Include/Guid/ApplePlatformInfo.h
+  gAppleKeyboardPlatformInfoGuid             = { 0x51871CB9, 0xE25D, 0x44B4, { 0x96, 0x99, 0x0E, 0xE8, 0x64, 0x4C, 0xED, 0x69 }}
+
 
 
 [Protocols]
diff --git a/Protocols/AptioInputFix/AptioInputFix.inf b/Protocols/AptioInputFix/AptioInputFix.inf
index c9f1492e7..2ba95bb8f 100644
--- a/Protocols/AptioInputFix/AptioInputFix.inf
+++ b/Protocols/AptioInputFix/AptioInputFix.inf
@@ -43,8 +43,9 @@
 # Fixme
 
 [Packages]
-  AptioFixPkg/AptioFixPkg.dec
-  EfiPkg/EfiPkg.dec
+#  AptioFixPkg/AptioFixPkg.dec
+#  EfiPkg/EfiPkg.dec
+  CloverPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
 
diff --git a/Protocols/AptioInputFix/Keycode/AIKData.h b/Protocols/AptioInputFix/Keycode/AIKData.h
index 41bf685fb..7de8dc577 100644
--- a/Protocols/AptioInputFix/Keycode/AIKData.h
+++ b/Protocols/AptioInputFix/Keycode/AIKData.h
@@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef AIK_DATA_H
 #define AIK_DATA_H
 
+#include <Library/UefiLib.h>
 #include <Protocol/AmiKeycode.h>
 
 //
diff --git a/Protocols/AptioInputFix/Keycode/AIKShim.h b/Protocols/AptioInputFix/Keycode/AIKShim.h
index 2f3a66a61..d923e97b9 100644
--- a/Protocols/AptioInputFix/Keycode/AIKShim.h
+++ b/Protocols/AptioInputFix/Keycode/AIKShim.h
@@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef AIK_SHIM_H
 #define AIK_SHIM_H
 
+#include <Library/UefiLib.h>
 #include <Protocol/AmiKeycode.h>
 #include <Protocol/SimpleTextIn.h>
 #include <Protocol/SimpleTextInEx.h>
diff --git a/Protocols/AptioInputFix/Keycode/AIKTarget.h b/Protocols/AptioInputFix/Keycode/AIKTarget.h
index 6a69af491..07b42775f 100644
--- a/Protocols/AptioInputFix/Keycode/AIKTarget.h
+++ b/Protocols/AptioInputFix/Keycode/AIKTarget.h
@@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef AIK_TARGET_H
 #define AIK_TARGET_H
 
+#include <Library/UefiLib.h>
 #include <IndustryStandard/AppleHid.h>
 #include <Protocol/AppleKeyMapDatabase.h>
 #include <Protocol/AmiKeycode.h>
diff --git a/Protocols/AptioInputFix/Keycode/AIKTranslate.h b/Protocols/AptioInputFix/Keycode/AIKTranslate.h
index 0bdaed95e..7e0cae885 100644
--- a/Protocols/AptioInputFix/Keycode/AIKTranslate.h
+++ b/Protocols/AptioInputFix/Keycode/AIKTranslate.h
@@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef AIK_TRANSLATE_H
 #define AIK_TRANSLATE_H
 
+#include <Library/UefiLib.h>
 #include <IndustryStandard/AppleHid.h>
 #include <Protocol/AmiKeycode.h>