diff options
| author | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-09-18 02:41:33 +0000 |
|---|---|---|
| committer | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-09-18 02:41:33 +0000 |
| commit | 3d6f81d7b4db3d62d907da82362bba0ea3a4767a (patch) | |
| tree | 87530b690ad35e8999a88830c3cb954265f46fdf | |
| parent | bd1fc2092e941bb9c769141fefc77206ba515419 (diff) | |
| download | edk2-platforms-3d6f81d7b4db3d62d907da82362bba0ea3a4767a.tar.xz | |
Use Device Path Macros to get Device Path Type/SubType. (Some extensions might use high-bit-set device path type to specify "unpacked" device path.)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3880 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c | 6 | ||||
| -rw-r--r-- | MdePkg/Library/UefiLib/UefiNotTiano.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c b/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c index d3c832ff7e..b920db01e1 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c +++ b/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c @@ -297,8 +297,8 @@ EfiGetNameGuidFromFwVolDevicePathNode ( //
// Use the new Device path that does not conflict with the UEFI
//
- if (FrameworkFvDevicePathNode->Tiano.Header.Type == MEDIA_DEVICE_PATH &&
- FrameworkFvDevicePathNode->Tiano.Header.SubType == MEDIA_VENDOR_DP) {
+ if (DevicePathType (&FrameworkFvDevicePathNode->Tiano.Header) == MEDIA_DEVICE_PATH &&
+ DevicePathSubType (&FrameworkFvDevicePathNode->Tiano.Header) == MEDIA_VENDOR_DP) {
if (CompareGuid (&gEfiFrameworkDevicePathGuid, &FrameworkFvDevicePathNode->Tiano.TianoSpecificDevicePath)) {
if (FrameworkFvDevicePathNode->Tiano.Type == TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE) {
return (EFI_GUID *) &FrameworkFvDevicePathNode->NameGuid;
@@ -328,7 +328,7 @@ VOID EFIAPI
EfiInitializeFwVolDevicepathNode (
IN OUT MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvDevicePathNode,
- IN CONST EFI_GUID *NameGuid
+ IN CONST EFI_GUID *NameGuid
)
{
FRAMEWORK_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FrameworkFvDevicePathNode;
diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c index 19a7a19a22..b621963fbc 100644 --- a/MdePkg/Library/UefiLib/UefiNotTiano.c +++ b/MdePkg/Library/UefiLib/UefiNotTiano.c @@ -283,9 +283,8 @@ EfiGetNameGuidFromFwVolDevicePathNode ( {
ASSERT (FvFileDevicePathNode != NULL);
- if (FvFileDevicePathNode->Header.Type == MEDIA_DEVICE_PATH &&
- FvFileDevicePathNode->Header.SubType == MEDIA_PIWG_FW_FILE_DP
- ) {
+ if (DevicePathType (&FvFileDevicePathNode->Header) == MEDIA_DEVICE_PATH &&
+ DevicePathSubType (&FvFileDevicePathNode->Header) == MEDIA_PIWG_FW_FILE_DP) {
return (EFI_GUID *) &FvFileDevicePathNode->FvFileName;
}
|