MdePkg, MdeModulePkg: Remove EFI_NOT_FOUND from I2C IO protocol

[mirror_edk2.git] / MdeModulePkg / Bus / I2c / I2cDxe / I2cBus.c

diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
index 3da1474edc009c8957d65a96ba708ee4c4d7369e..c1634c9716459b2ae302985c41d592575d9e85dc 100644 (file)
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
+++ b/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
@@ -2,7 +2,7 @@
   This file implements I2C IO Protocol which enables the user to manipulate a single \r
   I2C device independent of the host controller and I2C design.\r
 \r
-  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2014, 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
@@ -1115,7 +1115,6 @@ RegisterI2cDevice (
   @retval EFI_DEVICE_ERROR      There was an I2C error (NACK) during the\r
                                 transaction.\r
   @retval EFI_INVALID_PARAMETER RequestPacket is NULL\r
-  @retval EFI_NOT_FOUND         Reserved bit set in the SlaveAddress parameter\r
   @retval EFI_NO_MAPPING        The EFI_I2C_HOST_PROTOCOL could not set the\r
                                 bus configuration required to access this I2C\r
                                 device.\r
@@ -1408,6 +1407,8 @@ I2cBusUnload (
   EFI_HANDLE                        *DeviceHandleBuffer;\r
   UINTN                             DeviceHandleCount;\r
   UINTN                             Index;\r
+  EFI_COMPONENT_NAME_PROTOCOL       *ComponentName;\r
+  EFI_COMPONENT_NAME2_PROTOCOL      *ComponentName2;\r
 \r
   //\r
   // Get the list of all I2C Controller handles in the handle database.\r
@@ -1422,22 +1423,20 @@ I2cBusUnload (
                   &DeviceHandleBuffer\r
                   );\r
 \r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-\r
-  //\r
-  // Disconnect the driver specified by Driver BindingHandle from all\r
-  // the devices in the handle database.\r
-  //\r
-  for (Index = 0; Index < DeviceHandleCount; Index++) {\r
-    Status = gBS->DisconnectController (\r
-                    DeviceHandleBuffer[Index],\r
-                    gI2cBusDriverBinding.DriverBindingHandle,\r
-                    NULL\r
-                    );\r
-    if (EFI_ERROR (Status)) {\r
-      goto Done;\r
+  if (!EFI_ERROR (Status)) {\r
+    //\r
+    // Disconnect the driver specified by Driver BindingHandle from all\r
+    // the devices in the handle database.\r
+    //\r
+    for (Index = 0; Index < DeviceHandleCount; Index++) {\r
+      Status = gBS->DisconnectController (\r
+                      DeviceHandleBuffer[Index],\r
+                      gI2cBusDriverBinding.DriverBindingHandle,\r
+                      NULL\r
+                      );\r
+      if (EFI_ERROR (Status)) {\r
+        goto Done;\r
+      }\r
     }\r
   }\r
 \r
@@ -1448,14 +1447,47 @@ I2cBusUnload (
                   gI2cBusDriverBinding.DriverBindingHandle,\r
                   &gEfiDriverBindingProtocolGuid,\r
                   &gI2cBusDriverBinding,\r
-                  &gEfiComponentNameProtocolGuid,\r
-                  &gI2cBusComponentName,\r
-                  &gEfiComponentName2ProtocolGuid,\r
-                  &gI2cBusComponentName2,\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  //\r
+  // Note we have to one by one uninstall the following protocols.\r
+  // It's because some of them are optionally installed based on\r
+  // the following PCD settings.\r
+  //   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable\r
+  //   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable\r
+  //   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable\r
+  //   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable\r
+  //\r
+  Status = gBS->HandleProtocol (\r
+                  gI2cBusDriverBinding.DriverBindingHandle,\r
+                  &gEfiComponentNameProtocolGuid,\r
+                  (VOID **) &ComponentName\r
+                  );\r
+  if (!EFI_ERROR (Status)) {\r
+    gBS->UninstallProtocolInterface (\r
+           gI2cBusDriverBinding.DriverBindingHandle,\r
+           &gEfiComponentNameProtocolGuid,\r
+           ComponentName\r
+           );\r
+  }\r
+\r
+  Status = gBS->HandleProtocol (\r
+                  gI2cBusDriverBinding.DriverBindingHandle,\r
+                  &gEfiComponentName2ProtocolGuid,\r
+                  (VOID **) &ComponentName2\r
+                  );\r
+  if (!EFI_ERROR (Status)) {\r
+    gBS->UninstallProtocolInterface (\r
+           gI2cBusDriverBinding.DriverBindingHandle,\r
+           &gEfiComponentName2ProtocolGuid,\r
+           ComponentName2\r
+           );\r
+  }\r
+\r
+  Status = EFI_SUCCESS;\r
+\r
 Done:\r
   //\r
   // Free the buffer containing the list of handles from the handle database\r