[edk2] [PATCH] IntelFrameworkModulePkg: Remove redundant definitions and functions

shenglei posted 1 patch 5 years, 7 months ago
Failed in applying to current master (apply log)
.../Bus/Isa/IsaIoDxe/IsaDriver.h              |   1 -
.../Bus/Isa/IsaIoDxe/IsaIoDxe.inf             |   1 -
.../Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c    |  18 --
.../Bus/Pci/IdeBusDxe/Ata.c                   | 105 ------------
.../Bus/Pci/IdeBusDxe/DriverConfiguration.c   | 156 ------------------
.../Csm/BiosThunk/Snp16Dxe/PxeUndi.c          |  66 +-------
.../Csm/LegacyBiosDxe/LegacyBiosDxe.inf       |   2 -
.../Csm/LegacyBiosDxe/LegacyBiosInterface.h   |   2 -
.../Universal/BdsDxe/BootMaint/BmLib.c        |  24 ---
.../Universal/BdsDxe/BootMaint/BootOption.c   |  52 ------
.../Universal/BdsDxe/BootMaint/Variable.c     |  58 -------
.../Universal/BdsDxe/FrontPage.c              |  18 --
12 files changed, 1 insertion(+), 502 deletions(-)
[edk2] [PATCH] IntelFrameworkModulePkg: Remove redundant definitions and functions
Posted by shenglei 5 years, 7 months ago
Some dead code functions and redundant definitions
have been removed in inf, .c and .h files.

https://bugzilla.tianocore.org/show_bug.cgi?id=1063

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
 .../Bus/Isa/IsaIoDxe/IsaDriver.h              |   1 -
 .../Bus/Isa/IsaIoDxe/IsaIoDxe.inf             |   1 -
 .../Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c    |  18 --
 .../Bus/Pci/IdeBusDxe/Ata.c                   | 105 ------------
 .../Bus/Pci/IdeBusDxe/DriverConfiguration.c   | 156 ------------------
 .../Csm/BiosThunk/Snp16Dxe/PxeUndi.c          |  66 +-------
 .../Csm/LegacyBiosDxe/LegacyBiosDxe.inf       |   2 -
 .../Csm/LegacyBiosDxe/LegacyBiosInterface.h   |   2 -
 .../Universal/BdsDxe/BootMaint/BmLib.c        |  24 ---
 .../Universal/BdsDxe/BootMaint/BootOption.c   |  52 ------
 .../Universal/BdsDxe/BootMaint/Variable.c     |  58 -------
 .../Universal/BdsDxe/FrontPage.c              |  18 --
 12 files changed, 1 insertion(+), 502 deletions(-)

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h
index 9639d18318..6b1aaeda0e 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h
@@ -24,7 +24,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/IsaIo.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/DriverBinding.h>
-#include <Protocol/GenericMemoryTest.h>
 #include <Guid/StatusCodeDataTypeId.h>
 
 #include <Library/DebugLib.h>
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
index 6f02aea7af..247c66151b 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf
@@ -62,7 +62,6 @@
   gEfiSioProtocolGuid                           ## TO_START
   gEfiPciIoProtocolGuid                         ## TO_START
   gEfiDevicePathProtocolGuid                    ## TO_START
-  gEfiGenericMemTestProtocolGuid                ## TO_START
 
 [Pcd]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures  ## CONSUMES
diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index 78c4e3b391..404e99241c 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
@@ -1856,24 +1856,6 @@ Done:
   @return status of issuing disable command
 
 **/
-EFI_STATUS
-DisableKeyboard (
-  IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn
-  )
-{
-  EFI_STATUS  Status;
-
-  //
-  // Disable keyboard interface
-  //
-  Status = KeyboardCommand (ConsoleIn, KEYBOARD_8042_COMMAND_DISABLE_KEYBOARD_INTERFACE);
-  if (EFI_ERROR (Status)) {
-    KeyboardError (ConsoleIn, L"\n\r");
-    return EFI_DEVICE_ERROR;
-  }
-
-  return Status;
-}
 
 /**
   Check whether there is Ps/2 Keyboard device in system by 0xF4 Keyboard Command
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
index 7819773f38..6e84800ed6 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
@@ -2691,109 +2691,4 @@ AtaNonDataCommandIn (
   @retval  EFI_DEVICE_ERROR Device status error.
 
 **/
-EFI_STATUS
-AtaNonDataCommandInExt (
-  IN  IDE_BLK_IO_DEV  *IdeDev,
-  IN  UINT8           AtaCommand,
-  IN  UINT8           Device,
-  IN  UINT16          Feature,
-  IN  UINT16          SectorCount,
-  IN  EFI_LBA         LbaAddress
-  )
-{
-  EFI_STATUS  Status;
-  UINT8       StatusRegister;
-  UINT8       SectorCount8;
-  UINT8       Feature8;
-  UINT8       LbaLow;
-  UINT8       LbaMid;
-  UINT8       LbaHigh;
-
-  Status = WaitForBSYClear (IdeDev, ATATIMEOUT);
-  if (EFI_ERROR (Status)) {
-    return EFI_DEVICE_ERROR;
-  }
-
-  //
-  // Select device (bit4), set LBA mode(bit6) (use 0xe0 for compatibility)
-  //
-  IDEWritePortB (
-    IdeDev->PciIo,
-    IdeDev->IoPort->Head,
-    (UINT8) ((IdeDev->Device << 4) | 0xe0)
-    );
-
-  //
-  // ATA commands for ATA device must be issued when DRDY is set
-  //
-  Status = DRDYReady (IdeDev, ATATIMEOUT);
-  if (EFI_ERROR (Status)) {
-    return EFI_DEVICE_ERROR;
-  }
-
-  //
-  // Pass parameter into device register block
-  //
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Head, Device);
-
-  //
-  // Fill the feature register, which is a two-byte FIFO. Need write twice.
-  //
-  Feature8 = (UINT8) (Feature >> 8);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, Feature8);
-
-  Feature8 = (UINT8) Feature;
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg1.Feature, Feature8);
-
-  //
-  // Fill the sector count register, which is a two-byte FIFO. Need write twice.
-  //
-  SectorCount8 = (UINT8) (SectorCount >> 8);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->SectorCount, SectorCount8);
-
-  SectorCount8 = (UINT8) SectorCount;
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->SectorCount, SectorCount8);
-
-  //
-  // Fill the start LBA registers, which are also two-byte FIFO
-  //
-  LbaLow  = (UINT8) RShiftU64 (LbaAddress, 24);
-  LbaMid  = (UINT8) RShiftU64 (LbaAddress, 32);
-  LbaHigh = (UINT8) RShiftU64 (LbaAddress, 40);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->SectorNumber, LbaLow);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->CylinderLsb, LbaMid);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->CylinderMsb, LbaHigh);
-
-  LbaLow  = (UINT8) LbaAddress;
-  LbaMid  = (UINT8) RShiftU64 (LbaAddress, 8);
-  LbaHigh = (UINT8) RShiftU64 (LbaAddress, 16);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->SectorNumber, LbaLow);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->CylinderLsb, LbaMid);
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->CylinderMsb, LbaHigh);
-
-  //
-  // Send command via Command Register
-  //
-  IDEWritePortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Command, AtaCommand);
-
-  //
-  // Wait for command completion
-  //
-  Status = WaitForBSYClear (IdeDev, ATATIMEOUT);
-  if (EFI_ERROR (Status)) {
-    return EFI_DEVICE_ERROR;
-  }
-
-  StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status);
-  if ((StatusRegister & ATA_STSREG_ERR) == ATA_STSREG_ERR) {
-    //
-    // Failed to execute command, abort operation
-    //
-    return EFI_ABORTED;
-  }
-
-  return EFI_SUCCESS;
-}
-
-
 
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
index 3a5d3c6f6b..1e05f266ed 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
@@ -41,43 +41,6 @@ EFI_DRIVER_CONFIGURATION_PROTOCOL gIDEBusDriverConfiguration = {
   @retval  EFI_NOT_FOUND Get an 'N' or 'n' inputed..
 
 **/
-EFI_STATUS
-GetResponse (
-  VOID
-  )
-{
-  EFI_STATUS    Status;
-  EFI_INPUT_KEY Key;
-
-  while (TRUE) {
-    Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
-    if (!EFI_ERROR (Status)) {
-      if (Key.ScanCode == SCAN_ESC) {
-        return EFI_ABORTED;
-      }
-
-      switch (Key.UnicodeChar) {
-
-      //
-      // fall through
-      //
-      case L'y':
-      case L'Y':
-        gST->ConOut->OutputString (gST->ConOut, L"Y\n");
-        return EFI_SUCCESS;
-
-      //
-      // fall through
-      //
-      case L'n':
-      case L'N':
-        gST->ConOut->OutputString (gST->ConOut, L"N\n");
-        return EFI_NOT_FOUND;
-      }
-
-    }
-  }
-}
 
 /**
   Allows the user to set controller specific options for a controller that a
@@ -113,70 +76,6 @@ GetResponse (
   @retval  EFI_OUT_RESOURCES     There are not enough resources available to set the configuration options for the
                                  controller specified by ControllerHandle and ChildHandle
 **/
-EFI_STATUS
-EFIAPI
-IDEBusDriverConfigurationSetOptions (
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
-  IN  EFI_HANDLE                                             ControllerHandle,
-  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,
-  IN  CHAR8                                                  *Language,
-  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired
-  )
-{
-  EFI_STATUS  Status;
-  UINT8       Value;
-  UINT8       NewValue;
-  UINTN       DataSize;
-  UINTN       Index;
-
-  if (ChildHandle != NULL) {
-    return EFI_UNSUPPORTED;
-  }
-
-  *ActionRequired = EfiDriverConfigurationActionNone;
-
-  DataSize        = sizeof (Value);
-  Status = gRT->GetVariable (
-                  L"Configuration",
-                  &gEfiCallerIdGuid,
-                  NULL,
-                  &DataSize,
-                  &Value
-                  );
-
-  gST->ConOut->OutputString (gST->ConOut, L"IDE Bus Driver Configuration\n");
-  gST->ConOut->OutputString (gST->ConOut, L"===============================\n");
-
-  NewValue = 0;
-  for (Index = 0; Index < 4; Index++) {
-    gST->ConOut->OutputString (gST->ConOut, OptionString[Index]);
-
-    Status = GetResponse ();
-    if (Status == EFI_ABORTED) {
-      return EFI_SUCCESS;
-    }
-
-    if (!EFI_ERROR (Status)) {
-      NewValue = (UINT8) (NewValue | (1 << Index));
-    }
-  }
-
-  if (EFI_ERROR (Status) || (NewValue != Value)) {
-    gRT->SetVariable (
-          L"Configuration",
-          &gEfiCallerIdGuid,
-          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
-          sizeof (NewValue),
-          &NewValue
-          );
-
-    *ActionRequired = EfiDriverConfigurationActionRestartController;
-  } else {
-    *ActionRequired = EfiDriverConfigurationActionNone;
-  }
-
-  return EFI_SUCCESS;
-}
 
 /**
   Tests to see if a controller's current configuration options are valid.
@@ -201,36 +100,7 @@ IDEBusDriverConfigurationSetOptions (
                                  managed by the driver specified by This has an invalid set of configuration
                                  options.
 **/
-EFI_STATUS
-EFIAPI
-IDEBusDriverConfigurationOptionsValid (
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,
-  IN  EFI_HANDLE                                      ControllerHandle,
-  IN  EFI_HANDLE                                      ChildHandle  OPTIONAL
-  )
-{
-  EFI_STATUS  Status;
-  UINT8       Value;
-  UINTN       DataSize;
-
-  if (ChildHandle != NULL) {
-    return EFI_UNSUPPORTED;
-  }
 
-  DataSize = sizeof (Value);
-  Status = gRT->GetVariable (
-                  L"Configuration",
-                  &gEfiCallerIdGuid,
-                  NULL,
-                  &DataSize,
-                  &Value
-                  );
-  if (EFI_ERROR (Status) || Value > 0x0f) {
-    return EFI_DEVICE_ERROR;
-  }
-
-  return EFI_SUCCESS;
-}
 /**
   Forces a driver to set the default configuration options for a controller.
 
@@ -263,30 +133,4 @@ IDEBusDriverConfigurationOptionsValid (
   @retval  EFI_OUT_RESOURCES     There are not enough resources available to force the default configuration
                                  options on the controller specified by ControllerHandle and ChildHandle.
 **/
-EFI_STATUS
-EFIAPI
-IDEBusDriverConfigurationForceDefaults (
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
-  IN  EFI_HANDLE                                             ControllerHandle,
-  IN  EFI_HANDLE                                             ChildHandle  OPTIONAL,
-  IN  UINT32                                                 DefaultType,
-  OUT EFI_DRIVER_CONFIGURATION_ACTION_REQUIRED               *ActionRequired
-  )
-{
-  UINT8 Value;
-
-  if (ChildHandle != NULL) {
-    return EFI_UNSUPPORTED;
-  }
 
-  Value = 0x0f;
-  gRT->SetVariable (
-        L"Configuration",
-        &gEfiCallerIdGuid,
-        EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
-        sizeof (Value),
-        &Value
-        );
-  *ActionRequired = EfiDriverConfigurationActionRestartController;
-  return EFI_SUCCESS;
-}
diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c
index d1435798c0..0613a50322 100644
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c
@@ -591,19 +591,6 @@ PxeUndiTransmit (
 
   @return Return value of PXE option ROM far call.
 **/
-EFI_STATUS
-PxeUndiSetMcastAddr (
-  IN     EFI_SIMPLE_NETWORK_DEV       *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_SET_MCAST_ADDR_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_SET_MCAST_ADDR_T),
-          PXENV_UNDI_SET_MCAST_ADDR
-          );
-}
 
 /**
   PXE
@@ -674,19 +661,6 @@ PxeUndiSetStationAddr (
 
   @return Return value of PXE option ROM far call.
 **/
-EFI_STATUS
-PxeUndiSetPacketFilter (
-  IN     EFI_SIMPLE_NETWORK_DEV          *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_SET_PACKET_FILTER_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_SET_PACKET_FILTER_T),
-          PXENV_UNDI_SET_PACKET_FILTER
-          );
-}
 
 /**
   PXE
@@ -863,19 +837,6 @@ PxeUndiClearStatistics (
 
   @return Return value of PXE option ROM far call.
 **/
-EFI_STATUS
-PxeUndiInitiateDiags (
-  IN     EFI_SIMPLE_NETWORK_DEV       *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_INITIATE_DIAGS_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_INITIATE_DIAGS_T),
-          PXENV_UNDI_INITIATE_DIAGS
-          );
-}
 
 /**
   PXE
@@ -907,19 +868,6 @@ PxeUndiInitiateDiags (
 
   @return Return value of PXE option ROM far call.
 **/
-EFI_STATUS
-PxeUndiForceInterrupt (
-  IN     EFI_SIMPLE_NETWORK_DEV        *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_FORCE_INTERRUPT_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_FORCE_INTERRUPT_T),
-          PXENV_UNDI_FORCE_INTERRUPT
-          );
-}
 
 /**
   PXE
@@ -1239,16 +1187,4 @@ PxeUndiStop (
 
   @return Return value of PXE option ROM far call.
 **/
-EFI_STATUS
-PxeUndiGetState (
-  IN     EFI_SIMPLE_NETWORK_DEV  *SimpleNetworkDevice,
-  IN OUT PXENV_UNDI_GET_STATE_T  *PxeUndiTable
-  )
-{
-  return MakePxeCall (
-          SimpleNetworkDevice,
-          PxeUndiTable,
-          sizeof (PXENV_UNDI_GET_STATE_T),
-          PXENV_UNDI_GET_STATE
-          );
-}
+
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
index 6eb01fc185..6d156a4123 100644
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
+++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
@@ -72,8 +72,6 @@
   DxeServicesTableLib
   PcdLib
   ReportStatusCodeLib
-  PeCoffLib
-  CacheMaintenanceLib
   DebugAgentLib
 
 [LibraryClasses.IA32]
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
index 1e84772688..7779427f68 100644
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
+++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
@@ -63,8 +63,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PcdLib.h>
 #include <Library/DevicePathLib.h>
 #include <Library/DxeServicesTableLib.h>
-#include <Library/PeCoffLib.h>
-#include <Library/CacheMaintenanceLib.h>
 #include <Library/DebugAgentLib.h>
 
 //
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
index d27113c015..f2a20ec2a3 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
@@ -335,30 +335,6 @@ EfiDevicePathInstanceCount (
   @retval   NULL  Allocation failed.
 
 **/
-VOID *
-EfiReallocatePool (
-  IN VOID                 *OldPool,
-  IN UINTN                OldSize,
-  IN UINTN                NewSize
-  )
-{
-  VOID  *NewPool;
-
-  NewPool = NULL;
-  if (NewSize != 0) {
-    NewPool = AllocateZeroPool (NewSize);
-  }
-
-  if (OldPool != NULL) {
-    if (NewPool != NULL) {
-      CopyMem (NewPool, OldPool, OldSize < NewSize ? OldSize : NewSize);
-    }
-
-    FreePool (OldPool);
-  }
-
-  return NewPool;
-}
 
 /**
   Get a string from the Data Hub record based on
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index 895f13f214..731e7b7c90 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -1203,58 +1203,6 @@ BOpt_IsEfiImageName (
   @retval FALSE     not a valid Efi Application
 
 **/
-BOOLEAN
-BOpt_IsEfiApp (
-  IN EFI_FILE_HANDLE Dir,
-  IN UINT16          *FileName
-  )
-{
-  UINTN                       BufferSize;
-  EFI_IMAGE_DOS_HEADER        DosHdr;
-  UINT16                      Subsystem;
-  EFI_FILE_HANDLE             File;
-  EFI_STATUS                  Status;
-  EFI_IMAGE_OPTIONAL_HEADER_UNION PeHdr;
-
-  Status = Dir->Open (Dir, &File, FileName, EFI_FILE_MODE_READ, 0);
-
-  if (EFI_ERROR (Status)) {
-    return FALSE;
-  }
-
-  BufferSize = sizeof (EFI_IMAGE_DOS_HEADER);
-  File->Read (File, &BufferSize, &DosHdr);
-  if (DosHdr.e_magic != EFI_IMAGE_DOS_SIGNATURE) {
-    File->Close (File);
-    return FALSE;
-  }
-
-  File->SetPosition (File, DosHdr.e_lfanew);
-  BufferSize = sizeof (EFI_IMAGE_OPTIONAL_HEADER_UNION);
-  File->Read (File, &BufferSize, &PeHdr);
-  if (PeHdr.Pe32.Signature != EFI_IMAGE_NT_SIGNATURE) {
-    File->Close (File);
-    return FALSE;
-  }
-  //
-  // Determine PE type and read subsytem
-  //
-  if (PeHdr.Pe32.OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
-    Subsystem = PeHdr.Pe32.OptionalHeader.Subsystem;
-  } else if (PeHdr.Pe32.OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
-    Subsystem = PeHdr.Pe32Plus.OptionalHeader.Subsystem;
-  } else {
-    return FALSE;
-  }
-
-  if (Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION) {
-    File->Close (File);
-    return TRUE;
-  } else {
-    File->Close (File);
-    return FALSE;
-  }
-}
 
 /**
 
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index ea798fab9d..e5c48b0eac 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -318,64 +318,6 @@ Var_ChangeDriverOrder (
   set.
 
 **/
-VOID
-Var_UpdateAllConsoleOption (
-  VOID
-  )
-{
-  EFI_DEVICE_PATH_PROTOCOL  *OutDevicePath;
-  EFI_DEVICE_PATH_PROTOCOL  *InpDevicePath;
-  EFI_DEVICE_PATH_PROTOCOL  *ErrDevicePath;
-  EFI_STATUS                Status;
-
-  OutDevicePath = EfiLibGetVariable (L"ConOut", &gEfiGlobalVariableGuid);
-  InpDevicePath = EfiLibGetVariable (L"ConIn", &gEfiGlobalVariableGuid);
-  ErrDevicePath = EfiLibGetVariable (L"ErrOut", &gEfiGlobalVariableGuid);
-  if (OutDevicePath != NULL) {
-    ChangeVariableDevicePath (OutDevicePath);
-    Status = gRT->SetVariable (
-                    L"ConOut",
-                    &gEfiGlobalVariableGuid,
-                    EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                    GetDevicePathSize (OutDevicePath),
-                    OutDevicePath
-                    );
-    //
-    // Changing variable without increasing its size with current variable implementation shouldn't fail.
-    //
-    ASSERT_EFI_ERROR (Status);
-  }
-
-  if (InpDevicePath != NULL) {
-    ChangeVariableDevicePath (InpDevicePath);
-    Status = gRT->SetVariable (
-                    L"ConIn",
-                    &gEfiGlobalVariableGuid,
-                    EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                    GetDevicePathSize (InpDevicePath),
-                    InpDevicePath
-                    );
-    //
-    // Changing variable without increasing its size with current variable implementation shouldn't fail.
-    //
-    ASSERT_EFI_ERROR (Status);
-  }
-
-  if (ErrDevicePath != NULL) {
-    ChangeVariableDevicePath (ErrDevicePath);
-    Status = gRT->SetVariable (
-                    L"ErrOut",
-                    &gEfiGlobalVariableGuid,
-                    EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                    GetDevicePathSize (ErrDevicePath),
-                    ErrDevicePath
-                    );
-    //
-    // Changing variable without increasing its size with current variable implementation shouldn't fail.
-    //
-    ASSERT_EFI_ERROR (Status);
-  }
-}
 
 /**
   This function delete and build multi-instance device path for
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index bdf63eabbf..af30808163 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -580,24 +580,6 @@ CallFrontPage (
   @retval  EFI_SUCCESS  The function returns EFI_SUCCESS always.
 
 **/
-EFI_STATUS
-GetProducerString (
-  IN      EFI_GUID                  *ProducerGuid,
-  IN      EFI_STRING_ID             Token,
-  OUT     CHAR16                    **String
-  )
-{
-  EFI_STRING      TmpString;
-
-  TmpString = HiiGetPackageString (ProducerGuid, Token, NULL);
-  if (TmpString == NULL) {
-    *String = GetStringById (STRING_TOKEN (STR_MISSING_STRING));
-  } else {
-    *String = TmpString;
-  }
-
-  return EFI_SUCCESS;
-}
 
 /**
   Convert Processor Frequency Data to a string.
-- 
2.18.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] IntelFrameworkModulePkg: Remove redundant definitions and functions
Posted by Laszlo Ersek 5 years, 7 months ago
On 08/06/18 04:54, shenglei wrote:
> Some dead code functions and redundant definitions
> have been removed in inf, .c and .h files.
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=1063
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: shenglei <shenglei.zhang@intel.com>
> ---
>  .../Bus/Isa/IsaIoDxe/IsaDriver.h              |   1 -
>  .../Bus/Isa/IsaIoDxe/IsaIoDxe.inf             |   1 -
>  .../Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c    |  18 --
>  .../Bus/Pci/IdeBusDxe/Ata.c                   | 105 ------------
>  .../Bus/Pci/IdeBusDxe/DriverConfiguration.c   | 156 ------------------
>  .../Csm/BiosThunk/Snp16Dxe/PxeUndi.c          |  66 +-------
>  .../Csm/LegacyBiosDxe/LegacyBiosDxe.inf       |   2 -
>  .../Csm/LegacyBiosDxe/LegacyBiosInterface.h   |   2 -
>  .../Universal/BdsDxe/BootMaint/BmLib.c        |  24 ---
>  .../Universal/BdsDxe/BootMaint/BootOption.c   |  52 ------
>  .../Universal/BdsDxe/BootMaint/Variable.c     |  58 -------
>  .../Universal/BdsDxe/FrontPage.c              |  18 --
>  12 files changed, 1 insertion(+), 502 deletions(-)

Please split this patch to a series as well (see
<https://lists.01.org/pipermail/edk2-devel/2018-August/028059.html> for
my reasoning).

Thanks
Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel