X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FBus%2FPci%2FIdeBus%2FDxe%2FDriverConfiguration.c;h=7ee2ab3c390680ff4ff1cb50fd5dc0f53eaef144;hp=dfe134a2ee860a74fcf2b95689372a942aa3d422;hb=bc4e770c78d692a5a2641359f605d6e83c96da5d;hpb=ed72955cc855cd232ba75ff8dde334569f90f913

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c
index dfe134a2ee..7ee2ab3c39 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/DriverConfiguration.c
@@ -18,33 +18,6 @@ CHAR16 *OptionString[4] = {
   L"Enable Secondary Master  (Y/N)? -->",
   L"Enable Secondary Slave   (Y/N)? -->"
 };
-//
-// EFI Driver Configuration Functions
-//
-EFI_STATUS
-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
-IDEBusDriverConfigurationOptionsValid (
-  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,
-  IN  EFI_HANDLE                                      ControllerHandle,
-  IN  EFI_HANDLE                                      ChildHandle  OPTIONAL
-  );
-
-EFI_STATUS
-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
-  );
 
 //
 // EFI Driver Configuration Protocol
@@ -64,6 +37,7 @@ EFI_DRIVER_CONFIGURATION_PROTOCOL gIDEBusDriverConfiguration = {
   @retval  EFI_NOT_FOUND TODO: Add description for return value
 
 **/
+STATIC
 EFI_STATUS
 GetResponse (
   VOID
@@ -161,7 +135,6 @@ IDEBusDriverConfigurationSetOptions (
   UINT8       NewValue;
   UINTN       DataSize;
   UINTN       Index;
-  UINT32      Attributes;
 
   if (ChildHandle != NULL) {
     return EFI_UNSUPPORTED;
@@ -173,7 +146,7 @@ IDEBusDriverConfigurationSetOptions (
   Status = gRT->GetVariable (
                   L"Configuration",
                   &gEfiCallerIdGuid,
-                  &Attributes,
+                  NULL,
                   &DataSize,
                   &Value
                   );
@@ -191,7 +164,7 @@ IDEBusDriverConfigurationSetOptions (
     }
 
     if (!EFI_ERROR (Status)) {
-      NewValue |= (UINT8) (1 << Index);
+      NewValue = (UINT8) (NewValue | (1 << Index));
     }
   }
 
@@ -255,7 +228,6 @@ IDEBusDriverConfigurationOptionsValid (
   EFI_STATUS  Status;
   UINT8       Value;
   UINTN       DataSize;
-  UINT32      Attributes;
 
   if (ChildHandle != NULL) {
     return EFI_UNSUPPORTED;
@@ -265,7 +237,7 @@ IDEBusDriverConfigurationOptionsValid (
   Status = gRT->GetVariable (
                   L"Configuration",
                   &gEfiCallerIdGuid,
-                  &Attributes,
+                  NULL,
                   &DataSize,
                   &Value
                   );