From: jtang12 Date: Wed, 8 Nov 2006 02:10:54 +0000 (+0000) Subject: Changed definitions in Legacy16.h and LegacyBios.h to be compatible with CSM 0.96 X-Git-Tag: edk2-stable201903~23967 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e4a246f1343b71b600baad9dd07303d927930ea1;hp=b219108e5154c92975ff56cfa8e022c89e6f410b 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 1f8b9bf324..09bac9f035 100644 --- a/MdePkg/Include/Common/Legacy16.h +++ b/MdePkg/Include/Common/Legacy16.h @@ -37,7 +37,7 @@ typedef struct { // UINT32 BiosLessThan1MB; UINT32 HiPmmMemory; - UINT32 PmmMemorySizeInBytes; + UINT32 HiPmmMemorySizeInBytes; UINT16 ReverseThunkCallSegment; UINT16 ReverseThunkCallOffset; @@ -76,7 +76,7 @@ typedef enum { // Legacy16InitializeYourself // Description: This is the first call to 16-bit code. It allows the // 16-bit to perform any internal initialization. -// Input: ES:BX pointer to EFI_TO_LEGACY16_INIT_TABLE +// Input: ES:BX pointer to EFI_TO_COMPATIBILITY16_INIT_TABLE // Output: // Legacy16UpdateBbs // Description: The 16-bit code updates the BBS table for non-compliant diff --git a/MdePkg/Include/Protocol/LegacyBios.h b/MdePkg/Include/Protocol/LegacyBios.h index c508009b9b..36f8a22697 100644 --- a/MdePkg/Include/Protocol/LegacyBios.h +++ b/MdePkg/Include/Protocol/LegacyBios.h @@ -183,15 +183,15 @@ typedef struct { UINT8 EfiMinorRevision; UINT8 TableMajorRevision; UINT8 TableMinorRevision; - UINT8 Reserved[2]; - UINT16 Legacy16CallSegment; - UINT16 Legacy16CallOffset; + UINT16 Reserved; + UINT16 Compatibility16CallSegment; + UINT16 Compatibility16CallOffset; UINT16 PnPInstallationCheckSegment; UINT16 PnPInstallationCheckOffset; UINT32 EfiSystemTable; - UINT32 OemStringPointer; + UINT32 OemIdStringPointer; UINT32 AcpiRsdPtrPointer; UINT16 OemRevision; UINT32 E820Pointer; @@ -516,7 +516,7 @@ EFI_STATUS OUT UINT16 *HddCount, OUT HDD_INFO **HddInfo, OUT UINT16 *BbsCount, - OUT IN BBS_TABLE **BbsTable + IN OUT BBS_TABLE **BbsTable ) ; @@ -536,7 +536,7 @@ EFI_STATUS (EFIAPI *EFI_LEGACY_BIOS_PREPARE_TO_BOOT_EFI) ( IN EFI_LEGACY_BIOS_PROTOCOL *This, OUT UINT16 *BbsCount, - OUT IN BBS_TABLE **BbsTable + OUT BBS_TABLE **BbsTable ) ; @@ -689,8 +689,8 @@ struct _EFI_LEGACY_BIOS_PROTOCOL { EFI_LEGACY_BIOS_BOOT LegacyBoot; EFI_LEGACY_BIOS_UPDATE_KEYBOARD_LED_STATUS UpdateKeyboardLedStatus; EFI_LEGACY_BIOS_GET_BBS_INFO GetBbsInfo; - EFI_LEGACY_BIOS_PREPARE_TO_BOOT_EFI PrepareToBootEfi; EFI_LEGACY_BIOS_SHADOW_ALL_LEGACY_OPROMS ShadowAllLegacyOproms; + EFI_LEGACY_BIOS_PREPARE_TO_BOOT_EFI PrepareToBootEfi; EFI_LEGACY_BIOS_GET_LEGACY_REGION GetLegacyRegion; EFI_LEGACY_BIOS_COPY_LEGACY_REGION CopyLegacyRegion; EFI_LEGACY_BIOS_BOOT_UNCONVENTIONAL_DEVICE BootUnconventionalDevice;