Revision: 19723
          http://sourceforge.net/p/edk2/code/19723
Author:   mdkinney
Date:     2016-01-21 19:29:35 +0000 (Thu, 21 Jan 2016)
Log Message:
-----------
SecurityPkg/TcgConfigDxe: Replace TpmCommLib with Tpm12DeviceLib

Update TCG drivers for TPM 1.2 devices to use Tpm12DeviceLib instead
of TpmCommLib.  This is required to support TPM 1.2 hardware devices
that are not on LPC bus.

Cc: Chao Zhang <[email protected]>
Cc: Jiewen Yao <[email protected]>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <[email protected]>
Reviewed-by: Chao Zhang <[email protected]>
Reviewed-by: Jiewen Yao <[email protected]>

Modified Paths:
--------------
    trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
    trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
    trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h

Modified: trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c
===================================================================
--- trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c   2016-01-21 
19:29:28 UTC (rev 19722)
+++ trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c   2016-01-21 
19:29:35 UTC (rev 19723)
@@ -1,7 +1,7 @@
 /** @file
   The module entry point for Tcg configuration module.
 
-Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2016, 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 
@@ -43,7 +43,7 @@
     return EFI_UNSUPPORTED;
   }
 
-  Status = TisPcRequestUseTpm ((TIS_TPM_HANDLE) (UINTN) TPM_BASE_ADDRESS);
+  Status = Tpm12RequestUseTpm ();
   if (EFI_ERROR (Status)) {
     DEBUG ((EFI_D_ERROR, "TPM not detected!\n"));
     return Status;

Modified: trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
===================================================================
--- trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf    2016-01-21 
19:29:28 UTC (rev 19722)
+++ trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf    2016-01-21 
19:29:35 UTC (rev 19723)
@@ -2,7 +2,7 @@
 #  Provides the capability to update TPM state setup browser
 #  By this module, user may enable/disable/activate/deactivate/clear TPM, etc.
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2016, 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
@@ -52,7 +52,7 @@
   HiiLib
   PcdLib
   PrintLib
-  TpmCommLib
+  Tpm12DeviceLib
 
 [Guids]
   ## SOMETIMES_PRODUCES ## Variable:L"PhysicalPresence"

Modified: trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h
===================================================================
--- trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h     2016-01-21 
19:29:28 UTC (rev 19722)
+++ trunk/edk2/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.h     2016-01-21 
19:29:35 UTC (rev 19723)
@@ -2,7 +2,7 @@
   The header file of HII Config Access protocol implementation of TCG
   configuration module.
 
-Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2016, 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 
@@ -34,7 +34,7 @@
 #include <Library/DevicePathLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PrintLib.h>
-#include <Library/TpmCommLib.h>
+#include <Library/Tpm12DeviceLib.h>
 
 #include <Guid/MdeModuleHii.h>
 


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to