From: vanjeff Date: Mon, 26 Mar 2007 07:00:30 +0000 (+0000) Subject: 1. Removed definition for EFI_1_1 from module ConSplitter X-Git-Tag: edk2-stable201903~23392 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=c0b162a2c0b5c60386230e00764d6820bd4c8f74 1. Removed definition for EFI_1_1 from module ConSplitter 2. Removed old Intel Framework specification extension for Media Firmware file path from Uefi/UefiSpec.h and UefiLib/UefiNotTiano.c 3. Added EFI revision check in UefiLib/UefiNotTiano.c and removed one EFI_SPECIFICATION_VERSION wrapper in Uefi/UefiSpec.h. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2505 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h index 54a1e57504..222e6b4c35 100644 --- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h +++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h @@ -2,13 +2,13 @@ Private data structures for the Console Splitter driver Copyright (c) 2006 - 2007 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. +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. **/ @@ -94,20 +94,11 @@ typedef struct { EFI_SIMPLE_TEXT_OUT_PROTOCOL TextOut; EFI_SIMPLE_TEXT_OUTPUT_MODE TextOutMode; -#if (EFI_SPECIFICATION_VERSION < 0x00020000) - EFI_UGA_DRAW_PROTOCOL UgaDraw; - UINT32 UgaHorizontalResolution; - UINT32 UgaVerticalResolution; - UINT32 UgaColorDepth; - UINT32 UgaRefreshRate; - EFI_UGA_PIXEL *UgaBlt; -#else EFI_GRAPHICS_OUTPUT_PROTOCOL GraphicsOutput; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *GraphicsOutputBlt; TEXT_OUT_GOP_MODE *GraphicsOutputModeBuffer; UINTN CurrentNumberOfGraphicsOutput; BOOLEAN HardwareNeedsStarting; -#endif EFI_CONSOLE_CONTROL_PROTOCOL ConsoleControl; @@ -626,52 +617,6 @@ DevNullGopSync ( ) ; -#if (EFI_SPECIFICATION_VERSION < 0x00020000) -EFI_STATUS -EFIAPI -ConSpliterUgaDrawGetMode ( - IN EFI_UGA_DRAW_PROTOCOL *This, - OUT UINT32 *HorizontalResolution, - OUT UINT32 *VerticalResolution, - OUT UINT32 *ColorDepth, - OUT UINT32 *RefreshRate - ) -; - -EFI_STATUS -EFIAPI -ConSpliterUgaDrawSetMode ( - IN EFI_UGA_DRAW_PROTOCOL *This, - IN UINT32 HorizontalResolution, - IN UINT32 VerticalResolution, - IN UINT32 ColorDepth, - IN UINT32 RefreshRate - ) -; - -EFI_STATUS -EFIAPI -ConSpliterUgaDrawBlt ( - IN EFI_UGA_DRAW_PROTOCOL *This, - IN EFI_UGA_PIXEL *BltBuffer, OPTIONAL - IN EFI_UGA_BLT_OPERATION BltOperation, - IN UINTN SourceX, - IN UINTN SourceY, - IN UINTN DestinationX, - IN UINTN DestinationY, - IN UINTN Width, - IN UINTN Height, - IN UINTN Delta OPTIONAL - ) -; - -EFI_STATUS -DevNullUgaSync ( - IN TEXT_OUT_SPLITTER_PRIVATE_DATA *Private, - IN EFI_UGA_DRAW_PROTOCOL *UgaDraw - ) -; -#endif EFI_STATUS DevNullTextOutOutputString ( diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h index 159d3b9e71..15b3ac22d2 100644 --- a/MdePkg/Include/Uefi/UefiSpec.h +++ b/MdePkg/Include/Uefi/UefiSpec.h @@ -1,21 +1,21 @@ /** @file Include file that supportes UEFI. - + This include file must only contain things defined in the UEFI 2.0 specification. If a code construct is defined in the UEFI 2.0 specification it must be included by this include file. - - Copyright (c) 2006, Intel Corporation + + Copyright (c) 2006 - 2007, 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: UefiSpec.h - + **/ #ifndef __UEFI_SPEC_H__ @@ -110,13 +110,13 @@ typedef struct _EFI_SYSTEM_TABLE EFI_SYSTEM_TABLE; /** Allocates memory pages from the system. - + @param Type The type of allocation to perform. @param MemoryType The type of memory to allocate. @param Pages The number of contiguous 4 KB pages to allocate. @param Memory Pointer to a physical address. On input, the way in which the address is - used depends on the value of Type. - + used depends on the value of Type. + @retval EFI_SUCCESS The requested pages were allocated. @retval EFI_INVALID_PARAMETER 1) Type is not AllocateAnyPages or AllocateMaxAddress or AllocateAddress. @@ -124,10 +124,10 @@ typedef struct _EFI_SYSTEM_TABLE EFI_SYSTEM_TABLE; EfiMaxMemoryType..0x7FFFFFFF. @retval EFI_OUT_OF_RESOURCES The pages could not be allocated. @retval EFI_NOT_FOUND The requested pages could not be found. - -**/ -typedef -EFI_STATUS + +**/ +typedef +EFI_STATUS (EFIAPI *EFI_ALLOCATE_PAGES) ( IN EFI_ALLOCATE_TYPE Type, IN EFI_MEMORY_TYPE MemoryType, @@ -137,16 +137,16 @@ EFI_STATUS /** Frees memory pages. - + @param Memory The base physical address of the pages to be freed. @param Pages The number of contiguous 4 KB pages to free. - + @retval EFI_SUCCESS The requested pages were freed. - @retval EFI_INVALID_PARAMETER Memory is not a page-aligned address or Pages is invalid. + @retval EFI_INVALID_PARAMETER Memory is not a page-aligned address or Pages is invalid. @retval EFI_NOT_FOUND The requested memory pages were not allocated with AllocatePages(). - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_FREE_PAGES) ( @@ -156,25 +156,25 @@ EFI_STATUS /** Returns the current memory map. - + @param MemoryMapSize A pointer to the size, in bytes, of the MemoryMap buffer. @param MemoryMap A pointer to the buffer in which firmware places the current memory map. @param MapKey A pointer to the location in which firmware returns the key for the - current memory map. + current memory map. @param DescriptorSize A pointer to the location in which firmware returns the size, in bytes, of - an individual EFI_MEMORY_DESCRIPTOR. + an individual EFI_MEMORY_DESCRIPTOR. @param DescriptorVersion A pointer to the location in which firmware returns the version number - associated with the EFI_MEMORY_DESCRIPTOR. - + associated with the EFI_MEMORY_DESCRIPTOR. + @retval EFI_SUCCESS The memory map was returned in the MemoryMap buffer. @retval EFI_BUFFER_TOO_SMALL The MemoryMap buffer was too small. The current buffer size needed to hold the memory map is returned in MemoryMapSize. @retval EFI_INVALID_PARAMETER 1) MemoryMapSize is NULL. 2) The MemoryMap buffer is not too small and MemoryMap is - NULL. - -**/ + NULL. + +**/ typedef EFI_STATUS (EFIAPI *EFI_GET_MEMORY_MAP) ( @@ -190,17 +190,17 @@ EFI_STATUS /** Allocates pool memory. - + @param PoolType The type of pool to allocate. - @param Size The number of bytes to allocate from the pool. + @param Size The number of bytes to allocate from the pool. @param Buffer A pointer to a pointer to the allocated buffer if the call succeeds; - undefined otherwise. - + undefined otherwise. + @retval EFI_SUCCESS The requested number of bytes was allocated. - @retval EFI_OUT_OF_RESOURCES The pool requested could not be allocated. - @retval EFI_INVALID_PARAMETER PoolType was invalid. - -**/ + @retval EFI_OUT_OF_RESOURCES The pool requested could not be allocated. + @retval EFI_INVALID_PARAMETER PoolType was invalid. + +**/ typedef EFI_STATUS (EFIAPI *EFI_ALLOCATE_POOL) ( @@ -211,13 +211,13 @@ EFI_STATUS /** Returns pool memory to the system. - - @param Buffer Pointer to the buffer to free. - - @retval EFI_SUCCESS The memory was returned to the system. + + @param Buffer Pointer to the buffer to free. + + @retval EFI_SUCCESS The memory was returned to the system. @retval EFI_INVALID_PARAMETER Buffer was invalid. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_FREE_POOL) ( @@ -226,23 +226,23 @@ EFI_STATUS /** Changes the runtime addressing mode of EFI firmware from physical to virtual. - + @param MemoryMapSize The size in bytes of VirtualMap. @param DescriptorSize The size in bytes of an entry in the VirtualMap. @param DescriptorVersion The version of the structure entries in VirtualMap. @param VirtualMap An array of memory descriptors which contain new virtual address mapping information for all runtime ranges. - + @retval EFI_SUCCESS The virtual address map has been applied. @retval EFI_UNSUPPORTED EFI firmware is not at runtime, or the EFI firmware is already in - virtual address mapped mode. - @retval EFI_INVALID_PARAMETER DescriptorSize or DescriptorVersion is invalid. + virtual address mapped mode. + @retval EFI_INVALID_PARAMETER DescriptorSize or DescriptorVersion is invalid. @retval EFI_NO_MAPPING A virtual address was not supplied for a range in the memory - map that requires a mapping. + map that requires a mapping. @retval EFI_NOT_FOUND A virtual address was supplied for an address that is not found - in the memory map. - -**/ + in the memory map. + +**/ typedef EFI_STATUS (EFIAPI *EFI_SET_VIRTUAL_ADDRESS_MAP) ( @@ -254,27 +254,27 @@ EFI_STATUS /** Connects one or more drivers to a controller. - + @param ControllerHandle The handle of the controller to which driver(s) are to be connected. @param DriverImageHandle A pointer to an ordered list handles that support the - EFI_DRIVER_BINDING_PROTOCOL. + EFI_DRIVER_BINDING_PROTOCOL. @param RemainingDevicePath A pointer to the device path that specifies a child of the - controller specified by ControllerHandle. - @param Recursive If TRUE, then ConnectController() is called recursively + controller specified by ControllerHandle. + @param Recursive If TRUE, then ConnectController() is called recursively until the entire tree of controllers below the controller specified - by ControllerHandle have been created. If FALSE, then - the tree of controllers is only expanded one level. - + by ControllerHandle have been created. If FALSE, then + the tree of controllers is only expanded one level. + @retval EFI_SUCCESS 1) One or more drivers were connected to ControllerHandle. - 2) No drivers were connected to ControllerHandle, but + 2) No drivers were connected to ControllerHandle, but RemainingDevicePath is not NULL, and it is an End Device - Path Node. - @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE. + Path Node. + @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE. @retval EFI_NOT_FOUND 1) There are no EFI_DRIVER_BINDING_PROTOCOL instances - present in the system. + present in the system. 2) No drivers were connected to ControllerHandle. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_CONNECT_CONTROLLER) ( @@ -286,22 +286,22 @@ EFI_STATUS /** Disconnects one or more drivers from a controller. - + @param ControllerHandle The handle of the controller from which driver(s) are to be disconnected. - @param DriverImageHandle The driver to disconnect from ControllerHandle. - @param ChildHandle The handle of the child to destroy. - + @param DriverImageHandle The driver to disconnect from ControllerHandle. + @param ChildHandle The handle of the child to destroy. + @retval EFI_SUCCESS 1) One or more drivers were disconnected from the controller. 2) On entry, no drivers are managing ControllerHandle. 3) DriverImageHandle is not NULL, and on entry DriverImageHandle is not managing ControllerHandle. - + @retval EFI_INVALID_PARAMETER One ore more parameters are invalid. @retval EFI_OUT_OF_RESOURCES There are not enough resources available to disconnect any drivers from - ControllerHandle. - @retval EFI_DEVICE_ERROR The controller could not be disconnected because of a device error. - -**/ + ControllerHandle. + @retval EFI_DEVICE_ERROR The controller could not be disconnected because of a device error. + +**/ typedef EFI_STATUS (EFIAPI *EFI_DISCONNECT_CONTROLLER) ( @@ -318,19 +318,19 @@ EFI_STATUS /** Determines the new virtual address that is to be used on subsequent memory accesses. - + @param DebugDisposition Supplies type information for the pointer being converted. @param Address A pointer to a pointer that is to be fixed to be the value needed - for the new virtual address mappings being applied. - - @retval EFI_SUCCESS The pointer pointed to by Address was modified. + for the new virtual address mappings being applied. + + @retval EFI_SUCCESS The pointer pointed to by Address was modified. @retval EFI_INVALID_PARAMETER 1) Address is NULL. 2) *Address is NULL and DebugDisposition does - not have the EFI_OPTIONAL_PTR bit set. + not have the EFI_OPTIONAL_PTR bit set. @retval EFI_NOT_FOUND The pointer pointed to by Address was not found to be part - of the current memory map. This is normally fatal. - -**/ + of the current memory map. This is normally fatal. + +**/ typedef EFI_STATUS (EFIAPI *EFI_CONVERT_POINTER) ( @@ -351,7 +351,6 @@ EFI_STATUS #define EVENT_SIGNAL_EXIT_BOOT_SERVICES 0x00000201 #define EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202 -#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000)) // // Prior to UEFI 2.0 Tiano extended these enums. This was replaced by // CreateEventEx() Event Groups in UEFI 2.0 @@ -361,7 +360,6 @@ EFI_STATUS #define EFI_EVENT_SIGNAL_READY_TO_BOOT 0x00000203 #define EFI_EVENT_SIGNAL_LEGACY_BOOT 0x00000204 -#endif // // EFI Event Types (name following coding style) @@ -377,14 +375,14 @@ EFI_STATUS #define EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE -/** +/** Invoke a notification event - + @param Event Event whose notification function is being invoked. - @param Context Pointer to the notification function's context, - which is implementation-dependent. - -**/ + @param Context Pointer to the notification function's context, + which is implementation-dependent. + +**/ typedef VOID (EFIAPI *EFI_EVENT_NOTIFY) ( @@ -392,22 +390,22 @@ VOID IN VOID *Context ); -/** +/** Creates an event. - + @param Type The type of event to create and its mode and attributes. @param NotifyTpl Pointer to the notification function's context. - @param NotifyFunction Pointer to the event's notification function, if any. + @param NotifyFunction Pointer to the event's notification function, if any. @param NotifyContext Pointer to the notification function's context; corresponds to parameter - Context in the notification function. - @param Event Pointer to the newly created event if the call succeeds; undefined - otherwise. + Context in the notification function. + @param Event Pointer to the newly created event if the call succeeds; undefined + otherwise. - @retval EFI_SUCCESS The event structure was created. + @retval EFI_SUCCESS The event structure was created. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. @retval EFI_OUT_OF_RESOURCES The event could not be allocated. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_CREATE_EVENT) ( @@ -418,23 +416,23 @@ EFI_STATUS OUT EFI_EVENT *Event ); -/** +/** Creates an event in a group. - + @param Type The type of event to create and its mode and attributes. @param NotifyTpl Pointer to the notification function's context. - @param NotifyFunction Pointer to the event's notification function, if any. + @param NotifyFunction Pointer to the event's notification function, if any. @param NotifyContext Pointer to the notification function's context; corresponds to parameter - Context in the notification function. - @param EventGroup Pointer to the unique identifier of the group to which this event belongs. - @param Event Pointer to the newly created event if the call succeeds; undefined - otherwise. + Context in the notification function. + @param EventGroup Pointer to the unique identifier of the group to which this event belongs. + @param Event Pointer to the newly created event if the call succeeds; undefined + otherwise. - @retval EFI_SUCCESS The event structure was created. + @retval EFI_SUCCESS The event structure was created. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. @retval EFI_OUT_OF_RESOURCES The event could not be allocated. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_CREATE_EVENT_EX) ( @@ -452,17 +450,17 @@ typedef enum { TimerRelative } EFI_TIMER_DELAY; -/** +/** Sets the type of timer and the trigger time for a timer event. - + @param Event The timer event that is to be signaled at the specified time. @param Type The type of time that is specified in TriggerTime. - @param TriggerTime The number of 100ns units until the timer expires. + @param TriggerTime The number of 100ns units until the timer expires. - @retval EFI_SUCCESS The event has been set to be signaled at the requested time. + @retval EFI_SUCCESS The event has been set to be signaled at the requested time. @retval EFI_INVALID_PARAMETER Event or Type is not valid. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_SET_TIMER) ( @@ -471,23 +469,23 @@ EFI_STATUS IN UINT64 TriggerTime ); -/** +/** Signals an event. - + @param Event The event to signal. - @retval EFI_SUCCESS The event has been signaled. - -**/ + @retval EFI_SUCCESS The event has been signaled. + +**/ typedef EFI_STATUS (EFIAPI *EFI_SIGNAL_EVENT) ( IN EFI_EVENT Event ); -/** +/** Stops execution until an event is signaled. - + @param NumberOfEvents The number of events in the Event array. @param Event An array of EFI_EVENT. @param Index Pointer to the index of the event which satisfied the wait condition. @@ -495,10 +493,10 @@ EFI_STATUS @retval EFI_SUCCESS The event indicated by Index was signaled. @retval EFI_INVALID_PARAMETER 1) NumberOfEvents is 0. 2) The event indicated by Index is of type - EVT_NOTIFY_SIGNAL. - @retval EFI_UNSUPPORTED The current TPL is not TPL_APPLICATION. - -**/ + EVT_NOTIFY_SIGNAL. + @retval EFI_UNSUPPORTED The current TPL is not TPL_APPLICATION. + +**/ typedef EFI_STATUS (EFIAPI *EFI_WAIT_FOR_EVENT) ( @@ -507,30 +505,30 @@ EFI_STATUS OUT UINTN *Index ); -/** +/** Closes an event. - + @param Event The event to close. - @retval EFI_SUCCESS The event has been closed. - -**/ + @retval EFI_SUCCESS The event has been closed. + +**/ typedef EFI_STATUS (EFIAPI *EFI_CLOSE_EVENT) ( IN EFI_EVENT Event ); -/** +/** Checks whether an event is in the signaled state. - + @param Event The event to check. @retval EFI_SUCCESS The event is in the signaled state. @retval EFI_NOT_READY The event is not in the signaled state. @retval EFI_INVALID_PARAMETER Event is of type EVT_NOTIFY_SIGNAL. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_CHECK_EVENT) ( @@ -553,26 +551,26 @@ EFI_STATUS #define EFI_TPL_NOTIFY TPL_NOTIFY #define EFI_TPL_HIGH_LEVEL TPL_HIGH_LEVEL -/** +/** Raises a task's priority level and returns its previous level. - + @param NewTpl The new task priority level. - - @retval Previous task priority level - -**/ + + @retval Previous task priority level + +**/ typedef EFI_TPL (EFIAPI *EFI_RAISE_TPL) ( IN EFI_TPL NewTpl ); -/** +/** Restores a task's priority level to its previous value. - - @param OldTpl The previous task priority level to restore - -**/ + + @param OldTpl The previous task priority level to restore + +**/ typedef VOID (EFIAPI *EFI_RESTORE_TPL) ( @@ -586,25 +584,25 @@ VOID #define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 #define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 -/** +/** Returns the value of a variable. - + @param VariableName A Null-terminated Unicode string that is the name of the - vendor's variable. - @param VendorGuid A unique identifier for the vendor. + vendor's variable. + @param VendorGuid A unique identifier for the vendor. @param Attributes If not NULL, a pointer to the memory location to return the - attributes bitmask for the variable. + attributes bitmask for the variable. @param DataSize On input, the size in bytes of the return Data buffer. - On output the size of data returned in Data. - @param Data The buffer to return the contents of the variable. - + On output the size of data returned in Data. + @param Data The buffer to return the contents of the variable. + @retval EFI_SUCCESS The function completed successfully. @retval EFI_NOT_FOUND The variable was not found. @retval EFI_BUFFER_TOO_SMALL The DataSize is too small for the result. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. @retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_GET_VARIABLE) ( @@ -615,24 +613,24 @@ EFI_STATUS OUT VOID *Data ); -/** +/** Enumerates the current variable names. - + @param VariableNameSize The size of the VariableName buffer. - @param VariableName On input, supplies the last VariableName that was returned + @param VariableName On input, supplies the last VariableName that was returned by GetNextVariableName(). On output, returns the Nullterminated - Unicode string of the current variable. + Unicode string of the current variable. @param VendorGuid On input, supplies the last VendorGuid that was returned by - GetNextVariableName(). On output, returns the - VendorGuid of the current variable. - + GetNextVariableName(). On output, returns the + VendorGuid of the current variable. + @retval EFI_SUCCESS The function completed successfully. @retval EFI_NOT_FOUND The next variable was not found. @retval EFI_BUFFER_TOO_SMALL The VariableNameSize is too small for the result. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. @retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_GET_NEXT_VARIABLE_NAME) ( @@ -641,24 +639,24 @@ EFI_STATUS IN OUT EFI_GUID *VendorGuid ); -/** +/** Sets the value of a variable. - + @param VariableName A Null-terminated Unicode string that is the name of the - vendor's variable. - @param VendorGuid A unique identifier for the vendor. - @param Attributes Attributes bitmask to set for the variable. + vendor's variable. + @param VendorGuid A unique identifier for the vendor. + @param Attributes Attributes bitmask to set for the variable. @param DataSize The size in bytes of the Data buffer. @param Data The contents for the variable. - + @retval EFI_SUCCESS The firmware has successfully stored the variable and its data as - defined by the Attributes. + defined by the Attributes. @retval EFI_WRITE_PROTECTED The variable in question is read-only. @retval EFI_OUT_OF_RESOURCES Not enough storage is available to hold the variable and its data. - @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - @retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error. - -**/ + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + @retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error. + +**/ typedef EFI_STATUS (EFIAPI *EFI_SET_VARIABLE) ( @@ -678,19 +676,19 @@ typedef struct { BOOLEAN SetsToZero; } EFI_TIME_CAPABILITIES; -/** - Returns the current time and date information, and the time-keeping capabilities +/** + Returns the current time and date information, and the time-keeping capabilities of the hardware platform. - - @param Time A pointer to storage to receive a snapshot of the current time. - @param Capabilities An optional pointer to a buffer to receive the real time clock - device's capabilities. - - @retval EFI_SUCCESS The operation completed successfully. + + @param Time A pointer to storage to receive a snapshot of the current time. + @param Capabilities An optional pointer to a buffer to receive the real time clock + device's capabilities. + + @retval EFI_SUCCESS The operation completed successfully. @retval EFI_INVALID_PARAMETER Time is NULL. @retval EFI_DEVICE_ERROR The time could not be retrieved due to hardware error. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_GET_TIME) ( @@ -698,34 +696,34 @@ EFI_STATUS OUT EFI_TIME_CAPABILITIES *Capabilities OPTIONAL ); -/** +/** Sets the current local time and date information. - + @param Time A pointer to the current time. - - @retval EFI_SUCCESS The operation completed successfully. + + @retval EFI_SUCCESS The operation completed successfully. @retval EFI_INVALID_PARAMETER A time field is out of range. @retval EFI_DEVICE_ERROR The time could not be set due due to hardware error. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_SET_TIME) ( IN EFI_TIME *Time ); - -/** + +/** Returns the current wakeup alarm clock setting. - + @param Enabled Indicates if the alarm is currently enabled or disabled. - @param Pending Indicates if the alarm signal is pending and requires acknowledgement. + @param Pending Indicates if the alarm signal is pending and requires acknowledgement. @param Time The current alarm setting. - + @retval EFI_SUCCESS The alarm settings were returned. @retval EFI_INVALID_PARAMETER Any parameter is NULL. @retval EFI_DEVICE_ERROR The wakeup time could not be retrieved due to a hardware error. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_GET_WAKEUP_TIME) ( @@ -734,19 +732,19 @@ EFI_STATUS OUT EFI_TIME *Time ); -/** +/** Sets the system wakeup alarm clock time. - - @param Enabled Enable or disable the wakeup alarm. + + @param Enabled Enable or disable the wakeup alarm. @param Time If Enable is TRUE, the time to set the wakeup alarm for. - + @retval EFI_SUCCESS If Enable is TRUE, then the wakeup alarm was enabled. If - Enable is FALSE, then the wakeup alarm was disabled. + Enable is FALSE, then the wakeup alarm was disabled. @retval EFI_INVALID_PARAMETER A time field is out of range. @retval EFI_DEVICE_ERROR The wakeup time could not be set due to a hardware error. @retval EFI_UNSUPPORTED A wakeup timer is not supported on this platform. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_SET_WAKEUP_TIME) ( @@ -754,16 +752,16 @@ EFI_STATUS IN EFI_TIME *Time OPTIONAL ); -/** +/** This is the declaration of an EFI image entry point. This can be the entry point to an application - written to this specification, an EFI boot service driver, or an EFI runtime driver. - + written to this specification, an EFI boot service driver, or an EFI runtime driver. + @param ImageHandle Handle that identifies the loaded image. @param SystemTable System Table for this image. - - @retval EFI_SUCCESS The operation completed successfully. - -**/ + + @retval EFI_SUCCESS The operation completed successfully. + +**/ typedef EFI_STATUS (EFIAPI *EFI_IMAGE_ENTRY_POINT) ( @@ -771,32 +769,32 @@ EFI_STATUS IN EFI_SYSTEM_TABLE *SystemTable ); -/** +/** Loads an EFI image into memory. - + @param BootPolicy If TRUE, indicates that the request originates from the boot - manager, and that the boot manager is attempting to load - FilePath as a boot selection. Ignored if SourceBuffer is - not NULL. + manager, and that the boot manager is attempting to load + FilePath as a boot selection. Ignored if SourceBuffer is + not NULL. @param ParentImageHandle The caller's image handle. @param FilePath The DeviceHandle specific file path from which the image is - loaded. + loaded. @param SourceBuffer If not NULL, a pointer to the memory location containing a copy - of the image to be loaded. - @param SourceSize The size in bytes of SourceBuffer. + of the image to be loaded. + @param SourceSize The size in bytes of SourceBuffer. @param ImageHandle Pointer to the returned image handle that is created when the - image is successfully loaded. - + image is successfully loaded. + @retval EFI_SUCCESS Image was loaded into memory correctly. @retval EFI_NOT_FOUND Both SourceBuffer and FilePath are NULL. @retval EFI_INVALID_PARAMETER One or more parametes are invalid. @retval EFI_UNSUPPORTED The image type is not supported. @retval EFI_OUT_OF_RESOURCES Image was not loaded due to insufficient resources. @retval EFI_LOAD_ERROR Image was not loaded because the image format was corrupt or not - understood. - @retval EFI_DEVICE_ERROR Image was not loaded because the device returned a read error. - -**/ + understood. + @retval EFI_DEVICE_ERROR Image was not loaded because the device returned a read error. + +**/ typedef EFI_STATUS (EFIAPI *EFI_IMAGE_LOAD) ( @@ -808,19 +806,19 @@ EFI_STATUS OUT EFI_HANDLE *ImageHandle ); -/** +/** Transfers control to a loaded image's entry point. - - @param ImageHandle Handle of image to be started. + + @param ImageHandle Handle of image to be started. @param ExitDataSize Pointer to the size, in bytes, of ExitData. @param ExitData Pointer to a pointer to a data buffer that includes a Null-terminated - Unicode string, optionally followed by additional binary data. - + Unicode string, optionally followed by additional binary data. + @retval EFI_INVALID_PARAMETER ImageHandle is either an invalid image handle or the image has already been initialized with StartImage @retval Exit code from image Exit code from image - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_IMAGE_START) ( @@ -829,21 +827,21 @@ EFI_STATUS OUT CHAR16 **ExitData OPTIONAL ); -/** +/** Terminates a loaded EFI image and returns control to boot services. - + @param ImageHandle Handle that identifies the image. @param ExitStatus The image's exit code. @param ExitDataSize The size, in bytes, of ExitData. - @param ExitData Pointer to a data buffer that includes a Null-terminated Unicode string, - optionally followed by additional binary data. - - @retval EFI_SUCCESS The image specified by ImageHandle was unloaded. + @param ExitData Pointer to a data buffer that includes a Null-terminated Unicode string, + optionally followed by additional binary data. + + @retval EFI_SUCCESS The image specified by ImageHandle was unloaded. @retval EFI_INVALID_PARAMETER The image specified by ImageHandle has been loaded and - started with LoadImage() and StartImage(), but the - image is not the currently executing image. - -**/ + started with LoadImage() and StartImage(), but the + image is not the currently executing image. + +**/ typedef EFI_STATUS (EFIAPI *EFI_EXIT) ( @@ -853,33 +851,33 @@ EFI_STATUS IN CHAR16 *ExitData OPTIONAL ); -/** +/** Unloads an image. - + @param ImageHandle Handle that identifies the image to be unloaded. - + @retval EFI_SUCCESS The image has been unloaded. @retval EFI_INVALID_PARAMETER ImageHandle is not a valid image handle. @retval EFI_UNSUPPORTED The image has been started, and does not support unload. - @retval Exit code from the image's unload handler - -**/ + @retval Exit code from the image's unload handler + +**/ typedef EFI_STATUS (EFIAPI *EFI_IMAGE_UNLOAD) ( IN EFI_HANDLE ImageHandle ); -/** +/** Terminates all boot services. - + @param ImageHandle Handle that identifies the exiting image. @param MapKey Key to the latest memory map. - + @retval EFI_SUCCESS Boot services have been terminated. - @retval EFI_INVALID_PARAMETER MapKey is incorrect. - -**/ + @retval EFI_INVALID_PARAMETER MapKey is incorrect. + +**/ typedef EFI_STATUS (EFIAPI *EFI_EXIT_BOOT_SERVICES) ( @@ -887,37 +885,37 @@ EFI_STATUS IN UINTN MapKey ); -/** +/** Induces a fine-grained stall. - - @param Microseconds The number of microseconds to stall execution. - + + @param Microseconds The number of microseconds to stall execution. + @retval EFI_SUCCESS Execution was stalled at least the requested number of - Microseconds. - -**/ + Microseconds. + +**/ typedef EFI_STATUS (EFIAPI *EFI_STALL) ( IN UINTN Microseconds ); -/** +/** Sets the system's watchdog timer. - + @param Timeout The number of seconds to set the watchdog timer to. @param WatchdogCode The numeric code to log on a watchdog timer timeout event. @param DataSize The size, in bytes, of WatchdogData. @param WatchdogData A data buffer that includes a Null-terminated Unicode string, optionally - followed by additional binary data. - + followed by additional binary data. + @retval EFI_SUCCESS The timeout has been set. - @retval EFI_INVALID_PARAMETER The supplied WatchdogCode is invalid. + @retval EFI_INVALID_PARAMETER The supplied WatchdogCode is invalid. @retval EFI_UNSUPPORTED The system does not have a watchdog timer. @retval EFI_DEVICE_ERROR The watch dog timer could not be programmed due to a hardware - error. - -**/ + error. + +**/ typedef EFI_STATUS (EFIAPI *EFI_SET_WATCHDOG_TIMER) ( @@ -939,17 +937,17 @@ typedef enum { #endif } EFI_RESET_TYPE; -/** +/** Resets the entire platform. - + @param ResetType The type of reset to perform. @param ResetStatus The status code for the reset. @param DataSize The size, in bytes, of WatchdogData. - @param ResetData For a ResetType of EfiResetCold, EfiResetWarm, or + @param ResetData For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown the data buffer starts with a Null-terminated Unicode string, optionally followed by additional binary data. -**/ +**/ typedef VOID (EFIAPI *EFI_RESET_SYSTEM) ( @@ -959,51 +957,51 @@ VOID IN CHAR16 *ResetData OPTIONAL ); -/** +/** Returns a monotonically increasing count for the platform. - + @param Count Pointer to returned value. - + @retval EFI_SUCCESS The next monotonic count was returned. - @retval EFI_INVALID_PARAMETER Count is NULL. - @retval EFI_DEVICE_ERROR The device is not functioning properly. - -**/ + @retval EFI_INVALID_PARAMETER Count is NULL. + @retval EFI_DEVICE_ERROR The device is not functioning properly. + +**/ typedef EFI_STATUS (EFIAPI *EFI_GET_NEXT_MONOTONIC_COUNT) ( OUT UINT64 *Count ); -/** +/** Returns the next high 32 bits of the platform's monotonic counter. - + @param HighCount Pointer to returned value. - + @retval EFI_SUCCESS The next high monotonic count was returned. - @retval EFI_INVALID_PARAMETER HighCount is NULL. - @retval EFI_DEVICE_ERROR The device is not functioning properly. - -**/ + @retval EFI_INVALID_PARAMETER HighCount is NULL. + @retval EFI_DEVICE_ERROR The device is not functioning properly. + +**/ typedef EFI_STATUS (EFIAPI *EFI_GET_NEXT_HIGH_MONO_COUNT) ( OUT UINT32 *HighCount ); -/** +/** Computes and returns a 32-bit CRC for a data buffer. - + @param Data A pointer to the buffer on which the 32-bit CRC is to be computed. @param DataSize The number of bytes in the buffer Data. @param Crc32 The 32-bit CRC that was computed for the data buffer specified by Data and DataSize. - + @retval EFI_SUCCESS The 32-bit CRC was computed for the data buffer and returned in - Crc32. - @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - -**/ + Crc32. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + +**/ typedef EFI_STATUS (EFIAPI *EFI_CALCULATE_CRC32) ( @@ -1012,14 +1010,14 @@ EFI_STATUS OUT UINT32 *Crc32 ); -/** +/** Copies the contents of one buffer to another buffer. - + @param Destination Pointer to the destination buffer of the memory copy. @param Source Pointer to the source buffer of the memory copy. - @param Length Number of bytes to copy from Source to Destination. - -**/ + @param Length Number of bytes to copy from Source to Destination. + +**/ typedef VOID (EFIAPI *EFI_COPY_MEM) ( @@ -1028,14 +1026,14 @@ VOID IN UINTN Length ); -/** +/** The SetMem() function fills a buffer with a specified value. - + @param Buffer Pointer to the buffer to fill. @param Size Number of bytes in Buffer to fill. @param Value Value to fill Buffer with. - -**/ + +**/ typedef VOID (EFIAPI *EFI_SET_MEM) ( @@ -1051,23 +1049,23 @@ typedef enum { EFI_NATIVE_INTERFACE } EFI_INTERFACE_TYPE; -/** +/** Installs a protocol interface on a device handle. If the handle does not exist, it is created and added - to the list of handles in the system. InstallMultipleProtocolInterfaces() performs - more error checking than InstallProtocolInterface(), so it is recommended that - InstallMultipleProtocolInterfaces() be used in place of - InstallProtocolInterface() - + to the list of handles in the system. InstallMultipleProtocolInterfaces() performs + more error checking than InstallProtocolInterface(), so it is recommended that + InstallMultipleProtocolInterfaces() be used in place of + InstallProtocolInterface() + @param Handle A pointer to the EFI_HANDLE on which the interface is to be installed. @param Protocol The numeric ID of the protocol interface. - @param InterfaceType Indicates whether Interface is supplied in native form. + @param InterfaceType Indicates whether Interface is supplied in native form. @param Interface A pointer to the protocol interface. - + @retval EFI_SUCCESS The protocol interface was installed. - @retval EFI_OUT_OF_RESOURCES Space for a new handle could not be allocated. - @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - -**/ + @retval EFI_OUT_OF_RESOURCES Space for a new handle could not be allocated. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + +**/ typedef EFI_STATUS (EFIAPI *EFI_INSTALL_PROTOCOL_INTERFACE) ( @@ -1077,20 +1075,20 @@ EFI_STATUS IN VOID *Interface ); -/** +/** Installs one or more protocol interfaces into the boot services environment. - + @param Handle The handle to install the new protocol interfaces on, or NULL if a new - handle is to be allocated. + handle is to be allocated. @param ... A variable argument list containing pairs of protocol GUIDs and protocol - interfaces. + interfaces. @retval EFI_SUCCESS All the protocol interface was installed. @retval EFI_OUT_OF_RESOURCES There was not enough memory in pool to install all the protocols. @retval EFI_ALREADY_STARTED A Device Path Protocol instance was passed in that is already present in the handle database. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES) ( @@ -1098,23 +1096,23 @@ EFI_STATUS ... ); -/** +/** Reinstalls a protocol interface on a device handle. - - @param Handle Handle on which the interface is to be reinstalled. + + @param Handle Handle on which the interface is to be reinstalled. @param Protocol The numeric ID of the interface. @param OldInterface A pointer to the old interface. NULL can be used if a structure is not - associated with Protocol. - @param NewInterface A pointer to the new interface. - + associated with Protocol. + @param NewInterface A pointer to the new interface. + @retval EFI_SUCCESS The protocol interface was reinstalled. @retval EFI_NOT_FOUND The OldInterface on the handle was not found. @retval EFI_ACCESS_DENIED The protocol interface could not be reinstalled, - because OldInterface is still being used by a - driver that will not release it. - @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - -**/ + because OldInterface is still being used by a + driver that will not release it. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + +**/ typedef EFI_STATUS (EFIAPI *EFI_REINSTALL_PROTOCOL_INTERFACE) ( @@ -1124,22 +1122,22 @@ EFI_STATUS IN VOID *NewInterface ); -/** +/** Removes a protocol interface from a device handle. It is recommended that - UninstallMultipleProtocolInterfaces() be used in place of - UninstallProtocolInterface(). - + UninstallMultipleProtocolInterfaces() be used in place of + UninstallProtocolInterface(). + @param Handle The handle on which the interface was installed. @param Protocol The numeric ID of the interface. - @param Interface A pointer to the interface. - + @param Interface A pointer to the interface. + @retval EFI_SUCCESS The interface was removed. @retval EFI_NOT_FOUND The interface was not found. @retval EFI_ACCESS_DENIED The interface was not removed because the interface - is still being used by a driver. - @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - -**/ + is still being used by a driver. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + +**/ typedef EFI_STATUS (EFIAPI *EFI_UNINSTALL_PROTOCOL_INTERFACE) ( @@ -1148,17 +1146,17 @@ EFI_STATUS IN VOID *Interface ); -/** - Removes one or more protocol interfaces into the boot services environment. - - @param Handle The handle to remove the protocol interfaces from. +/** + Removes one or more protocol interfaces into the boot services environment. + + @param Handle The handle to remove the protocol interfaces from. @param ... A variable argument list containing pairs of protocol GUIDs and protocol interfaces. - - @retval EFI_SUCCESS All the protocol interfaces were removed. - @retval EFI_INVALID_PARAMETER One of the protocol interfaces was not previously installed on Handle. - -**/ + + @retval EFI_SUCCESS All the protocol interfaces were removed. + @retval EFI_INVALID_PARAMETER One of the protocol interfaces was not previously installed on Handle. + +**/ typedef EFI_STATUS (EFIAPI *EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES) ( @@ -1166,18 +1164,18 @@ EFI_STATUS ... ); -/** +/** Queries a handle to determine if it supports a specified protocol. - + @param Handle The handle being queried. @param Protocol The published unique identifier of the protocol. @param Interface Supplies the address where a pointer to the corresponding Protocol - Interface is returned. + Interface is returned. @retval EFI_SUCCESS The interface information for the specified protocol was returned. @retval EFI_UNSUPPORTED The device does not support the specified protocol. - @retval EFI_INVALID_PARAMETER One of the protocol interfaces was not previously installed on Handle. - -**/ + @retval EFI_INVALID_PARAMETER One of the protocol interfaces was not previously installed on Handle. + +**/ typedef EFI_STATUS (EFIAPI *EFI_HANDLE_PROTOCOL) ( @@ -1193,33 +1191,33 @@ EFI_STATUS #define EFI_OPEN_PROTOCOL_BY_DRIVER 0x00000010 #define EFI_OPEN_PROTOCOL_EXCLUSIVE 0x00000020 -/** +/** Queries a handle to determine if it supports a specified protocol. If the protocol is supported by the handle, it opens the protocol on behalf of the calling agent. - + @param Handle The handle for the protocol interface that is being opened. @param Protocol The published unique identifier of the protocol. @param Interface Supplies the address where a pointer to the corresponding Protocol - Interface is returned. + Interface is returned. @param AgentHandle The handle of the agent that is opening the protocol interface - specified by Protocol and Interface. - @param ControllerHandle If the agent that is opening a protocol is a driver that follows the - UEFI Driver Model, then this parameter is the controller handle - that requires the protocol interface. If the agent does not follow - the UEFI Driver Model, then this parameter is optional and may - be NULL. - @param Attributes The open mode of the protocol interface specified by Handle - and Protocol. - + specified by Protocol and Interface. + @param ControllerHandle If the agent that is opening a protocol is a driver that follows the + UEFI Driver Model, then this parameter is the controller handle + that requires the protocol interface. If the agent does not follow + the UEFI Driver Model, then this parameter is optional and may + be NULL. + @param Attributes The open mode of the protocol interface specified by Handle + and Protocol. + @retval EFI_SUCCESS An item was added to the open list for the protocol interface, and the - protocol interface was returned in Interface. + protocol interface was returned in Interface. @retval EFI_UNSUPPORTED Handle does not support Protocol. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. @retval EFI_ACCESS_DENIED Required attributes can't be supported in current environment. @retval EFI_ALREADY_STARTED Item on the open list already has requierd attributes whose agent - handle is the same as AgentHandle. - -**/ + handle is the same as AgentHandle. + +**/ typedef EFI_STATUS (EFIAPI *EFI_OPEN_PROTOCOL) ( @@ -1231,27 +1229,27 @@ EFI_STATUS IN UINT32 Attributes ); - -/** + +/** Closes a protocol on a handle that was opened using OpenProtocol(). - + @param Handle The handle for the protocol interface that was previously opened - with OpenProtocol(), and is now being closed. + with OpenProtocol(), and is now being closed. @param Protocol The published unique identifier of the protocol. @param Interface Supplies the address where a pointer to the corresponding Protocol - Interface is returned. - @param AgentHandle The handle of the agent that is closing the protocol interface. + Interface is returned. + @param AgentHandle The handle of the agent that is closing the protocol interface. @param ControllerHandle If the agent that opened a protocol is a driver that follows the - UEFI Driver Model, then this parameter is the controller handle - that required the protocol interface. - - @retval EFI_SUCCESS The protocol instance was closed. - @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + UEFI Driver Model, then this parameter is the controller handle + that required the protocol interface. + + @retval EFI_SUCCESS The protocol instance was closed. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. @retval EFI_NOT_FOUND 1) Handle does not support the protocol specified by Protocol. 2) The protocol interface specified by Handle and Protocol is not - currently open by AgentHandle and ControllerHandle. - -**/ + currently open by AgentHandle and ControllerHandle. + +**/ typedef EFI_STATUS (EFIAPI *EFI_CLOSE_PROTOCOL) ( @@ -1268,21 +1266,21 @@ typedef struct { UINT32 OpenCount; } EFI_OPEN_PROTOCOL_INFORMATION_ENTRY; -/** +/** Retrieves the list of agents that currently have a protocol interface opened. - - @param Handle The handle for the protocol interface that is being queried. + + @param Handle The handle for the protocol interface that is being queried. @param Protocol The published unique identifier of the protocol. @param EntryBuffer A pointer to a buffer of open protocol information in the form of - EFI_OPEN_PROTOCOL_INFORMATION_ENTRY structures. + EFI_OPEN_PROTOCOL_INFORMATION_ENTRY structures. @param EntryCount A pointer to the number of entries in EntryBuffer. - + @retval EFI_SUCCESS The open protocol information was returned in EntryBuffer, and the - number of entries was returned EntryCount. + number of entries was returned EntryCount. @retval EFI_OUT_OF_RESOURCES There are not enough resources available to allocate EntryBuffer. @retval EFI_NOT_FOUND Handle does not support the protocol specified by Protocol. - -**/ + +**/ typedef EFI_STATUS (EFIAPI *EFI_OPEN_PROTOCOL_INFORMATION) ( @@ -1292,23 +1290,23 @@ EFI_STATUS OUT UINTN *EntryCount ); -/** +/** Retrieves the list of protocol interface GUIDs that are installed on a handle in a buffer allocated - from pool. - + from pool. + @param Handle The handle from which to retrieve the list of protocol interface - GUIDs. + GUIDs. @param ProtocolBuffer A pointer to the list of protocol interface GUID pointers that are - installed on Handle. - @param ProtocolBufferCount A pointer to the number of GUID pointers present in - ProtocolBuffer. - + installed on Handle. + @param ProtocolBufferCount A pointer to the number of GUID pointers present in + ProtocolBuffer. + @retval EFI_SUCCESS The list of protocol interface GUIDs installed on Handle was returned in - ProtocolBuffer. The number of protocol interface GUIDs was - returned in ProtocolBufferCount. + ProtocolBuffer. The number of protocol interface GUIDs was + returned in ProtocolBufferCount. @retval EFI_OUT_OF_RESOURCES There is not enough pool memory to store the results. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - + **/ typedef EFI_STATUS @@ -1318,18 +1316,18 @@ EFI_STATUS OUT UINTN *ProtocolBufferCount ); -/** - Creates an event that is to be signaled whenever an interface is installed for a specified protocol. - - @param Protocol The numeric ID of the protocol for which the event is to be registered. +/** + Creates an event that is to be signaled whenever an interface is installed for a specified protocol. + + @param Protocol The numeric ID of the protocol for which the event is to be registered. @param Event Event that is to be signaled whenever a protocol interface is registered - for Protocol. - @param Registration A pointer to a memory location to receive the registration value. - - @retval EFI_SUCCESS The notification event has been registered. + for Protocol. + @param Registration A pointer to a memory location to receive the registration value. + + @retval EFI_SUCCESS The notification event has been registered. @retval EFI_OUT_OF_RESOURCES Space for the notification event could not be allocated. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - + **/ typedef EFI_STATUS @@ -1345,23 +1343,23 @@ typedef enum { ByProtocol } EFI_LOCATE_SEARCH_TYPE; -/** +/** Returns an array of handles that support a specified protocol. - + @param SearchType Specifies which handle(s) are to be returned. @param Protocol Specifies the protocol to search by. - @param SearchKey Specifies the search key. - @param BufferSize On input, the size in bytes of Buffer. On output, the size in bytes of - the array returned in Buffer (if the buffer was large enough) or the + @param SearchKey Specifies the search key. + @param BufferSize On input, the size in bytes of Buffer. On output, the size in bytes of + the array returned in Buffer (if the buffer was large enough) or the size, in bytes, of the buffer needed to obtain the array (if the buffer was - not large enough). + not large enough). @param Buffer The buffer in which the array is returned. - + @retval EFI_SUCCESS The array of handles was returned. @retval EFI_NOT_FOUND No handles match the search. - @retval EFI_BUFFER_TOO_SMALL The BufferSize is too small for the result. + @retval EFI_BUFFER_TOO_SMALL The BufferSize is too small for the result. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - + **/ typedef EFI_STATUS @@ -1373,19 +1371,19 @@ EFI_STATUS OUT EFI_HANDLE *Buffer ); -/** +/** Locates the handle to a device on the device path that supports the specified protocol. - + @param Protocol Specifies the protocol to search for. @param DevicePath On input, a pointer to a pointer to the device path. On output, the device - path pointer is modified to point to the remaining part of the device - path. - @param Device A pointer to the returned device handle. - + path pointer is modified to point to the remaining part of the device + path. + @param Device A pointer to the returned device handle. + @retval EFI_SUCCESS The resulting handle was returned. - @retval EFI_NOT_FOUND No handles match the search. + @retval EFI_NOT_FOUND No handles match the search. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - + **/ typedef EFI_STATUS @@ -1395,18 +1393,18 @@ EFI_STATUS OUT EFI_HANDLE *Device ); -/** +/** Adds, updates, or removes a configuration table entry from the EFI System Table. - + @param Guid A pointer to the GUID for the entry to add, update, or remove. @param Table A pointer to the configuration table for the entry to add, update, or - remove. May be NULL. - + remove. May be NULL. + @retval EFI_SUCCESS The (Guid, Table) pair was added, updated, or removed. @retval EFI_NOT_FOUND An attempt was made to delete a nonexistent entry. @retval EFI_INVALID_PARAMETER Guid is not valid. @retval EFI_OUT_OF_RESOURCES There is not enough memory available to complete the operation. - + **/ typedef EFI_STATUS @@ -1415,11 +1413,11 @@ EFI_STATUS IN VOID *Table ); -/** +/** Reserved service. - + @retval EFI_SUCCESS The operation has been completed successfully. - + **/ typedef EFI_STATUS @@ -1427,22 +1425,22 @@ EFI_STATUS VOID ); -/** +/** Returns an array of handles that support the requested protocol in a buffer allocated from pool. - + @param SearchType Specifies which handle(s) are to be returned. @param Protocol Specifies the protocol to search by. @param SearchKey Supplies the search key depending on the SearchType. @param NoHandles The number of handles returned in Buffer. @param Buffer A pointer to the buffer to return the requested array of handles that - support Protocol. - + support Protocol. + @retval EFI_SUCCESS The array of handles was returned in Buffer, and the number of - handles in Buffer was returned in NoHandles. + handles in Buffer was returned in NoHandles. @retval EFI_NOT_FOUND No handles match the search. @retval EFI_OUT_OF_RESOURCES There is not enough pool memory to store the matching results. @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - + **/ typedef EFI_STATUS @@ -1454,21 +1452,21 @@ EFI_STATUS OUT EFI_HANDLE **Buffer ); -/** +/** Returns the first protocol instance that matches the given protocol. - + @param Protocol Provides the protocol to search for. @param Registration Optional registration key returned from - RegisterProtocolNotify(). + RegisterProtocolNotify(). @param Interface On return, a pointer to the first interface that matches Protocol and - Registration. - + Registration. + @retval EFI_SUCCESS A protocol instance matching Protocol was found and returned in - Interface. + Interface. @retval EFI_NOT_FOUND No protocol instances were found that match Protocol and - Registration. + Registration. @retval EFI_INVALID_PARAMETER Interface is NULL. - + **/ typedef EFI_STATUS @@ -1496,27 +1494,27 @@ typedef struct { #define CAPSULE_FLAGS_PERSIST_ACROSS_RESET 0x00010000 #define CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE 0x00020000 -/** +/** Passes capsules to the firmware with both virtual and physical mapping. Depending on the intended - consumption, the firmware may process the capsule immediately. If the payload should persist - across a system reset, the reset value returned from EFI_QueryCapsuleCapabilities must - be passed into ResetSystem() and will cause the capsule to be processed by the firmware as - part of the reset process. - + consumption, the firmware may process the capsule immediately. If the payload should persist + across a system reset, the reset value returned from EFI_QueryCapsuleCapabilities must + be passed into ResetSystem() and will cause the capsule to be processed by the firmware as + part of the reset process. + @param CapsuleHeaderArray Virtual pointer to an array of virtual pointers to the capsules - being passed into update capsule. + being passed into update capsule. @param CapsuleCount Number of pointers to EFI_CAPSULE_HEADER in - CaspuleHeaderArray. - @param ScatterGatherList Physical pointer to a set of + CaspuleHeaderArray. + @param ScatterGatherList Physical pointer to a set of EFI_CAPSULE_BLOCK_DESCRIPTOR that describes the location in physical memory of a set of capsules. - - @retval EFI_SUCCESS Valid capsule was passed. If + + @retval EFI_SUCCESS Valid capsule was passed. If CAPSULE_FLAGS_PERSIT_ACROSS_RESET is not set, the capsule has been successfully processed by the firmware. - @retval EFI_DEVICE_ERROR The capsule update was started, but failed due to a device error. + @retval EFI_DEVICE_ERROR The capsule update was started, but failed due to a device error. @retval EFI_INVALID_PARAMETER CapsuleSize is NULL. - + **/ typedef EFI_STATUS @@ -1526,23 +1524,23 @@ EFI_STATUS IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL ); -/** +/** Returns if the capsule can be supported via UpdateCapsule(). - + @param CapsuleHeaderArray Virtual pointer to an array of virtual pointers to the capsules - being passed into update capsule. + being passed into update capsule. @param CapsuleCount Number of pointers to EFI_CAPSULE_HEADER in - CaspuleHeaderArray. + CaspuleHeaderArray. @param MaxiumCapsuleSize On output the maximum size that UpdateCapsule() can - support as an argument to UpdateCapsule() via - CapsuleHeaderArray and ScatterGatherList. - @param ResetType Returns the type of reset required for the capsule update. - - @retval EFI_SUCCESS Valid answer returned. + support as an argument to UpdateCapsule() via + CapsuleHeaderArray and ScatterGatherList. + @param ResetType Returns the type of reset required for the capsule update. + + @retval EFI_SUCCESS Valid answer returned. @retval EFI_UNSUPPORTED The capsule type is not supported on this platform, and - MaximumCapsuleSize and ResetType are undefined. + MaximumCapsuleSize and ResetType are undefined. @retval EFI_INVALID_PARAMETER MaximumCapsuleSize is NULL. - + **/ typedef EFI_STATUS @@ -1553,29 +1551,29 @@ EFI_STATUS OUT EFI_RESET_TYPE *ResetType ); -/** +/** Returns information about the EFI variables. - + @param Attributes Attributes bitmask to specify the type of variables on - which to return information. - @param MaximumVariableStorageSize On output the maximum size of the storage space + which to return information. + @param MaximumVariableStorageSize On output the maximum size of the storage space available for the EFI variables associated with the - attributes specified. - @param RemainingVariableStorageSize Returns the remaining size of the storage space + attributes specified. + @param RemainingVariableStorageSize Returns the remaining size of the storage space available for the EFI variables associated with the - attributes specified. - @param MaximumVariableSize Returns the maximum size of the individual EFI - variables associated with the attributes specified. - - @retval EFI_SUCCESS Valid answer returned. - @retval EFI_INVALID_PARAMETER An invalid combination of attribute bits was supplied + attributes specified. + @param MaximumVariableSize Returns the maximum size of the individual EFI + variables associated with the attributes specified. + + @retval EFI_SUCCESS Valid answer returned. + @retval EFI_INVALID_PARAMETER An invalid combination of attribute bits was supplied @retval EFI_UNSUPPORTED The attribute is not supported on this platform, and the - MaximumVariableStorageSize, - RemainingVariableStorageSize, MaximumVariableSize - are undefined. - -**/ -typedef + MaximumVariableStorageSize, + RemainingVariableStorageSize, MaximumVariableSize + are undefined. + +**/ +typedef EFI_STATUS (EFIAPI *EFI_QUERY_VARIABLE_INFO) ( IN UINT32 Attributes, @@ -2122,19 +2120,6 @@ typedef struct { EFI_GUID Protocol; } MEDIA_PROTOCOL_DEVICE_PATH; -#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000)) -// -// Prior to UEFI 2.0 Tiano extended this enum. UEFI owns device path values -// and we moved to a new GUID'ed device path for Tiano -// - -#define MEDIA_FV_FILEPATH_DP 0x06 -typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - EFI_GUID NameGuid; -} MEDIA_FW_VOL_FILEPATH_DEVICE_PATH; - -#else typedef struct { EFI_DEVICE_PATH_PROTOCOL Header; @@ -2157,8 +2142,6 @@ typedef struct { EFI_GUID VolumeGuid; } MEDIA_FW_VOL_DEVICE_PATH; -#endif - // // BBS Device Path diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c index ce59eaf417..33a14522a9 100644 --- a/MdePkg/Library/UefiLib/UefiNotTiano.c +++ b/MdePkg/Library/UefiLib/UefiNotTiano.c @@ -2,11 +2,11 @@ Library functions that abstract areas of conflict between Tiano an UEFI 2.0. Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the - oldconflicts with library functions and supporting implementations of the old - (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as + oldconflicts with library functions and supporting implementations of the old + (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as it contains DXE enum extensions for EFI event services. -Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2007, 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 @@ -19,11 +19,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. /** - An empty function to pass error checking of CreateEventEx (). - + An empty function to pass error checking of CreateEventEx (). + This empty function ensures that EFI_EVENT_NOTIFY_SIGNAL_ALL is error checked correctly since it is now mapped into CreateEventEx() in UEFI 2.0. - + **/ STATIC VOID @@ -37,13 +37,13 @@ InternalEmptyFuntion ( } /** - Create a Legacy Boot Event. - - Tiano extended the CreateEvent Type enum to add a legacy boot event type. + Create a Legacy Boot Event. + + Tiano extended the CreateEvent Type enum to add a legacy boot event type. This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was - added and now it's possible to not voilate the UEFI specification by + added and now it's possible to not voilate the UEFI specification by declaring a GUID for the legacy boot event class. This library supports - the EDK/EFI 1.10 form and EDK II/UEFI 2.0 form and allows common code to + the EDK/EFI 1.10 form and EDK II/UEFI 2.0 form and allows common code to work both ways. @param LegacyBootEvent Returns the EFI event returned from gBS->CreateEvent(Ex). @@ -68,8 +68,8 @@ EfiCreateEventLegacyBoot ( /** Create an EFI event in the Legacy Boot Event Group and allows - the caller to specify a notification function. - + the caller to specify a notification function. + This function abstracts the creation of the Legacy Boot Event. The Framework moved from a proprietary to UEFI 2.0 based mechanism. This library abstracts the caller from how this event is created to prevent @@ -98,47 +98,47 @@ EfiCreateEventLegacyBootEx ( ASSERT (LegacyBootEvent != NULL); -#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000)) - // - // prior to UEFI 2.0 use Tiano extension to EFI - // - Status = gBS->CreateEvent ( - EFI_EVENT_SIGNAL_LEGACY_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL, - NotifyTpl, - NotifyFunction, - NotifyContext, - LegacyBootEvent - ); -#elif (EFI_SPECIFICATION_VERSION >= 0x00020000) - // - // For UEFI 2.0 and the future use an Event Group - // - Status = gBS->CreateEventEx ( - EVENT_NOTIFY_SIGNAL, - NotifyTpl, - NotifyFunction, - NotifyContext, - &gEfiEventLegacyBootGuid, - LegacyBootEvent - ); -#else - // - // For EFI 1.10 with no Tiano extensions return unsupported - // - Status = EFI_UNSUPORTED; -#endif + if (gST->Hdr.Revision < 0x00020000) { + // + // prior to UEFI 2.0 use Tiano extension to EFI + // + Status = gBS->CreateEvent ( + EFI_EVENT_SIGNAL_LEGACY_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL, + NotifyTpl, + NotifyFunction, + NotifyContext, + LegacyBootEvent + ); + } else if (gST->Hdr.Revision >= 0x00020000 ) { + // + // For UEFI 2.0 and the future use an Event Group + // + Status = gBS->CreateEventEx ( + EVENT_NOTIFY_SIGNAL, + NotifyTpl, + NotifyFunction, + NotifyContext, + &gEfiEventLegacyBootGuid, + LegacyBootEvent + ); + } else { + // + // For EFI 1.10 with no Tiano extensions return unsupported + // + Status = EFI_UNSUPPORTED; + } return Status; } /** - Create a Read to Boot Event. - - Tiano extended the CreateEvent Type enum to add a ready to boot event type. + Create a Read to Boot Event. + + Tiano extended the CreateEvent Type enum to add a ready to boot event type. This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was - added and now it's possible to not voilate the UEFI specification and use + added and now it's possible to not voilate the UEFI specification and use the ready to boot event class defined in UEFI 2.0. This library supports - the EDK/EFI 1.10 form and EDK II/UEFI 2.0 form and allows common code to + the EDK/EFI 1.10 form and EDK II/UEFI 2.0 form and allows common code to work both ways. @param LegacyBootEvent Returns the EFI event returned from gBS->CreateEvent(Ex). @@ -163,8 +163,8 @@ EfiCreateEventReadyToBoot ( /** Create an EFI event in the Ready To Boot Event Group and allows - the caller to specify a notification function. - + the caller to specify a notification function. + This function abstracts the creation of the Ready to Boot Event. The Framework moved from a proprietary to UEFI 2.0 based mechanism. This library abstracts the caller from how this event is created to prevent @@ -193,45 +193,45 @@ EfiCreateEventReadyToBootEx ( ASSERT (ReadyToBootEvent != NULL); -#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000)) - // - // prior to UEFI 2.0 use Tiano extension to EFI - // - Status = gBS->CreateEvent ( - EFI_EVENT_SIGNAL_READY_TO_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL, - NotifyTpl, - NotifyFunction, - NotifyContext, - ReadyToBootEvent - ); -#elif (EFI_SPECIFICATION_VERSION >= 0x00020000) - // - // For UEFI 2.0 and the future use an Event Group - // - Status = gBS->CreateEventEx ( - EVENT_NOTIFY_SIGNAL, - NotifyTpl, - NotifyFunction, - NotifyContext, - &gEfiEventReadyToBootGuid, - ReadyToBootEvent - ); -#else - // - // For EFI 1.10 with no Tiano extensions return unsupported - // - Status = EFI_UNSUPORTED; -#endif + if (gST->Hdr.Revision < 0x00020000) { + // + // prior to UEFI 2.0 use Tiano extension to EFI + // + Status = gBS->CreateEvent ( + EFI_EVENT_SIGNAL_READY_TO_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL, + NotifyTpl, + NotifyFunction, + NotifyContext, + ReadyToBootEvent + ); + } else if (gST->Hdr.Revision >= 0x00020000) { + // + // For UEFI 2.0 and the future use an Event Group + // + Status = gBS->CreateEventEx ( + EVENT_NOTIFY_SIGNAL, + NotifyTpl, + NotifyFunction, + NotifyContext, + &gEfiEventReadyToBootGuid, + ReadyToBootEvent + ); + } else { + // + // For EFI 1.10 with no Tiano extensions return unsupported + // + Status = EFI_UNSUPPORTED; + } return Status; } /** - Signal a Ready to Boot Event. - - Create a Ready to Boot Event. Signal it and close it. This causes other - events of the same event group to be signaled in other modules. + Signal a Ready to Boot Event. + + Create a Ready to Boot Event. Signal it and close it. This causes other + events of the same event group to be signaled in other modules. **/ VOID @@ -251,10 +251,10 @@ EfiSignalEventReadyToBoot ( } /** - Signal a Legacy Boot Event. - - Create a legacy Boot Event. Signal it and close it. This causes other - events of the same event group to be signaled in other modules. + Signal a Legacy Boot Event. + + Create a legacy Boot Event. Signal it and close it. This causes other + events of the same event group to be signaled in other modules. **/ VOID @@ -275,12 +275,12 @@ EfiSignalEventLegacyBoot ( /** - Check to see if the Firmware Volume (FV) Media Device Path is valid - + Check to see if the Firmware Volume (FV) Media Device Path is valid + Tiano extended the EFI 1.10 device path nodes. Tiano does not own this enum so as we move to UEFI 2.0 support we must use a mechanism that conforms with - the UEFI 2.0 specification to define the FV device path. An UEFI GUIDed - device path is defined for Tiano extensions of device path. If the code + the UEFI 2.0 specification to define the FV device path. An UEFI GUIDed + device path is defined for Tiano extensions of device path. If the code is compiled to conform with the UEFI 2.0 specification use the new device path else use the old form for backwards compatability. The return value to this function points to a location in FvDevicePathNode and it does not allocate @@ -300,16 +300,6 @@ EfiGetNameGuidFromFwVolDevicePathNode ( { ASSERT (FvDevicePathNode != NULL); -#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000)) - // - // Use old Device Path that conflicts with UEFI - // - if (DevicePathType (&FvDevicePathNode->Header) == MEDIA_DEVICE_PATH || - DevicePathSubType (&FvDevicePathNode->Header) == MEDIA_FV_FILEPATH_DP) { - return (EFI_GUID *) &FvDevicePathNode->NameGuid; - } - -#elif ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION >= 0x00020000)) // // Use the new Device path that does not conflict with the UEFI // @@ -321,18 +311,18 @@ EfiGetNameGuidFromFwVolDevicePathNode ( } } } -#endif + return NULL; } /** Initialize a Firmware Volume (FV) Media Device Path node. - + Tiano extended the EFI 1.10 device path nodes. Tiano does not own this enum so as we move to UEFI 2.0 support we must use a mechanism that conforms with - the UEFI 2.0 specification to define the FV device path. An UEFI GUIDed - device path is defined for Tiano extensions of device path. If the code + the UEFI 2.0 specification to define the FV device path. An UEFI GUIDed + device path is defined for Tiano extensions of device path. If the code is compiled to conform with the UEFI 2.0 specification use the new device path else use the old form for backwards compatability. @@ -350,15 +340,6 @@ EfiInitializeFwVolDevicepathNode ( ASSERT (FvDevicePathNode != NULL); ASSERT (NameGuid != NULL); -#if (EFI_SPECIFICATION_VERSION < 0x00020000) - // - // Use old Device Path that conflicts with UEFI - // - FvDevicePathNode->Header.Type = MEDIA_DEVICE_PATH; - FvDevicePathNode->Header.SubType = MEDIA_FV_FILEPATH_DP; - SetDevicePathNodeLength (&FvDevicePathNode->Header, sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)); - -#else // // Use the new Device path that does not conflict with the UEFI // @@ -376,9 +357,6 @@ EfiInitializeFwVolDevicepathNode ( // FvDevicePathNode->Tiano.Type = TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE; -#endif - CopyGuid (&FvDevicePathNode->NameGuid, NameGuid); - }