Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / Library / UefiDriverModelLib / UefiDriverModelLib.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.c
index cd8da602b8a02f1ce3cb8d974d59c2bf573a94d0..c82736c74be3280182f874e7fbdef669a1b898ff 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiDriverModelLib/UefiDriverModelLib.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -22,13 +22,6 @@ Abstract:
 \r
 #include "EdkIIGlueUefi.h"\r
 \r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
-  #define EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID  gEfiComponentName2ProtocolGuid\r
-  #define EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL       EFI_COMPONENT_NAME2_PROTOCOL\r
-#else\r
-  #define EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID  gEfiComponentNameProtocolGuid\r
-  #define EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL       EFI_COMPONENT_NAME_PROTOCOL\r
-#endif\r
 \r
 /**\r
   The constructor function installs the standard EFI Driver Model Protocols.\r
@@ -46,7 +39,7 @@ UefiDriverModelLibConstructor (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
+  EFI_STATUS                   Status = EFI_UNSUPPORTED;\r
   EFI_HANDLE                   DriverBindingHandle;\r
   EFI_DRIVER_BINDING_PROTOCOL  *DriverBinding;\r
 \r
@@ -60,16 +53,17 @@ UefiDriverModelLibConstructor (
   // EdkIIGlueLib: _gDriverModelProtocolListEntries is always 1\r
   //\r
 \r
-    //\r
-    // The Driver Binding Protocol must never be NULL\r
-    //\r
-    ASSERT(_gDriverModelProtocolList[0].DriverBinding != NULL);\r
+  //\r
+  // The Driver Binding Protocol must never be NULL\r
+  //\r
+  ASSERT(_gDriverModelProtocolList[0].DriverBinding != NULL);\r
 \r
-    //\r
-    // Check for all 8 possible combinations of the ComponentName, DriverConfiguration, and DriverDiagnostics Protocol\r
-    // These are all checks against const pointers, so the optimizing compiler will only select one of the\r
-    // calls to InstallMultipleProtocolInterfaces()\r
-    //\r
+  //\r
+  // Check for all 8 possible combinations of the ComponentName, DriverConfiguration, and DriverDiagnostics Protocol\r
+  // These are all checks against const pointers, so the optimizing compiler will only select one of the\r
+  // calls to InstallMultipleProtocolInterfaces()\r
+  //\r
+  if ((_gEdkIIGlueDriverModelProtocolSelection == 1) || (_gEdkIIGlueDriverModelProtocolSelection == 3)) {\r
     if (_gDriverModelProtocolList[0].DriverDiagnostics == NULL) {\r
       if (_gDriverModelProtocolList[0].DriverConfiguration == NULL) {\r
         if (_gDriverModelProtocolList[0].ComponentName == NULL) {\r
@@ -82,7 +76,7 @@ UefiDriverModelLibConstructor (
           Status = gBS->InstallMultipleProtocolInterfaces (\r
                           &DriverBindingHandle,\r
                           &gEfiDriverBindingProtocolGuid, (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
-                          &EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID, (EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
+                          &gEfiComponentNameProtocolGuid, (EFI_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
                           NULL\r
                           );\r
         }\r
@@ -98,7 +92,7 @@ UefiDriverModelLibConstructor (
           Status = gBS->InstallMultipleProtocolInterfaces (\r
                           &DriverBindingHandle,\r
                           &gEfiDriverBindingProtocolGuid,       (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
-                          &EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID,      (EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
+                          &gEfiComponentNameProtocolGuid,       (EFI_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
                           &gEfiDriverConfigurationProtocolGuid, (EFI_DRIVER_CONFIGURATION_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration,\r
                           NULL\r
                           );\r
@@ -117,7 +111,7 @@ UefiDriverModelLibConstructor (
           Status = gBS->InstallMultipleProtocolInterfaces (\r
                           &DriverBindingHandle,\r
                           &gEfiDriverBindingProtocolGuid,     (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
-                          &EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID,    (EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
+                          &gEfiComponentNameProtocolGuid,     (EFI_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
                           &gEfiDriverDiagnosticsProtocolGuid, (EFI_DRIVER_DIAGNOSTICS_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics,\r
                           NULL\r
                           );\r
@@ -135,7 +129,7 @@ UefiDriverModelLibConstructor (
           Status = gBS->InstallMultipleProtocolInterfaces (\r
                           &DriverBindingHandle,\r
                           &gEfiDriverBindingProtocolGuid,       (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
-                          &EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID,      (EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
+                          &gEfiComponentNameProtocolGuid,       (EFI_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
                           &gEfiDriverConfigurationProtocolGuid, (EFI_DRIVER_CONFIGURATION_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration,\r
                           &gEfiDriverDiagnosticsProtocolGuid,   (EFI_DRIVER_DIAGNOSTICS_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics,\r
                           NULL\r
@@ -143,18 +137,95 @@ UefiDriverModelLibConstructor (
         }\r
       }\r
     }\r
+  } // selection == 1 or 3\r
 \r
-    //\r
-    // ASSERT if the call to InstallMultipleProtocolInterfaces() failed\r
-    //\r
-    ASSERT_EFI_ERROR (Status);\r
+  if ((_gEdkIIGlueDriverModelProtocolSelection == 2) || (_gEdkIIGlueDriverModelProtocolSelection == 3)) {\r
+    if (_gDriverModelProtocolList[0].DriverDiagnostics2== NULL) {\r
+      if (_gDriverModelProtocolList[0].DriverConfiguration2== NULL) {\r
+        if (_gDriverModelProtocolList[0].ComponentName2== NULL) {\r
+          Status = gBS->InstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid, (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          NULL\r
+                          );\r
+        } else {\r
+          Status = gBS->InstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,  (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiComponentName2ProtocolGuid, (EFI_COMPONENT_NAME2_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName2,\r
+                          NULL\r
+                          );\r
+        }\r
+      } else {\r
+        if (_gDriverModelProtocolList[0].ComponentName2 == NULL) {\r
+          Status = gBS->InstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,        (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiDriverConfiguration2ProtocolGuid, (EFI_DRIVER_CONFIGURATION2_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration2,\r
+                          NULL\r
+                          );\r
+        } else {\r
+          Status = gBS->InstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,        (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiComponentName2ProtocolGuid,       (EFI_COMPONENT_NAME2_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName2,\r
+                          &gEfiDriverConfiguration2ProtocolGuid, (EFI_DRIVER_CONFIGURATION2_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration2,\r
+                          NULL\r
+                          );\r
+        }\r
+      }\r
+    } else {\r
+      if (_gDriverModelProtocolList[0].DriverConfiguration2 == NULL) {\r
+        if (_gDriverModelProtocolList[0].ComponentName2 == NULL) {\r
+          Status = gBS->InstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,      (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiDriverDiagnostics2ProtocolGuid, (EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics2,\r
+                          NULL\r
+                          );\r
+        } else {\r
+          Status = gBS->InstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,      (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiComponentName2ProtocolGuid,     (EFI_COMPONENT_NAME2_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName2,\r
+                          &gEfiDriverDiagnostics2ProtocolGuid, (EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics2,\r
+                          NULL\r
+                          );\r
+        }\r
+      } else {\r
+        if (_gDriverModelProtocolList[0].ComponentName2 == NULL) {\r
+          Status = gBS->InstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,        (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiDriverConfiguration2ProtocolGuid, (EFI_DRIVER_CONFIGURATION2_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration2,\r
+                          &gEfiDriverDiagnostics2ProtocolGuid,   (EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics2,\r
+                          NULL\r
+                          );\r
+        } else {\r
+          Status = gBS->InstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,        (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiComponentName2ProtocolGuid,       (EFI_COMPONENT_NAME2_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName2,\r
+                          &gEfiDriverConfiguration2ProtocolGuid, (EFI_DRIVER_CONFIGURATION2_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration2,\r
+                          &gEfiDriverDiagnostics2ProtocolGuid,   (EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics2,\r
+                          NULL\r
+                          );\r
+        }\r
+      }\r
+    }\r
+  } // selection == 2 or 3\r
 \r
-    //\r
-    // Update the ImageHandle and DriverBindingHandle fields of the Driver Binding Protocol\r
-    //\r
-    DriverBinding = (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding;\r
-    DriverBinding->ImageHandle         = ImageHandle;\r
-    DriverBinding->DriverBindingHandle = DriverBindingHandle;\r
+  //\r
+  // ASSERT if the call to InstallMultipleProtocolInterfaces() failed\r
+  //\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  //\r
+  // Update the ImageHandle and DriverBindingHandle fields of the Driver Binding Protocol\r
+  //\r
+  DriverBinding = (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding;\r
+  DriverBinding->ImageHandle         = ImageHandle;\r
+  DriverBinding->DriverBindingHandle = DriverBindingHandle;\r
 \r
   \r
   return EFI_SUCCESS;\r
@@ -176,7 +247,7 @@ UefiDriverModelLibDestructor (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
+  EFI_STATUS  Status = EFI_UNSUPPORTED;\r
   EFI_HANDLE  DriverBindingHandle;\r
 \r
   //\r
@@ -184,21 +255,22 @@ UefiDriverModelLibDestructor (
   // EdkIIGlueLib: _gDriverModelProtocolListEntries is always 1\r
   //\r
 \r
-    //\r
-    // The Driver Binding Protocol must never be NULL\r
-    //\r
-    ASSERT(_gDriverModelProtocolList[0].DriverBinding != NULL);\r
+  //\r
+  // The Driver Binding Protocol must never be NULL\r
+  //\r
+  ASSERT(_gDriverModelProtocolList[0].DriverBinding != NULL);\r
 \r
-    //\r
-    // Retrieve the DriverBindingHandle from the Driver Binding Protocol\r
-    //\r
-    DriverBindingHandle = _gDriverModelProtocolList[0].DriverBinding->DriverBindingHandle;\r
+  //\r
+  // Retrieve the DriverBindingHandle from the Driver Binding Protocol\r
+  //\r
+  DriverBindingHandle = _gDriverModelProtocolList[0].DriverBinding->DriverBindingHandle;\r
 \r
-    //\r
-    // Check for all 8 possible combinations of the ComponentName, DriverConfiguration, and DriverDiagnostics Protocol\r
-    // These are all checks against const pointers, so the optimizing compiler will only select one of the\r
-    // calls to InstallMultipleProtocolInterfaces()\r
-    //\r
+  //\r
+  // Check for all 8 possible combinations of the ComponentName, DriverConfiguration, and DriverDiagnostics Protocol\r
+  // These are all checks against const pointers, so the optimizing compiler will only select one of the\r
+  // calls to InstallMultipleProtocolInterfaces()\r
+  //\r
+  if ((_gEdkIIGlueDriverModelProtocolSelection == 1) || (_gEdkIIGlueDriverModelProtocolSelection == 3)) {\r
     if (_gDriverModelProtocolList[0].DriverDiagnostics == NULL) {\r
       if (_gDriverModelProtocolList[0].DriverConfiguration == NULL) {\r
         if (_gDriverModelProtocolList[0].ComponentName == NULL) {\r
@@ -211,7 +283,7 @@ UefiDriverModelLibDestructor (
           Status = gBS->UninstallMultipleProtocolInterfaces (\r
                           &DriverBindingHandle,\r
                           &gEfiDriverBindingProtocolGuid, (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
-                          &EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID, (EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
+                          &gEfiComponentNameProtocolGuid, (EFI_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
                           NULL\r
                           );\r
         }\r
@@ -227,7 +299,7 @@ UefiDriverModelLibDestructor (
           Status = gBS->UninstallMultipleProtocolInterfaces (\r
                           &DriverBindingHandle,\r
                           &gEfiDriverBindingProtocolGuid,       (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
-                          &EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID,      (EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
+                          &gEfiComponentNameProtocolGuid,       (EFI_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
                           &gEfiDriverConfigurationProtocolGuid, (EFI_DRIVER_CONFIGURATION_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration,\r
                           NULL\r
                           );\r
@@ -246,7 +318,7 @@ UefiDriverModelLibDestructor (
           Status = gBS->UninstallMultipleProtocolInterfaces (\r
                           &DriverBindingHandle,\r
                           &gEfiDriverBindingProtocolGuid,     (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
-                          &EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID,    (EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
+                          &gEfiComponentNameProtocolGuid,     (EFI_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
                           &gEfiDriverDiagnosticsProtocolGuid, (EFI_DRIVER_DIAGNOSTICS_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics,\r
                           NULL\r
                           );\r
@@ -264,7 +336,7 @@ UefiDriverModelLibDestructor (
           Status = gBS->UninstallMultipleProtocolInterfaces (\r
                           &DriverBindingHandle,\r
                           &gEfiDriverBindingProtocolGuid,       (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
-                          &EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL_GUID,      (EDKII_GLUE_SELECTED_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
+                          &gEfiComponentNameProtocolGuid,       (EFI_COMPONENT_NAME_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName,\r
                           &gEfiDriverConfigurationProtocolGuid, (EFI_DRIVER_CONFIGURATION_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration,\r
                           &gEfiDriverDiagnosticsProtocolGuid,   (EFI_DRIVER_DIAGNOSTICS_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics,\r
                           NULL\r
@@ -272,11 +344,88 @@ UefiDriverModelLibDestructor (
         }\r
       }\r
     }\r
+  } // selection == 1 or 3\r
+\r
+  if ((_gEdkIIGlueDriverModelProtocolSelection == 2) || (_gEdkIIGlueDriverModelProtocolSelection == 3)) {\r
+    if (_gDriverModelProtocolList[0].DriverDiagnostics2 == NULL) {\r
+      if (_gDriverModelProtocolList[0].DriverConfiguration2 == NULL) {\r
+        if (_gDriverModelProtocolList[0].ComponentName2 == NULL) {\r
+          Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                          DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid, (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          NULL\r
+                          );\r
+        } else {\r
+          Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid, (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiComponentName2ProtocolGuid, (EFI_COMPONENT_NAME2_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName2,\r
+                          NULL\r
+                          );\r
+        }\r
+      } else {\r
+        if (_gDriverModelProtocolList[0].ComponentName2 == NULL) {\r
+          Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,        (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiDriverConfiguration2ProtocolGuid, (EFI_DRIVER_CONFIGURATION2_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration2,\r
+                          NULL\r
+                          );\r
+        } else {\r
+          Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,        (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiComponentName2ProtocolGuid,       (EFI_COMPONENT_NAME2_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName2,\r
+                          &gEfiDriverConfiguration2ProtocolGuid, (EFI_DRIVER_CONFIGURATION2_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration2,\r
+                          NULL\r
+                          );\r
+        }\r
+      }\r
+    } else {\r
+      if (_gDriverModelProtocolList[0].DriverConfiguration2 == NULL) {\r
+        if (_gDriverModelProtocolList[0].ComponentName2 == NULL) {\r
+          Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,      (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiDriverDiagnostics2ProtocolGuid, (EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics2,\r
+                          NULL\r
+                          );\r
+        } else {\r
+          Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,      (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiComponentName2ProtocolGuid,     (EFI_COMPONENT_NAME2_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName2,\r
+                          &gEfiDriverDiagnostics2ProtocolGuid, (EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics2,\r
+                          NULL\r
+                          );\r
+        }\r
+      } else {\r
+        if (_gDriverModelProtocolList[0].ComponentName2 == NULL) {\r
+          Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,        (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiDriverConfiguration2ProtocolGuid, (EFI_DRIVER_CONFIGURATION2_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration2,\r
+                          &gEfiDriverDiagnostics2ProtocolGuid,   (EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics2,\r
+                          NULL\r
+                          );\r
+        } else {\r
+          Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                          &DriverBindingHandle,\r
+                          &gEfiDriverBindingProtocolGuid,        (EFI_DRIVER_BINDING_PROTOCOL *)_gDriverModelProtocolList[0].DriverBinding,\r
+                          &gEfiComponentName2ProtocolGuid,       (EFI_COMPONENT_NAME2_PROTOCOL *)_gDriverModelProtocolList[0].ComponentName2,\r
+                          &gEfiDriverConfiguration2ProtocolGuid, (EFI_DRIVER_CONFIGURATION2_PROTOCOL *)_gDriverModelProtocolList[0].DriverConfiguration2,\r
+                          &gEfiDriverDiagnostics2ProtocolGuid,   (EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *)_gDriverModelProtocolList[0].DriverDiagnostics2,\r
+                          NULL\r
+                          );\r
+        }\r
+      }\r
+    }\r
+  } // selection == 2 or 3\r
 \r
-    //\r
-    // ASSERT if the call to UninstallMultipleProtocolInterfaces() failed\r
-    //\r
-    ASSERT_EFI_ERROR (Status);\r
+  //\r
+  // ASSERT if the call to UninstallMultipleProtocolInterfaces() failed\r
+  //\r
+  ASSERT_EFI_ERROR (Status);\r
   \r
   return EFI_SUCCESS;\r
 }\r