From 880237f3bdefd8770736f11e89293fd28d6e4a3c Mon Sep 17 00:00:00 2001 From: klu2 Date: Sun, 1 Mar 2009 09:54:54 +0000 Subject: [PATCH] Add missing protocol definition in dec file and remove LegacyBiosThunk protocol. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7743 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/DuetPkg.dec | 1 - .../{LegacyBiosThunk.c => EdidActive.h} | 25 ++-- DuetPkg/Include/Protocol/EdidDiscovered.h | 40 ++++++ DuetPkg/Include/Protocol/LegacyBiosThunk.h | 119 ------------------ 4 files changed, 57 insertions(+), 128 deletions(-) rename DuetPkg/Include/Protocol/{LegacyBiosThunk.c => EdidActive.h} (59%) create mode 100644 DuetPkg/Include/Protocol/EdidDiscovered.h delete mode 100644 DuetPkg/Include/Protocol/LegacyBiosThunk.h diff --git a/DuetPkg/DuetPkg.dec b/DuetPkg/DuetPkg.dec index b3b548caf8..254fa345bd 100644 --- a/DuetPkg/DuetPkg.dec +++ b/DuetPkg/DuetPkg.dec @@ -13,7 +13,6 @@ gEfiFlashMapHobGuid = { 0xb091e7d2, 0x5a0, 0x4198, {0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59 }} [Protocols.common] - gEfiLegacyBiosThunkProtocolGuid = {0x4c51a7ba, 0x7195, 0x442d, {0x87, 0x92, 0xbe, 0xea, 0x6e, 0x2f, 0xf6, 0xec}} gEfiEdidDiscoveredProtocolGuid = {0x1c0c34f6, 0xd380, 0x41fa, {0xa0, 0x49, 0x8a, 0xd0, 0x6c, 0x1a, 0x66, 0xaa}} gEfiEdidActiveProtocolGuid = {0xbd8c1056, 0x9f36, 0x44ec, {0x92, 0xa8, 0xa6, 0x33, 0x7f, 0x81, 0x79, 0x86}} \ No newline at end of file diff --git a/DuetPkg/Include/Protocol/LegacyBiosThunk.c b/DuetPkg/Include/Protocol/EdidActive.h similarity index 59% rename from DuetPkg/Include/Protocol/LegacyBiosThunk.c rename to DuetPkg/Include/Protocol/EdidActive.h index a9d29dd48a..50b325dd3b 100644 --- a/DuetPkg/Include/Protocol/LegacyBiosThunk.c +++ b/DuetPkg/Include/Protocol/EdidActive.h @@ -11,20 +11,29 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: - LegacyBiosThunk.c - + EdidActive.h + Abstract: - Legacy BIOS Thunk Protocol + EDID Active Protocol from the UEFI 2.0 specification. -Revision History + Placed on the video output device child handle that are actively displaying output. --*/ -#include "Tiano.h" +#ifndef __EDID_ACTIVE_H__ +#define __EDID_ACTIVE_H__ -#include EFI_PROTOCOL_DEFINITION (LegacyBiosThunk) +#define EFI_EDID_ACTIVE_PROTOCOL_GUID \ + { \ + 0xbd8c1056, 0x9f36, 0x44ec, 0x92, 0xa8, 0xa6, 0x33, 0x7f, 0x81, 0x79, 0x86 \ + } -EFI_GUID gEfiLegacyBiosThunkProtocolGuid = EFI_LEGACY_BIOS_THUNK_PROTOCOL_GUID; +typedef struct { + UINT32 SizeOfEdid; + UINT8 *Edid; +} EFI_EDID_ACTIVE_PROTOCOL; -EFI_GUID_STRING(&gEfiLegacyBiosThunkProtocolGuid, "Legacy BIOS Thunk Protocol", "Legacy BIOS Thunk Protocol"); +extern EFI_GUID gEfiEdidActiveProtocolGuid; + +#endif diff --git a/DuetPkg/Include/Protocol/EdidDiscovered.h b/DuetPkg/Include/Protocol/EdidDiscovered.h new file mode 100644 index 0000000000..36061f66f8 --- /dev/null +++ b/DuetPkg/Include/Protocol/EdidDiscovered.h @@ -0,0 +1,40 @@ +/*++ + +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +Module Name: + + EdidDiscovered.h + +Abstract: + + EDID Discovered Protocol from the UEFI 2.0 specification. + + This protocol is placed on the video output device child handle and it represents + the EDID information being used for output device represented by the child handle. + +--*/ + +#ifndef __EDID_DISCOVERED_H__ +#define __EDID_DISCOVERED_H__ + +#define EFI_EDID_DISCOVERED_PROTOCOL_GUID \ + { \ + 0x1c0c34f6, 0xd380, 0x41fa, 0xa0, 0x49, 0x8a, 0xd0, 0x6c,0x1a, 0x66, 0xaa \ + } + +typedef struct { + UINT32 SizeOfEdid; + UINT8 *Edid; +} EFI_EDID_DISCOVERED_PROTOCOL; + +extern EFI_GUID gEfiEdidDiscoveredProtocolGuid; + +#endif diff --git a/DuetPkg/Include/Protocol/LegacyBiosThunk.h b/DuetPkg/Include/Protocol/LegacyBiosThunk.h deleted file mode 100644 index fd84389207..0000000000 --- a/DuetPkg/Include/Protocol/LegacyBiosThunk.h +++ /dev/null @@ -1,119 +0,0 @@ -/*++ - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - LegacyBiosThunk.h - -Abstract: - - The EFI Legacy BIOS Thunk Protocol is used to abstract Thunk16 call. - - Note: The names for EFI_IA32_REGISTER_SET elements were picked to follow - well known naming conventions. - - Thunk - A thunk is a transition from one processor mode to another. A Thunk - is a transition from native EFI mode to 16-bit mode. A reverse thunk - would be a transition from 16-bit mode to native EFI mode. - - - Note: Note: Note: Note: Note: Note: Note: - - You most likely should not use this protocol! Find the EFI way to solve the - problem to make your code portable - - Note: Note: Note: Note: Note: Note: Note: - -Revision History - ---*/ - -#ifndef _EFI_LEGACY_BIOS_THUNK_H_ -#define _EFI_LEGACY_BIOS_THUNK_H_ - - -#define EFI_LEGACY_BIOS_THUNK_PROTOCOL_GUID \ - { \ - 0x4c51a7ba, 0x7195, 0x442d, 0x87, 0x92, 0xbe, 0xea, 0x6e, 0x2f, 0xf6, 0xec \ - } - -typedef struct _EFI_LEGACY_BIOS_THUNK_PROTOCOL EFI_LEGACY_BIOS_THUNK_PROTOCOL; - -typedef -BOOLEAN -(EFIAPI *EFI_LEGACY_BIOS_THUNK_INT86) ( - IN EFI_LEGACY_BIOS_THUNK_PROTOCOL * This, - IN UINT8 BiosInt, - IN OUT EFI_IA32_REGISTER_SET * Regs - ) -/*++ - - Routine Description: - Thunk to 16-bit real mode and execute a software interrupt with a vector - of BiosInt. Regs will contain the 16-bit register context on entry and - exit. - - Arguments: - This - Protocol instance pointer. - BiosInt - Processor interrupt vector to invoke - Reg - Register contexted passed into (and returned) from thunk to - 16-bit mode - - Returns: - FALSE - Thunk completed, and there were no BIOS errors in the target code. - See Regs for status. - TRUE - There was a BIOS erro in the target code. - ---*/ -; - -typedef -BOOLEAN -(EFIAPI *EFI_LEGACY_BIOS_THUNK_FARCALL86) ( - IN EFI_LEGACY_BIOS_THUNK_PROTOCOL * This, - IN UINT16 Segment, - IN UINT16 Offset, - IN EFI_IA32_REGISTER_SET * Regs, - IN VOID *Stack, - IN UINTN StackSize - ) -/*++ - - Routine Description: - Thunk to 16-bit real mode and call Segment:Offset. Regs will contain the - 16-bit register context on entry and exit. Arguments can be passed on - the Stack argument - - Arguments: - This - Protocol instance pointer. - Segment - Segemnt of 16-bit mode call - Offset - Offset of 16-bit mdoe call - Reg - Register contexted passed into (and returned) from thunk to - 16-bit mode - Stack - Caller allocated stack used to pass arguments - StackSize - Size of Stack in bytes - - Returns: - FALSE - Thunk completed, and there were no BIOS errors in the target code. - See Regs for status. - TRUE - There was a BIOS erro in the target code. - ---*/ -; - -struct _EFI_LEGACY_BIOS_THUNK_PROTOCOL { - EFI_LEGACY_BIOS_THUNK_INT86 Int86; - EFI_LEGACY_BIOS_THUNK_FARCALL86 FarCall86; -}; - -extern EFI_GUID gEfiLegacyBiosThunkProtocolGuid; - -#endif