Changed definitions in Legacy16.h and LegacyBios.h to be compatible with CSM 0.96

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1910 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Common/Legacy16.h b/MdePkg/Include/Common/Legacy16.h
index 1f8b9bf324e875ee20bee720f02eb104f8af2d02..09bac9f035477bab62b2a9e35f74e1264802fa63 100644 (file)
--- a/MdePkg/Include/Common/Legacy16.h
+++ b/MdePkg/Include/Common/Legacy16.h
@@ -37,7 +37,7 @@ typedef struct {
   //\r
   UINT32  BiosLessThan1MB;\r
   UINT32  HiPmmMemory;\r
   //\r
   UINT32  BiosLessThan1MB;\r
   UINT32  HiPmmMemory;\r

-  UINT32  PmmMemorySizeInBytes;\r
+  UINT32  HiPmmMemorySizeInBytes;\r

 \r
   UINT16  ReverseThunkCallSegment;\r
   UINT16  ReverseThunkCallOffset;\r
 \r
   UINT16  ReverseThunkCallSegment;\r
   UINT16  ReverseThunkCallOffset;\r


@@ -76,7 +76,7 @@ typedef enum {
 //  Legacy16InitializeYourself\r
 //    Description: This is the first call to 16-bit code. It allows the\r
 //                 16-bit to perform any internal initialization.\r
 //  Legacy16InitializeYourself\r
 //    Description: This is the first call to 16-bit code. It allows the\r
 //                 16-bit to perform any internal initialization.\r

-//    Input:  ES:BX pointer to EFI_TO_LEGACY16_INIT_TABLE\r
+//    Input:  ES:BX pointer to EFI_TO_COMPATIBILITY16_INIT_TABLE\r

 //    Output:\r
 //  Legacy16UpdateBbs\r
 //    Description: The 16-bit code updates the BBS table for non-compliant\r
 //    Output:\r
 //  Legacy16UpdateBbs\r
 //    Description: The 16-bit code updates the BBS table for non-compliant\r

diff --git a/MdePkg/Include/Protocol/LegacyBios.h b/MdePkg/Include/Protocol/LegacyBios.h
index c508009b9b89cacbd21fde5933e7ec28eeb7474d..36f8a22697fec28bbe68ceca27f8b92a44628dec 100644 (file)
--- a/MdePkg/Include/Protocol/LegacyBios.h
+++ b/MdePkg/Include/Protocol/LegacyBios.h
@@ -183,15 +183,15 @@ typedef struct {
   UINT8   EfiMinorRevision;\r
   UINT8   TableMajorRevision;\r
   UINT8   TableMinorRevision;\r
   UINT8   EfiMinorRevision;\r
   UINT8   TableMajorRevision;\r
   UINT8   TableMinorRevision;\r

-  UINT8   Reserved[2];\r
-  UINT16  Legacy16CallSegment;\r
-  UINT16  Legacy16CallOffset;\r
+  UINT16  Reserved;\r
+  UINT16  Compatibility16CallSegment;\r
+  UINT16  Compatibility16CallOffset;\r

 \r
   UINT16  PnPInstallationCheckSegment;\r
   UINT16  PnPInstallationCheckOffset;\r
 \r
   UINT32  EfiSystemTable;\r
 \r
   UINT16  PnPInstallationCheckSegment;\r
   UINT16  PnPInstallationCheckOffset;\r
 \r
   UINT32  EfiSystemTable;\r

-  UINT32  OemStringPointer;\r
+  UINT32  OemIdStringPointer;\r

   UINT32  AcpiRsdPtrPointer;\r
   UINT16  OemRevision;\r
   UINT32  E820Pointer;\r
   UINT32  AcpiRsdPtrPointer;\r
   UINT16  OemRevision;\r
   UINT32  E820Pointer;\r


@@ -516,7 +516,7 @@ EFI_STATUS
   OUT UINT16                          *HddCount,\r
   OUT HDD_INFO                        **HddInfo,\r
   OUT UINT16                          *BbsCount,\r
   OUT UINT16                          *HddCount,\r
   OUT HDD_INFO                        **HddInfo,\r
   OUT UINT16                          *BbsCount,\r

-  OUT IN BBS_TABLE                    **BbsTable\r
+  IN OUT BBS_TABLE                    **BbsTable\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -536,7 +536,7 @@ EFI_STATUS
 (EFIAPI *EFI_LEGACY_BIOS_PREPARE_TO_BOOT_EFI) (\r
   IN EFI_LEGACY_BIOS_PROTOCOL         *This,\r
   OUT UINT16                          *BbsCount,\r
 (EFIAPI *EFI_LEGACY_BIOS_PREPARE_TO_BOOT_EFI) (\r
   IN EFI_LEGACY_BIOS_PROTOCOL         *This,\r
   OUT UINT16                          *BbsCount,\r

-  OUT IN BBS_TABLE                    **BbsTable\r
+  OUT BBS_TABLE                       **BbsTable\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -689,8 +689,8 @@ struct _EFI_LEGACY_BIOS_PROTOCOL {
   EFI_LEGACY_BIOS_BOOT                        LegacyBoot;\r
   EFI_LEGACY_BIOS_UPDATE_KEYBOARD_LED_STATUS  UpdateKeyboardLedStatus;\r
   EFI_LEGACY_BIOS_GET_BBS_INFO                GetBbsInfo;\r
   EFI_LEGACY_BIOS_BOOT                        LegacyBoot;\r
   EFI_LEGACY_BIOS_UPDATE_KEYBOARD_LED_STATUS  UpdateKeyboardLedStatus;\r
   EFI_LEGACY_BIOS_GET_BBS_INFO                GetBbsInfo;\r

-  EFI_LEGACY_BIOS_PREPARE_TO_BOOT_EFI         PrepareToBootEfi;\r

   EFI_LEGACY_BIOS_SHADOW_ALL_LEGACY_OPROMS    ShadowAllLegacyOproms;\r
   EFI_LEGACY_BIOS_SHADOW_ALL_LEGACY_OPROMS    ShadowAllLegacyOproms;\r

+  EFI_LEGACY_BIOS_PREPARE_TO_BOOT_EFI         PrepareToBootEfi;\r

   EFI_LEGACY_BIOS_GET_LEGACY_REGION           GetLegacyRegion;\r
   EFI_LEGACY_BIOS_COPY_LEGACY_REGION          CopyLegacyRegion;\r
   EFI_LEGACY_BIOS_BOOT_UNCONVENTIONAL_DEVICE  BootUnconventionalDevice;\r
   EFI_LEGACY_BIOS_GET_LEGACY_REGION           GetLegacyRegion;\r
   EFI_LEGACY_BIOS_COPY_LEGACY_REGION          CopyLegacyRegion;\r
   EFI_LEGACY_BIOS_BOOT_UNCONVENTIONAL_DEVICE  BootUnconventionalDevice;\r