mirror of https://github.com/acidanthera/audk.git
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
parent
3b660b0c8b
commit
c0b162a2c0
|
|
@ -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 (
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
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
|
||||
|
|
@ -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)
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
(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<BR>
|
||||
Copyright (c) 2006 - 2007, Intel Corporation<BR>
|
||||
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
|
||||
|
|
@ -98,7 +98,7 @@ EfiCreateEventLegacyBootEx (
|
|||
|
||||
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
|
||||
//
|
||||
|
|
@ -109,7 +109,7 @@ EfiCreateEventLegacyBootEx (
|
|||
NotifyContext,
|
||||
LegacyBootEvent
|
||||
);
|
||||
#elif (EFI_SPECIFICATION_VERSION >= 0x00020000)
|
||||
} else if (gST->Hdr.Revision >= 0x00020000 ) {
|
||||
//
|
||||
// For UEFI 2.0 and the future use an Event Group
|
||||
//
|
||||
|
|
@ -121,12 +121,12 @@ EfiCreateEventLegacyBootEx (
|
|||
&gEfiEventLegacyBootGuid,
|
||||
LegacyBootEvent
|
||||
);
|
||||
#else
|
||||
} else {
|
||||
//
|
||||
// For EFI 1.10 with no Tiano extensions return unsupported
|
||||
//
|
||||
Status = EFI_UNSUPORTED;
|
||||
#endif
|
||||
Status = EFI_UNSUPPORTED;
|
||||
}
|
||||
|
||||
return Status;
|
||||
}
|
||||
|
|
@ -193,7 +193,7 @@ EfiCreateEventReadyToBootEx (
|
|||
|
||||
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
|
||||
//
|
||||
|
|
@ -204,7 +204,7 @@ EfiCreateEventReadyToBootEx (
|
|||
NotifyContext,
|
||||
ReadyToBootEvent
|
||||
);
|
||||
#elif (EFI_SPECIFICATION_VERSION >= 0x00020000)
|
||||
} else if (gST->Hdr.Revision >= 0x00020000) {
|
||||
//
|
||||
// For UEFI 2.0 and the future use an Event Group
|
||||
//
|
||||
|
|
@ -216,12 +216,12 @@ EfiCreateEventReadyToBootEx (
|
|||
&gEfiEventReadyToBootGuid,
|
||||
ReadyToBootEvent
|
||||
);
|
||||
#else
|
||||
} else {
|
||||
//
|
||||
// For EFI 1.10 with no Tiano extensions return unsupported
|
||||
//
|
||||
Status = EFI_UNSUPORTED;
|
||||
#endif
|
||||
Status = EFI_UNSUPPORTED;
|
||||
}
|
||||
|
||||
return Status;
|
||||
}
|
||||
|
|
@ -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,7 +311,7 @@ EfiGetNameGuidFromFwVolDevicePathNode (
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue