tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check if component name protocol exist, uninstall it when it really exists. 

Signed-off-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15058 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Elvin Li 2014-01-08 03:47:43 +00:00 committed by li-elvin
parent 94caa81c35
commit 6f497f8f71
2 changed files with 80 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
View File

@ -2,7 +2,7 @@
This file implements I2C IO Protocol which enables the user to manipulate a single
I2C device independent of the host controller and I2C design.
Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -1408,6 +1408,8 @@ I2cBusUnload (
EFI_HANDLE *DeviceHandleBuffer;
UINTN DeviceHandleCount;
UINTN Index;
EFI_COMPONENT_NAME_PROTOCOL *ComponentName;
EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2;
//
// Get the list of all I2C Controller handles in the handle database.
@ -1448,14 +1450,47 @@ I2cBusUnload (
gI2cBusDriverBinding.DriverBindingHandle,
&gEfiDriverBindingProtocolGuid,
&gI2cBusDriverBinding,
&gEfiComponentNameProtocolGuid,
&gI2cBusComponentName,
&gEfiComponentName2ProtocolGuid,
&gI2cBusComponentName2,
NULL
);
ASSERT_EFI_ERROR (Status);
//
// Note we have to one by one uninstall the following protocols.
// It's because some of them are optionally installed based on
// the following PCD settings.
// gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable
// gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable
// gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable
// gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable
//
Status = gBS->HandleProtocol (
gI2cBusDriverBinding.DriverBindingHandle,
&gEfiComponentNameProtocolGuid,
(VOID **) &ComponentName
);
if (!EFI_ERROR (Status)) {
gBS->UninstallProtocolInterface (
gI2cBusDriverBinding.DriverBindingHandle,
&gEfiComponentNameProtocolGuid,
ComponentName
);
}
Status = gBS->HandleProtocol (
gI2cBusDriverBinding.DriverBindingHandle,
&gEfiComponentName2ProtocolGuid,
(VOID **) &ComponentName2
);
if (!EFI_ERROR (Status)) {
gBS->UninstallProtocolInterface (
gI2cBusDriverBinding.DriverBindingHandle,
&gEfiComponentName2ProtocolGuid,
ComponentName2
);
}
Status = EFI_SUCCESS;
Done:
//
// Free the buffer containing the list of handles from the handle database

45
MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
View File

@ -2,7 +2,7 @@
This file implements I2C Host Protocol which provides callers with the ability to
do I/O transactions to all of the devices on the I2C bus.
Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -1131,6 +1131,8 @@ I2cHostUnload (
EFI_HANDLE *DeviceHandleBuffer;
UINTN DeviceHandleCount;
UINTN Index;
EFI_COMPONENT_NAME_PROTOCOL *ComponentName;
EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2;
//
// Get the list of all I2C Controller handles in the handle database.
@ -1171,14 +1173,47 @@ I2cHostUnload (
gI2cHostDriverBinding.DriverBindingHandle,
&gEfiDriverBindingProtocolGuid,
&gI2cHostDriverBinding,
&gEfiComponentNameProtocolGuid,
&gI2cHostComponentName,
&gEfiComponentName2ProtocolGuid,
&gI2cHostComponentName2,
NULL
);
ASSERT_EFI_ERROR (Status);
//
// Note we have to one by one uninstall the following protocols.
// It's because some of them are optionally installed based on
// the following PCD settings.
// gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable
// gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable
// gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable
// gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable
//
Status = gBS->HandleProtocol (
gI2cHostDriverBinding.DriverBindingHandle,
&gEfiComponentNameProtocolGuid,
(VOID **) &ComponentName
);
if (!EFI_ERROR (Status)) {
gBS->UninstallProtocolInterface (
gI2cHostDriverBinding.DriverBindingHandle,
&gEfiComponentNameProtocolGuid,
ComponentName
);
}
Status = gBS->HandleProtocol (
gI2cHostDriverBinding.DriverBindingHandle,
&gEfiComponentName2ProtocolGuid,
(VOID **) &ComponentName2
);
if (!EFI_ERROR (Status)) {
gBS->UninstallProtocolInterface (
gI2cHostDriverBinding.DriverBindingHandle,
&gEfiComponentName2ProtocolGuid,
ComponentName2
);
}
Status = EFI_SUCCESS;
Done:
//
// Free the buffer containing the list of handles from the handle database