tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
vanjeff 2007-03-26 07:00:30 +00:00
parent 3b660b0c8b
commit c0b162a2c0
3 changed files with 593 additions and 687 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
View File

@ -2,13 +2,13 @@
Private data structures for the Console Splitter driver Private data structures for the Console Splitter driver
Copyright (c) 2006 - 2007 Intel Corporation. <BR> Copyright (c) 2006 - 2007 Intel Corporation. <BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 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_OUT_PROTOCOL TextOut;
EFI_SIMPLE_TEXT_OUTPUT_MODE TextOutMode; 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_PROTOCOL GraphicsOutput;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *GraphicsOutputBlt; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *GraphicsOutputBlt;
TEXT_OUT_GOP_MODE *GraphicsOutputModeBuffer; TEXT_OUT_GOP_MODE *GraphicsOutputModeBuffer;
UINTN CurrentNumberOfGraphicsOutput; UINTN CurrentNumberOfGraphicsOutput;
BOOLEAN HardwareNeedsStarting; BOOLEAN HardwareNeedsStarting;
#endif
EFI_CONSOLE_CONTROL_PROTOCOL ConsoleControl; 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 EFI_STATUS
DevNullTextOutOutputString ( DevNullTextOutOutputString (

1001
MdePkg/Include/Uefi/UefiSpec.h
View File

File diff suppressed because it is too large Load Diff

210
MdePkg/Library/UefiLib/UefiNotTiano.c
View File

@ -2,11 +2,11 @@
Library functions that abstract areas of conflict between Tiano an UEFI 2.0. 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 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 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 (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. it contains DXE enum extensions for EFI event services.
Copyright (c) 2006, Intel Corporation<BR> Copyright (c) 2006 - 2007, Intel Corporation<BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 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 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. checked correctly since it is now mapped into CreateEventEx() in UEFI 2.0.
**/ **/
STATIC STATIC
VOID VOID
@ -37,13 +37,13 @@ InternalEmptyFuntion (
} }
/** /**
Create a Legacy Boot Event. Create a Legacy Boot Event.
Tiano extended the CreateEvent Type enum to add a legacy boot event type. 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 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 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. work both ways.
@param LegacyBootEvent Returns the EFI event returned from gBS->CreateEvent(Ex). @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 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. This function abstracts the creation of the Legacy Boot Event.
The Framework moved from a proprietary to UEFI 2.0 based mechanism. 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 This library abstracts the caller from how this event is created to prevent
@ -98,47 +98,47 @@ EfiCreateEventLegacyBootEx (
ASSERT (LegacyBootEvent != NULL); ASSERT (LegacyBootEvent != NULL);
#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000)) if (gST->Hdr.Revision < 0x00020000) {
// //
// prior to UEFI 2.0 use Tiano extension to EFI // prior to UEFI 2.0 use Tiano extension to EFI
// //
Status = gBS->CreateEvent ( Status = gBS->CreateEvent (
EFI_EVENT_SIGNAL_LEGACY_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL, EFI_EVENT_SIGNAL_LEGACY_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL,
NotifyTpl, NotifyTpl,
NotifyFunction, NotifyFunction,
NotifyContext, NotifyContext,
LegacyBootEvent LegacyBootEvent
); );
#elif (EFI_SPECIFICATION_VERSION >= 0x00020000) } else if (gST->Hdr.Revision >= 0x00020000 ) {
// //
// For UEFI 2.0 and the future use an Event Group // For UEFI 2.0 and the future use an Event Group
// //
Status = gBS->CreateEventEx ( Status = gBS->CreateEventEx (
EVENT_NOTIFY_SIGNAL, EVENT_NOTIFY_SIGNAL,
NotifyTpl, NotifyTpl,
NotifyFunction, NotifyFunction,
NotifyContext, NotifyContext,
&gEfiEventLegacyBootGuid, &gEfiEventLegacyBootGuid,
LegacyBootEvent LegacyBootEvent
); );
#else } else {
// //
// For EFI 1.10 with no Tiano extensions return unsupported // For EFI 1.10 with no Tiano extensions return unsupported
// //
Status = EFI_UNSUPORTED; Status = EFI_UNSUPPORTED;
#endif }
return Status; return Status;
} }
/** /**
Create a Read to Boot Event. Create a Read to Boot Event.
Tiano extended the CreateEvent Type enum to add a ready to boot event type. 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 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 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. work both ways.
@param LegacyBootEvent Returns the EFI event returned from gBS->CreateEvent(Ex). @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 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. This function abstracts the creation of the Ready to Boot Event.
The Framework moved from a proprietary to UEFI 2.0 based mechanism. 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 This library abstracts the caller from how this event is created to prevent
@ -193,45 +193,45 @@ EfiCreateEventReadyToBootEx (
ASSERT (ReadyToBootEvent != NULL); ASSERT (ReadyToBootEvent != NULL);
#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000)) if (gST->Hdr.Revision < 0x00020000) {
// //
// prior to UEFI 2.0 use Tiano extension to EFI // prior to UEFI 2.0 use Tiano extension to EFI
// //
Status = gBS->CreateEvent ( Status = gBS->CreateEvent (
EFI_EVENT_SIGNAL_READY_TO_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL, EFI_EVENT_SIGNAL_READY_TO_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL,
NotifyTpl, NotifyTpl,
NotifyFunction, NotifyFunction,
NotifyContext, NotifyContext,
ReadyToBootEvent ReadyToBootEvent
); );
#elif (EFI_SPECIFICATION_VERSION >= 0x00020000) } else if (gST->Hdr.Revision >= 0x00020000) {
// //
// For UEFI 2.0 and the future use an Event Group // For UEFI 2.0 and the future use an Event Group
// //
Status = gBS->CreateEventEx ( Status = gBS->CreateEventEx (
EVENT_NOTIFY_SIGNAL, EVENT_NOTIFY_SIGNAL,
NotifyTpl, NotifyTpl,
NotifyFunction, NotifyFunction,
NotifyContext, NotifyContext,
&gEfiEventReadyToBootGuid, &gEfiEventReadyToBootGuid,
ReadyToBootEvent ReadyToBootEvent
); );
#else } else {
// //
// For EFI 1.10 with no Tiano extensions return unsupported // For EFI 1.10 with no Tiano extensions return unsupported
// //
Status = EFI_UNSUPORTED; Status = EFI_UNSUPPORTED;
#endif }
return Status; return Status;
} }
/** /**
Signal a Ready to Boot Event. Signal a Ready to Boot Event.
Create a Ready to Boot Event. Signal it and close it. This causes other 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. events of the same event group to be signaled in other modules.
**/ **/
VOID VOID
@ -251,10 +251,10 @@ EfiSignalEventReadyToBoot (
} }
/** /**
Signal a Legacy Boot Event. Signal a Legacy Boot Event.
Create a legacy Boot Event. Signal it and close it. This causes other 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. events of the same event group to be signaled in other modules.
**/ **/
VOID 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 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 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 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 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 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 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 function points to a location in FvDevicePathNode and it does not allocate
@ -300,16 +300,6 @@ EfiGetNameGuidFromFwVolDevicePathNode (
{ {
ASSERT (FvDevicePathNode != NULL); 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 // Use the new Device path that does not conflict with the UEFI
// //
@ -321,18 +311,18 @@ EfiGetNameGuidFromFwVolDevicePathNode (
} }
} }
} }
#endif
return NULL; return NULL;
} }
/** /**
Initialize a Firmware Volume (FV) Media Device Path node. Initialize a Firmware Volume (FV) Media Device Path node.
Tiano extended the EFI 1.10 device path nodes. Tiano does not own this enum 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 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 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 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 is compiled to conform with the UEFI 2.0 specification use the new device path
else use the old form for backwards compatability. else use the old form for backwards compatability.
@ -350,15 +340,6 @@ EfiInitializeFwVolDevicepathNode (
ASSERT (FvDevicePathNode != NULL); ASSERT (FvDevicePathNode != NULL);
ASSERT (NameGuid != 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 // 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; FvDevicePathNode->Tiano.Type = TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE;
#endif
CopyGuid (&FvDevicePathNode->NameGuid, NameGuid); CopyGuid (&FvDevicePathNode->NameGuid, NameGuid);
} }