Fixed unicode file search path issue

[mirror_edk2.git] / MdePkg / Include / Ipf / ProcessorBind.h

diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h
index f3706a782a498952add1b18bb64139dccd6a27e8..2995b121171ee1f1b3761ef243727b6b03fae394 100644 (file)
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/MdePkg/Include/Ipf/ProcessorBind.h
@@ -10,8 +10,6 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r

-  Module Name:  ProcessorBind.h\r
-\r

 **/\r
 \r
 #ifndef __PROCESSOR_BIND_H__\r
 **/\r
 \r
 #ifndef __PROCESSOR_BIND_H__\r


@@ -54,6 +52,11 @@
 //\r
 #pragma warning ( disable : 4057 )\r
 \r
 //\r
 #pragma warning ( disable : 4057 )\r
 \r

+//\r
+// Disable warning on conversion from function pointer to a data pointer\r
+//\r
+#pragma warning ( disable : 4054 )\r
+\r

 //\r
 // ASSERT(FALSE) or while (TRUE) are legal constructes so supress this warning\r
 //\r
 //\r
 // ASSERT(FALSE) or while (TRUE) are legal constructes so supress this warning\r
 //\r


@@ -196,7 +199,11 @@ typedef INT64   INTN;
 //  if the /OPT:REF linker option is used. We defined a macro as this is a \r
 //  a non standard extension\r
 //\r
 //  if the /OPT:REF linker option is used. We defined a macro as this is a \r
 //  a non standard extension\r
 //\r

-#define GLOBAL_REMOVE_IF_UNREFERENCED\r
+#if _MSC_EXTENSIONS\r
+  #define GLOBAL_REMOVE_IF_UNREFERENCED __declspec(selectany)\r
+#else\r
+  #define GLOBAL_REMOVE_IF_UNREFERENCED\r
+#endif\r

 \r
 //\r
 // A pointer to a function in IPF points to a plabel.\r
 \r
 //\r
 // A pointer to a function in IPF points to a plabel.\r


@@ -207,11 +214,11 @@ typedef struct {
 } EFI_PLABEL;\r
 \r
 typedef struct {\r
 } EFI_PLABEL;\r
 \r
 typedef struct {\r

-  UINTN BootPhase;      // entry r20 value\r
-  UINTN UniqueId;       // PAL arbitration ID\r
-  UINTN HealthStat;     // Health Status\r
-  UINTN PALRetAddress;  // return address to PAL\r
-} IPF_HANDOFF_STATUS;\r
+  UINT64                    Status;\r
+  UINT64                    r9;\r
+  UINT64                    r10;\r
+  UINT64                    r11;\r
+} PAL_CALL_RETURN;\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r