fix a issue caused by code review follow up

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5957 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
index 5889586cee2f31871c2b79554b0452667ed35edc..41db3c288d842e424b6205aff3d28ffcc39752ef 100644 (file)
--- a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -230,7 +230,7 @@ Returns:
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
   IN UINTN                                Instance,\r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
   IN UINTN                                Instance,\r

-  OUT EFI_FVB_ATTRIBUTES                  *Attributes,\r
+  OUT EFI_FVB_ATTRIBUTES_2                  *Attributes,\r

   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r


@@ -401,7 +401,7 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_FVB_ATTRIBUTES  Attributes;\r
+  EFI_FVB_ATTRIBUTES_2  Attributes;\r

   UINTN               LbaAddress;\r
   UINTN               LbaLength;\r
   EFI_STATUS          Status;\r
   UINTN               LbaAddress;\r
   UINTN               LbaLength;\r
   EFI_STATUS          Status;\r


@@ -486,7 +486,7 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_FVB_ATTRIBUTES  Attributes;\r
+  EFI_FVB_ATTRIBUTES_2  Attributes;\r

   UINTN               LbaAddress;\r
   UINTN               LbaLength;\r
   EFI_STATUS          Status;\r
   UINTN               LbaAddress;\r
   UINTN               LbaLength;\r
   EFI_STATUS          Status;\r


@@ -563,7 +563,7 @@ Returns:
 --*/\r
 {\r
 \r
 --*/\r
 {\r
 \r

-  EFI_FVB_ATTRIBUTES  Attributes;\r
+  EFI_FVB_ATTRIBUTES_2  Attributes;\r

   UINTN               LbaAddress;\r
   UINTN               LbaLength;\r
   EFI_STATUS          Status;\r
   UINTN               LbaAddress;\r
   UINTN               LbaLength;\r
   EFI_STATUS          Status;\r


@@ -707,7 +707,7 @@ Returns:
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
   IN UINTN                                Instance,\r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
   IN UINTN                                Instance,\r

-  IN OUT EFI_FVB_ATTRIBUTES               *Attributes,\r
+  IN OUT EFI_FVB_ATTRIBUTES_2               *Attributes,\r

   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r


@@ -720,7 +720,7 @@ Routine Description:
 Arguments:\r
   Instance              - The FV instance whose attributes is going to be \r
                           modified\r
 Arguments:\r
   Instance              - The FV instance whose attributes is going to be \r
                           modified\r

-  Attributes            - On input, it is a pointer to EFI_FVB_ATTRIBUTES \r
+  Attributes            - On input, it is a pointer to EFI_FVB_ATTRIBUTES_2 \r

                           containing the desired firmware volume settings.\r
                           On successful return, it contains the new settings\r
                           of the firmware volume\r
                           containing the desired firmware volume settings.\r
                           On successful return, it contains the new settings\r
                           of the firmware volume\r


@@ -738,13 +738,13 @@ Returns:
 --*/\r
 {\r
   EFI_FW_VOL_INSTANCE *FwhInstance;\r
 --*/\r
 {\r
   EFI_FW_VOL_INSTANCE *FwhInstance;\r

-  EFI_FVB_ATTRIBUTES  OldAttributes;\r
-  EFI_FVB_ATTRIBUTES  *AttribPtr;\r
+  EFI_FVB_ATTRIBUTES_2  OldAttributes;\r
+  EFI_FVB_ATTRIBUTES_2  *AttribPtr;\r

   UINT32              Capabilities;\r
   UINT32              OldStatus;\r
   UINT32              NewStatus;\r
   EFI_STATUS          Status;\r
   UINT32              Capabilities;\r
   UINT32              OldStatus;\r
   UINT32              NewStatus;\r
   EFI_STATUS          Status;\r

-  EFI_FVB_ATTRIBUTES  UnchangedAttributes;\r
+  EFI_FVB_ATTRIBUTES_2  UnchangedAttributes;\r

 \r
 \r
   //\r
 \r
 \r
   //\r


@@ -753,7 +753,7 @@ Returns:
   Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual);\r
   ASSERT_EFI_ERROR (Status);\r
 \r

-  AttribPtr     = (EFI_FVB_ATTRIBUTES *) &(FwhInstance->VolumeHeader.Attributes);\r
+  AttribPtr     = (EFI_FVB_ATTRIBUTES_2 *) &(FwhInstance->VolumeHeader.Attributes);\r

   OldAttributes = *AttribPtr;\r
   Capabilities  = OldAttributes & (EFI_FVB2_READ_DISABLED_CAP | \\r
                                    EFI_FVB2_READ_ENABLED_CAP | \\r
   OldAttributes = *AttribPtr;\r
   Capabilities  = OldAttributes & (EFI_FVB2_READ_DISABLED_CAP | \\r
                                    EFI_FVB2_READ_ENABLED_CAP | \\r


@@ -920,7 +920,7 @@ EFI_STATUS
 EFIAPI\r
 FvbProtocolGetAttributes (\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
 EFIAPI\r
 FvbProtocolGetAttributes (\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r

-  OUT EFI_FVB_ATTRIBUTES                          *Attributes\r
+  OUT EFI_FVB_ATTRIBUTES_2                          *Attributes\r

   )\r
 /*++\r
 \r
   )\r
 /*++\r
 \r


@@ -947,7 +947,7 @@ EFI_STATUS
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r

-  IN OUT EFI_FVB_ATTRIBUTES                       *Attributes\r
+  IN OUT EFI_FVB_ATTRIBUTES_2                       *Attributes\r

   )\r
 /*++\r
 \r
   )\r
 /*++\r
 \r

diff --git a/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h b/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
index 6f949d37ecebc15e141468a7e1692ecbef314a0e..f005f39c01e562a03b70c4f5fa81f644ea6cf9a5 100644 (file)
--- a/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
+++ b/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
@@ -104,7 +104,7 @@ FvbEraseBlock (
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
   IN UINTN                                Instance,\r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
   IN UINTN                                Instance,\r

-  IN OUT EFI_FVB_ATTRIBUTES               *Attributes,\r
+  IN OUT EFI_FVB_ATTRIBUTES_2               *Attributes,\r

   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r


@@ -113,7 +113,7 @@ FvbSetVolumeAttributes (
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
   IN UINTN                                Instance,\r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
   IN UINTN                                Instance,\r

-  OUT EFI_FVB_ATTRIBUTES                  *Attributes,\r
+  OUT EFI_FVB_ATTRIBUTES_2                  *Attributes,\r

   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r


@@ -164,7 +164,7 @@ EFI_STATUS
 EFIAPI\r
 FvbProtocolGetAttributes (\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
 EFIAPI\r
 FvbProtocolGetAttributes (\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r

-  OUT EFI_FVB_ATTRIBUTES                          *Attributes\r
+  OUT EFI_FVB_ATTRIBUTES_2                          *Attributes\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -172,7 +172,7 @@ EFI_STATUS
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r

-  IN OUT EFI_FVB_ATTRIBUTES                       *Attributes\r
+  IN OUT EFI_FVB_ATTRIBUTES_2                       *Attributes\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index dd657d474902f63fe38b67362a2a150b44d872d8..0ca6b95db700d831172f336bccff3f28b9a35f3f 100644 (file)
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -181,6 +181,10 @@
   UnixLib|UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf\r
   OemHookStatusCodeLib|UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf\r
   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
   UnixLib|UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf\r
   OemHookStatusCodeLib|UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf\r
   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r

+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
+  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
+  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
+  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r

 \r
 [LibraryClasses.common.DXE_DRIVER]\r
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
 \r
 [LibraryClasses.common.DXE_DRIVER]\r
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index b662fd8861df2c5c4b33d10bc84cc95f7adede1a..aca7a3ab0e93965091b2d67fa9f97dbbecfbf709 100644 (file)
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -152,8 +152,8 @@ APRIORI PEI {
   INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
   }\r
 APRIORI DXE {\r
   INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
   }\r
 APRIORI DXE {\r

-  INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf\r

   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r

+  INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf\r

   INF  UnixPkg/MetronomeDxe/Metronome.inf\r
   }\r
 INF  MdeModulePkg/Core/Pei/PeiMain.inf\r
   INF  UnixPkg/MetronomeDxe/Metronome.inf\r
   }\r
 INF  MdeModulePkg/Core/Pei/PeiMain.inf\r