OvmfPkg/Tcg2ConfigPei: trivial coding style updates

- the @file comment block should match between INF and main C file

- rewrap / refill columns to 79 characters

- insert space before opening paren

- prefix and suffix //-style comment block with empty // lines

- fix indentation of arguments in multi-line function call

- general tab spacing (indent step) is 2 in edk2, unlike QEMU's 4

No functional changes.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

2 files changed, 40 insertions, 35 deletions

diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
index 234cdd6cb4..8c2d5863ea 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
@@ -1,20 +1,20 @@
 ## @file

-#  Set TPM device type

+# Set TPM device type

 #

-#  In SecurityPkg, this module initializes the TPM device type based on

-#  a UEFI variable and/or hardware detection. In OvmfPkg, the module

-#  only performs TPM2 hardware detection.

+# In SecurityPkg, this module initializes the TPM device type based on a UEFI

+# variable and/or hardware detection. In OvmfPkg, the module only performs TPM2

+# hardware detection.

 #

 # Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>

 # Copyright (C) 2018, Red Hat, Inc.

 #

-# 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

+# 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

 # http://opensource.org/licenses/bsd-license.php

-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT

+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 ##

 

 [Defines]

@@ -40,7 +40,7 @@
   Tpm2DeviceLib

 

 [Guids]

-  gEfiTpmDeviceSelectedGuid           ## PRODUCES             ## GUID    # Used as a PPI GUID

+  gEfiTpmDeviceSelectedGuid           ## PRODUCES ## GUID # Used as a PPI GUID

   gEfiTpmDeviceInstanceTpm20DtpmGuid  ## SOMETIMES_CONSUMES

 

 [Ppis]

diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
index 8bee1926b3..0befc6c54c 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
@@ -1,17 +1,20 @@
 /** @file

-  The module entry point for Tcg2 configuration module.

+  Set TPM device type

 

-Copyright (c) 2018, Red Hat, Inc.

-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

+  In SecurityPkg, this module initializes the TPM device type based on a UEFI

+  variable and/or hardware detection. In OvmfPkg, the module only performs TPM2

+  hardware detection.

 

-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

-http://opensource.org/licenses/bsd-license.php

+  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

+  Copyright (C) 2018, Red Hat, Inc.

 

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+  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

+  http://opensource.org/licenses/bsd-license.php

 

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT

+  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 **/

 

 

@@ -55,23 +58,25 @@ Tcg2ConfigPeimEntryPoint (
 

   Status = Tpm2RequestUseTpm ();

   if (!EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_INFO, "%a: TPM2 detected\n", __FUNCTION__));

-      Size = sizeof(gEfiTpmDeviceInstanceTpm20DtpmGuid);

-      Status = PcdSetPtrS (

-          PcdTpmInstanceGuid,

-          &Size,

-          &gEfiTpmDeviceInstanceTpm20DtpmGuid

-          );

-      ASSERT_EFI_ERROR (Status);

+    DEBUG ((DEBUG_INFO, "%a: TPM2 detected\n", __FUNCTION__));

+    Size = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid);

+    Status = PcdSetPtrS (

+               PcdTpmInstanceGuid,

+               &Size,

+               &gEfiTpmDeviceInstanceTpm20DtpmGuid

+               );

+    ASSERT_EFI_ERROR (Status);

   } else {

-      DEBUG ((DEBUG_INFO, "%a: no TPM2 detected\n", __FUNCTION__));

-      // If no TPM2 was detected, we still need to install

-      // TpmInitializationDonePpi. Namely, Tcg2Pei will exit early upon

-      // seeing the default (all-bits-zero) contents of

-      // PcdTpmInstanceGuid, thus we have to install the PPI in its place,

-      // in order to unblock any dependent PEIMs.

-      Status = PeiServicesInstallPpi (&mTpmInitializationDonePpiList);

-      ASSERT_EFI_ERROR (Status);

+    DEBUG ((DEBUG_INFO, "%a: no TPM2 detected\n", __FUNCTION__));

+    //

+    // If no TPM2 was detected, we still need to install

+    // TpmInitializationDonePpi. Namely, Tcg2Pei will exit early upon seeing

+    // the default (all-bits-zero) contents of PcdTpmInstanceGuid, thus we have

+    // to install the PPI in its place, in order to unblock any dependent

+    // PEIMs.

+    //

+    Status = PeiServicesInstallPpi (&mTpmInitializationDonePpiList);

+    ASSERT_EFI_ERROR (Status);

   }

 

   //