In IdeBus driver block I/O read/write interface, it will always try to use UDMA mode...

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / IdeBus / Dxe / DriverConfiguration.c

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