SecurityPkg: Apply uncrustify changes

[mirror_edk2.git] / SecurityPkg / Library / Tpm2CommandLib / Tpm2Hierarchy.c

diff --git a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
index 957d69443161834966ef61f383534c828958c4da..7144955be1a551a1542eb39cf633aadf8f622de1 100644 (file)
--- a/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
+++ b/SecurityPkg/Library/Tpm2CommandLib/Tpm2Hierarchy.c
@@ -25,36 +25,36 @@ typedef struct {
 } TPM2_SET_PRIMARY_POLICY_COMMAND;\r
 \r
 typedef struct {\r
-  TPM2_RESPONSE_HEADER       Header;\r
-  UINT32                     AuthSessionSize;\r
-  TPMS_AUTH_RESPONSE         AuthSession;\r
+  TPM2_RESPONSE_HEADER    Header;\r
+  UINT32                  AuthSessionSize;\r
+  TPMS_AUTH_RESPONSE      AuthSession;\r
 } TPM2_SET_PRIMARY_POLICY_RESPONSE;\r
 \r
 typedef struct {\r
-  TPM2_COMMAND_HEADER       Header;\r
-  TPMI_RH_CLEAR             AuthHandle;\r
-  UINT32                    AuthorizationSize;\r
-  TPMS_AUTH_COMMAND         AuthSession;\r
+  TPM2_COMMAND_HEADER    Header;\r
+  TPMI_RH_CLEAR          AuthHandle;\r
+  UINT32                 AuthorizationSize;\r
+  TPMS_AUTH_COMMAND      AuthSession;\r
 } TPM2_CLEAR_COMMAND;\r
 \r
 typedef struct {\r
-  TPM2_RESPONSE_HEADER       Header;\r
-  UINT32                     ParameterSize;\r
-  TPMS_AUTH_RESPONSE         AuthSession;\r
+  TPM2_RESPONSE_HEADER    Header;\r
+  UINT32                  ParameterSize;\r
+  TPMS_AUTH_RESPONSE      AuthSession;\r
 } TPM2_CLEAR_RESPONSE;\r
 \r
 typedef struct {\r
-  TPM2_COMMAND_HEADER       Header;\r
-  TPMI_RH_CLEAR             AuthHandle;\r
-  UINT32                    AuthorizationSize;\r
-  TPMS_AUTH_COMMAND         AuthSession;\r
-  TPMI_YES_NO               Disable;\r
+  TPM2_COMMAND_HEADER    Header;\r
+  TPMI_RH_CLEAR          AuthHandle;\r
+  UINT32                 AuthorizationSize;\r
+  TPMS_AUTH_COMMAND      AuthSession;\r
+  TPMI_YES_NO            Disable;\r
 } TPM2_CLEAR_CONTROL_COMMAND;\r
 \r
 typedef struct {\r
-  TPM2_RESPONSE_HEADER       Header;\r
-  UINT32                     ParameterSize;\r
-  TPMS_AUTH_RESPONSE         AuthSession;\r
+  TPM2_RESPONSE_HEADER    Header;\r
+  UINT32                  ParameterSize;\r
+  TPMS_AUTH_RESPONSE      AuthSession;\r
 } TPM2_CLEAR_CONTROL_RESPONSE;\r
 \r
 typedef struct {\r
@@ -66,50 +66,50 @@ typedef struct {
 } TPM2_HIERARCHY_CHANGE_AUTH_COMMAND;\r
 \r
 typedef struct {\r
-  TPM2_RESPONSE_HEADER       Header;\r
-  UINT32                     ParameterSize;\r
-  TPMS_AUTH_RESPONSE         AuthSession;\r
+  TPM2_RESPONSE_HEADER    Header;\r
+  UINT32                  ParameterSize;\r
+  TPMS_AUTH_RESPONSE      AuthSession;\r
 } TPM2_HIERARCHY_CHANGE_AUTH_RESPONSE;\r
 \r
 typedef struct {\r
-  TPM2_COMMAND_HEADER       Header;\r
-  TPMI_RH_PLATFORM          AuthHandle;\r
-  UINT32                    AuthorizationSize;\r
-  TPMS_AUTH_COMMAND         AuthSession;\r
+  TPM2_COMMAND_HEADER    Header;\r
+  TPMI_RH_PLATFORM       AuthHandle;\r
+  UINT32                 AuthorizationSize;\r
+  TPMS_AUTH_COMMAND      AuthSession;\r
 } TPM2_CHANGE_EPS_COMMAND;\r
 \r
 typedef struct {\r
-  TPM2_RESPONSE_HEADER       Header;\r
-  UINT32                     ParameterSize;\r
-  TPMS_AUTH_RESPONSE         AuthSession;\r
+  TPM2_RESPONSE_HEADER    Header;\r
+  UINT32                  ParameterSize;\r
+  TPMS_AUTH_RESPONSE      AuthSession;\r
 } TPM2_CHANGE_EPS_RESPONSE;\r
 \r
 typedef struct {\r
-  TPM2_COMMAND_HEADER       Header;\r
-  TPMI_RH_PLATFORM          AuthHandle;\r
-  UINT32                    AuthorizationSize;\r
-  TPMS_AUTH_COMMAND         AuthSession;\r
+  TPM2_COMMAND_HEADER    Header;\r
+  TPMI_RH_PLATFORM       AuthHandle;\r
+  UINT32                 AuthorizationSize;\r
+  TPMS_AUTH_COMMAND      AuthSession;\r
 } TPM2_CHANGE_PPS_COMMAND;\r
 \r
 typedef struct {\r
-  TPM2_RESPONSE_HEADER       Header;\r
-  UINT32                     ParameterSize;\r
-  TPMS_AUTH_RESPONSE         AuthSession;\r
+  TPM2_RESPONSE_HEADER    Header;\r
+  UINT32                  ParameterSize;\r
+  TPMS_AUTH_RESPONSE      AuthSession;\r
 } TPM2_CHANGE_PPS_RESPONSE;\r
 \r
 typedef struct {\r
-  TPM2_COMMAND_HEADER       Header;\r
-  TPMI_RH_HIERARCHY         AuthHandle;\r
-  UINT32                    AuthorizationSize;\r
-  TPMS_AUTH_COMMAND         AuthSession;\r
-  TPMI_RH_HIERARCHY         Hierarchy;\r
-  TPMI_YES_NO               State;\r
+  TPM2_COMMAND_HEADER    Header;\r
+  TPMI_RH_HIERARCHY      AuthHandle;\r
+  UINT32                 AuthorizationSize;\r
+  TPMS_AUTH_COMMAND      AuthSession;\r
+  TPMI_RH_HIERARCHY      Hierarchy;\r
+  TPMI_YES_NO            State;\r
 } TPM2_HIERARCHY_CONTROL_COMMAND;\r
 \r
 typedef struct {\r
-  TPM2_RESPONSE_HEADER       Header;\r
-  UINT32                     ParameterSize;\r
-  TPMS_AUTH_RESPONSE         AuthSession;\r
+  TPM2_RESPONSE_HEADER    Header;\r
+  UINT32                  ParameterSize;\r
+  TPMS_AUTH_RESPONSE      AuthSession;\r
 } TPM2_HIERARCHY_CONTROL_RESPONSE;\r
 \r
 #pragma pack()\r
@@ -129,25 +129,25 @@ typedef struct {
 EFI_STATUS\r
 EFIAPI\r
 Tpm2SetPrimaryPolicy (\r
-  IN  TPMI_RH_HIERARCHY_AUTH    AuthHandle,\r
-  IN  TPMS_AUTH_COMMAND         *AuthSession,\r
-  IN  TPM2B_DIGEST              *AuthPolicy,\r
-  IN  TPMI_ALG_HASH             HashAlg\r
+  IN  TPMI_RH_HIERARCHY_AUTH  AuthHandle,\r
+  IN  TPMS_AUTH_COMMAND       *AuthSession,\r
+  IN  TPM2B_DIGEST            *AuthPolicy,\r
+  IN  TPMI_ALG_HASH           HashAlg\r
   )\r
 {\r
-  EFI_STATUS                                 Status;\r
-  TPM2_SET_PRIMARY_POLICY_COMMAND            SendBuffer;\r
-  TPM2_SET_PRIMARY_POLICY_RESPONSE           RecvBuffer;\r
-  UINT32                                     SendBufferSize;\r
-  UINT32                                     RecvBufferSize;\r
-  UINT8                                      *Buffer;\r
-  UINT32                                     SessionInfoSize;\r
+  EFI_STATUS                        Status;\r
+  TPM2_SET_PRIMARY_POLICY_COMMAND   SendBuffer;\r
+  TPM2_SET_PRIMARY_POLICY_RESPONSE  RecvBuffer;\r
+  UINT32                            SendBufferSize;\r
+  UINT32                            RecvBufferSize;\r
+  UINT8                             *Buffer;\r
+  UINT32                            SessionInfoSize;\r
 \r
   //\r
   // Construct command\r
   //\r
-  SendBuffer.Header.tag = SwapBytes16(TPM_ST_SESSIONS);\r
-  SendBuffer.Header.commandCode = SwapBytes32(TPM_CC_SetPrimaryPolicy);\r
+  SendBuffer.Header.tag         = SwapBytes16 (TPM_ST_SESSIONS);\r
+  SendBuffer.Header.commandCode = SwapBytes32 (TPM_CC_SetPrimaryPolicy);\r
 \r
   SendBuffer.AuthHandle = SwapBytes32 (AuthHandle);\r
 \r
@@ -157,28 +157,28 @@ Tpm2SetPrimaryPolicy (
   Buffer = (UINT8 *)&SendBuffer.AuthSession;\r
 \r
   // sessionInfoSize\r
-  SessionInfoSize = CopyAuthSessionCommand (AuthSession, Buffer);\r
-  Buffer += SessionInfoSize;\r
-  SendBuffer.AuthSessionSize = SwapBytes32(SessionInfoSize);\r
+  SessionInfoSize            = CopyAuthSessionCommand (AuthSession, Buffer);\r
+  Buffer                    += SessionInfoSize;\r
+  SendBuffer.AuthSessionSize = SwapBytes32 (SessionInfoSize);\r
 \r
   //\r
   // Real data\r
   //\r
-  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(AuthPolicy->size));\r
-  Buffer += sizeof(UINT16);\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (AuthPolicy->size));\r
+  Buffer += sizeof (UINT16);\r
   CopyMem (Buffer, AuthPolicy->buffer, AuthPolicy->size);\r
   Buffer += AuthPolicy->size;\r
-  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(HashAlg));\r
-  Buffer += sizeof(UINT16);\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (HashAlg));\r
+  Buffer += sizeof (UINT16);\r
 \r
-  SendBufferSize = (UINT32)((UINTN)Buffer - (UINTN)&SendBuffer);\r
+  SendBufferSize              = (UINT32)((UINTN)Buffer - (UINTN)&SendBuffer);\r
   SendBuffer.Header.paramSize = SwapBytes32 (SendBufferSize);\r
 \r
   //\r
   // send Tpm command\r
   //\r
   RecvBufferSize = sizeof (RecvBuffer);\r
-  Status = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
+  Status         = Tpm2SubmitCommand (SendBufferSize, (UINT8 *)&SendBuffer, &RecvBufferSize, (UINT8 *)&RecvBuffer);\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -188,8 +188,9 @@ Tpm2SetPrimaryPolicy (
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
-  if (SwapBytes32(RecvBuffer.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG ((DEBUG_ERROR, "Tpm2SetPrimaryPolicy - responseCode - %x\n", SwapBytes32(RecvBuffer.Header.responseCode)));\r
+\r
+  if (SwapBytes32 (RecvBuffer.Header.responseCode) != TPM_RC_SUCCESS) {\r
+    DEBUG ((DEBUG_ERROR, "Tpm2SetPrimaryPolicy - responseCode - %x\n", SwapBytes32 (RecvBuffer.Header.responseCode)));\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
@@ -198,8 +199,8 @@ Done:
   //\r
   // Clear AuthSession Content\r
   //\r
-  ZeroMem (&SendBuffer, sizeof(SendBuffer));\r
-  ZeroMem (&RecvBuffer, sizeof(RecvBuffer));\r
+  ZeroMem (&SendBuffer, sizeof (SendBuffer));\r
+  ZeroMem (&RecvBuffer, sizeof (RecvBuffer));\r
   return Status;\r
 }\r
 \r
@@ -215,22 +216,22 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 Tpm2Clear (\r
-  IN TPMI_RH_CLEAR             AuthHandle,\r
-  IN TPMS_AUTH_COMMAND         *AuthSession OPTIONAL\r
+  IN TPMI_RH_CLEAR      AuthHandle,\r
+  IN TPMS_AUTH_COMMAND  *AuthSession OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  TPM2_CLEAR_COMMAND                Cmd;\r
-  TPM2_CLEAR_RESPONSE               Res;\r
-  UINT32                            ResultBufSize;\r
-  UINT32                            CmdSize;\r
-  UINT32                            RespSize;\r
-  UINT8                             *Buffer;\r
-  UINT32                            SessionInfoSize;\r
+  EFI_STATUS           Status;\r
+  TPM2_CLEAR_COMMAND   Cmd;\r
+  TPM2_CLEAR_RESPONSE  Res;\r
+  UINT32               ResultBufSize;\r
+  UINT32               CmdSize;\r
+  UINT32               RespSize;\r
+  UINT8                *Buffer;\r
+  UINT32               SessionInfoSize;\r
 \r
-  Cmd.Header.tag         = SwapBytes16(TPM_ST_SESSIONS);\r
-  Cmd.Header.commandCode = SwapBytes32(TPM_CC_Clear);\r
-  Cmd.AuthHandle         = SwapBytes32(AuthHandle);\r
+  Cmd.Header.tag         = SwapBytes16 (TPM_ST_SESSIONS);\r
+  Cmd.Header.commandCode = SwapBytes32 (TPM_CC_Clear);\r
+  Cmd.AuthHandle         = SwapBytes32 (AuthHandle);\r
 \r
   //\r
   // Add in Auth session\r
@@ -238,20 +239,20 @@ Tpm2Clear (
   Buffer = (UINT8 *)&Cmd.AuthSession;\r
 \r
   // sessionInfoSize\r
-  SessionInfoSize = CopyAuthSessionCommand (AuthSession, Buffer);\r
-  Buffer += SessionInfoSize;\r
-  Cmd.AuthorizationSize = SwapBytes32(SessionInfoSize);\r
+  SessionInfoSize       = CopyAuthSessionCommand (AuthSession, Buffer);\r
+  Buffer               += SessionInfoSize;\r
+  Cmd.AuthorizationSize = SwapBytes32 (SessionInfoSize);\r
 \r
-  CmdSize = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
-  Cmd.Header.paramSize   = SwapBytes32(CmdSize);\r
+  CmdSize              = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
+  Cmd.Header.paramSize = SwapBytes32 (CmdSize);\r
 \r
-  ResultBufSize = sizeof(Res);\r
-  Status = Tpm2SubmitCommand (CmdSize, (UINT8 *)&Cmd, &ResultBufSize, (UINT8 *)&Res);\r
-  if (EFI_ERROR(Status)) {\r
+  ResultBufSize = sizeof (Res);\r
+  Status        = Tpm2SubmitCommand (CmdSize, (UINT8 *)&Cmd, &ResultBufSize, (UINT8 *)&Res);\r
+  if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
 \r
-  if (ResultBufSize > sizeof(Res)) {\r
+  if (ResultBufSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "Clear: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -260,8 +261,8 @@ Tpm2Clear (
   //\r
   // Validate response headers\r
   //\r
-  RespSize = SwapBytes32(Res.Header.paramSize);\r
-  if (RespSize > sizeof(Res)) {\r
+  RespSize = SwapBytes32 (Res.Header.paramSize);\r
+  if (RespSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "Clear: Response size too large! %d\r\n", RespSize));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -270,8 +271,8 @@ Tpm2Clear (
   //\r
   // Fail if command failed\r
   //\r
-  if (SwapBytes32(Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG ((DEBUG_ERROR, "Clear: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
+  if (SwapBytes32 (Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
+    DEBUG ((DEBUG_ERROR, "Clear: Response Code error! 0x%08x\r\n", SwapBytes32 (Res.Header.responseCode)));\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
@@ -285,8 +286,8 @@ Done:
   //\r
   // Clear AuthSession Content\r
   //\r
-  ZeroMem (&Cmd, sizeof(Cmd));\r
-  ZeroMem (&Res, sizeof(Res));\r
+  ZeroMem (&Cmd, sizeof (Cmd));\r
+  ZeroMem (&Res, sizeof (Res));\r
   return Status;\r
 }\r
 \r
@@ -304,23 +305,23 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 Tpm2ClearControl (\r
-  IN TPMI_RH_CLEAR             AuthHandle,\r
-  IN TPMS_AUTH_COMMAND         *AuthSession  OPTIONAL,\r
-  IN TPMI_YES_NO               Disable\r
+  IN TPMI_RH_CLEAR      AuthHandle,\r
+  IN TPMS_AUTH_COMMAND  *AuthSession  OPTIONAL,\r
+  IN TPMI_YES_NO        Disable\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  TPM2_CLEAR_CONTROL_COMMAND        Cmd;\r
-  TPM2_CLEAR_CONTROL_RESPONSE       Res;\r
-  UINT32                            ResultBufSize;\r
-  UINT32                            CmdSize;\r
-  UINT32                            RespSize;\r
-  UINT8                             *Buffer;\r
-  UINT32                            SessionInfoSize;\r
+  EFI_STATUS                   Status;\r
+  TPM2_CLEAR_CONTROL_COMMAND   Cmd;\r
+  TPM2_CLEAR_CONTROL_RESPONSE  Res;\r
+  UINT32                       ResultBufSize;\r
+  UINT32                       CmdSize;\r
+  UINT32                       RespSize;\r
+  UINT8                        *Buffer;\r
+  UINT32                       SessionInfoSize;\r
 \r
-  Cmd.Header.tag         = SwapBytes16(TPM_ST_SESSIONS);\r
-  Cmd.Header.commandCode = SwapBytes32(TPM_CC_ClearControl);\r
-  Cmd.AuthHandle         = SwapBytes32(AuthHandle);\r
+  Cmd.Header.tag         = SwapBytes16 (TPM_ST_SESSIONS);\r
+  Cmd.Header.commandCode = SwapBytes32 (TPM_CC_ClearControl);\r
+  Cmd.AuthHandle         = SwapBytes32 (AuthHandle);\r
 \r
   //\r
   // Add in Auth session\r
@@ -328,24 +329,24 @@ Tpm2ClearControl (
   Buffer = (UINT8 *)&Cmd.AuthSession;\r
 \r
   // sessionInfoSize\r
-  SessionInfoSize = CopyAuthSessionCommand (AuthSession, Buffer);\r
-  Buffer += SessionInfoSize;\r
-  Cmd.AuthorizationSize = SwapBytes32(SessionInfoSize);\r
+  SessionInfoSize       = CopyAuthSessionCommand (AuthSession, Buffer);\r
+  Buffer               += SessionInfoSize;\r
+  Cmd.AuthorizationSize = SwapBytes32 (SessionInfoSize);\r
 \r
   // disable\r
   *(UINT8 *)Buffer = Disable;\r
   Buffer++;\r
 \r
-  CmdSize = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
-  Cmd.Header.paramSize   = SwapBytes32(CmdSize);\r
+  CmdSize              = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
+  Cmd.Header.paramSize = SwapBytes32 (CmdSize);\r
 \r
-  ResultBufSize = sizeof(Res);\r
-  Status = Tpm2SubmitCommand (CmdSize, (UINT8 *)&Cmd, &ResultBufSize, (UINT8 *)&Res);\r
-  if (EFI_ERROR(Status)) {\r
+  ResultBufSize = sizeof (Res);\r
+  Status        = Tpm2SubmitCommand (CmdSize, (UINT8 *)&Cmd, &ResultBufSize, (UINT8 *)&Res);\r
+  if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
 \r
-  if (ResultBufSize > sizeof(Res)) {\r
+  if (ResultBufSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "ClearControl: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -354,8 +355,8 @@ Tpm2ClearControl (
   //\r
   // Validate response headers\r
   //\r
-  RespSize = SwapBytes32(Res.Header.paramSize);\r
-  if (RespSize > sizeof(Res)) {\r
+  RespSize = SwapBytes32 (Res.Header.paramSize);\r
+  if (RespSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "ClearControl: Response size too large! %d\r\n", RespSize));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -364,8 +365,8 @@ Tpm2ClearControl (
   //\r
   // Fail if command failed\r
   //\r
-  if (SwapBytes32(Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG ((DEBUG_ERROR, "ClearControl: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
+  if (SwapBytes32 (Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
+    DEBUG ((DEBUG_ERROR, "ClearControl: Response Code error! 0x%08x\r\n", SwapBytes32 (Res.Header.responseCode)));\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
@@ -379,8 +380,8 @@ Done:
   //\r
   // Clear AuthSession Content\r
   //\r
-  ZeroMem (&Cmd, sizeof(Cmd));\r
-  ZeroMem (&Res, sizeof(Res));\r
+  ZeroMem (&Cmd, sizeof (Cmd));\r
+  ZeroMem (&Res, sizeof (Res));\r
   return Status;\r
 }\r
 \r
@@ -398,9 +399,9 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 Tpm2HierarchyChangeAuth (\r
-  IN TPMI_RH_HIERARCHY_AUTH    AuthHandle,\r
-  IN TPMS_AUTH_COMMAND         *AuthSession,\r
-  IN TPM2B_AUTH                *NewAuth\r
+  IN TPMI_RH_HIERARCHY_AUTH  AuthHandle,\r
+  IN TPMS_AUTH_COMMAND       *AuthSession,\r
+  IN TPM2B_AUTH              *NewAuth\r
   )\r
 {\r
   EFI_STATUS                           Status;\r
@@ -416,10 +417,10 @@ Tpm2HierarchyChangeAuth (
   //\r
   // Construct command\r
   //\r
-  Cmd.Header.tag          = SwapBytes16(TPM_ST_SESSIONS);\r
-  Cmd.Header.paramSize    = SwapBytes32(sizeof(Cmd));\r
-  Cmd.Header.commandCode  = SwapBytes32(TPM_CC_HierarchyChangeAuth);\r
-  Cmd.AuthHandle          = SwapBytes32(AuthHandle);\r
+  Cmd.Header.tag         = SwapBytes16 (TPM_ST_SESSIONS);\r
+  Cmd.Header.paramSize   = SwapBytes32 (sizeof (Cmd));\r
+  Cmd.Header.commandCode = SwapBytes32 (TPM_CC_HierarchyChangeAuth);\r
+  Cmd.AuthHandle         = SwapBytes32 (AuthHandle);\r
 \r
   //\r
   // Add in Auth session\r
@@ -427,23 +428,23 @@ Tpm2HierarchyChangeAuth (
   Buffer = (UINT8 *)&Cmd.AuthSession;\r
 \r
   // sessionInfoSize\r
-  SessionInfoSize = CopyAuthSessionCommand (AuthSession, Buffer);\r
-  Buffer += SessionInfoSize;\r
-  Cmd.AuthorizationSize = SwapBytes32(SessionInfoSize);\r
+  SessionInfoSize       = CopyAuthSessionCommand (AuthSession, Buffer);\r
+  Buffer               += SessionInfoSize;\r
+  Cmd.AuthorizationSize = SwapBytes32 (SessionInfoSize);\r
 \r
   // New Authorization size\r
-  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16(NewAuth->size));\r
-  Buffer += sizeof(UINT16);\r
+  WriteUnaligned16 ((UINT16 *)Buffer, SwapBytes16 (NewAuth->size));\r
+  Buffer += sizeof (UINT16);\r
 \r
   // New Authorization\r
-  CopyMem(Buffer, NewAuth->buffer, NewAuth->size);\r
+  CopyMem (Buffer, NewAuth->buffer, NewAuth->size);\r
   Buffer += NewAuth->size;\r
 \r
-  CmdSize = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
-  Cmd.Header.paramSize = SwapBytes32(CmdSize);\r
+  CmdSize              = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
+  Cmd.Header.paramSize = SwapBytes32 (CmdSize);\r
 \r
-  ResultBuf     = (UINT8 *) &Res;\r
-  ResultBufSize = sizeof(Res);\r
+  ResultBuf     = (UINT8 *)&Res;\r
+  ResultBufSize = sizeof (Res);\r
 \r
   //\r
   // Call the TPM\r
@@ -454,11 +455,11 @@ Tpm2HierarchyChangeAuth (
              &ResultBufSize,\r
              ResultBuf\r
              );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
 \r
-  if (ResultBufSize > sizeof(Res)) {\r
+  if (ResultBufSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "HierarchyChangeAuth: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -467,8 +468,8 @@ Tpm2HierarchyChangeAuth (
   //\r
   // Validate response headers\r
   //\r
-  RespSize = SwapBytes32(Res.Header.paramSize);\r
-  if (RespSize > sizeof(Res)) {\r
+  RespSize = SwapBytes32 (Res.Header.paramSize);\r
+  if (RespSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "HierarchyChangeAuth: Response size too large! %d\r\n", RespSize));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -477,8 +478,8 @@ Tpm2HierarchyChangeAuth (
   //\r
   // Fail if command failed\r
   //\r
-  if (SwapBytes32(Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG((DEBUG_ERROR,"HierarchyChangeAuth: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
+  if (SwapBytes32 (Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
+    DEBUG ((DEBUG_ERROR, "HierarchyChangeAuth: Response Code error! 0x%08x\r\n", SwapBytes32 (Res.Header.responseCode)));\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
@@ -487,8 +488,8 @@ Done:
   //\r
   // Clear AuthSession Content\r
   //\r
-  ZeroMem (&Cmd, sizeof(Cmd));\r
-  ZeroMem (&Res, sizeof(Res));\r
+  ZeroMem (&Cmd, sizeof (Cmd));\r
+  ZeroMem (&Res, sizeof (Res));\r
   return Status;\r
 }\r
 \r
@@ -505,8 +506,8 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 Tpm2ChangeEPS (\r
-  IN TPMI_RH_PLATFORM          AuthHandle,\r
-  IN TPMS_AUTH_COMMAND         *AuthSession\r
+  IN TPMI_RH_PLATFORM   AuthHandle,\r
+  IN TPMS_AUTH_COMMAND  *AuthSession\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -522,10 +523,10 @@ Tpm2ChangeEPS (
   //\r
   // Construct command\r
   //\r
-  Cmd.Header.tag          = SwapBytes16(TPM_ST_SESSIONS);\r
-  Cmd.Header.paramSize    = SwapBytes32(sizeof(Cmd));\r
-  Cmd.Header.commandCode  = SwapBytes32(TPM_CC_ChangeEPS);\r
-  Cmd.AuthHandle          = SwapBytes32(AuthHandle);\r
+  Cmd.Header.tag         = SwapBytes16 (TPM_ST_SESSIONS);\r
+  Cmd.Header.paramSize   = SwapBytes32 (sizeof (Cmd));\r
+  Cmd.Header.commandCode = SwapBytes32 (TPM_CC_ChangeEPS);\r
+  Cmd.AuthHandle         = SwapBytes32 (AuthHandle);\r
 \r
   //\r
   // Add in Auth session\r
@@ -533,15 +534,15 @@ Tpm2ChangeEPS (
   Buffer = (UINT8 *)&Cmd.AuthSession;\r
 \r
   // sessionInfoSize\r
-  SessionInfoSize = CopyAuthSessionCommand (AuthSession, Buffer);\r
-  Buffer += SessionInfoSize;\r
-  Cmd.AuthorizationSize = SwapBytes32(SessionInfoSize);\r
+  SessionInfoSize       = CopyAuthSessionCommand (AuthSession, Buffer);\r
+  Buffer               += SessionInfoSize;\r
+  Cmd.AuthorizationSize = SwapBytes32 (SessionInfoSize);\r
 \r
-  CmdSize = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
-  Cmd.Header.paramSize = SwapBytes32(CmdSize);\r
+  CmdSize              = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
+  Cmd.Header.paramSize = SwapBytes32 (CmdSize);\r
 \r
-  ResultBuf     = (UINT8 *) &Res;\r
-  ResultBufSize = sizeof(Res);\r
+  ResultBuf     = (UINT8 *)&Res;\r
+  ResultBufSize = sizeof (Res);\r
 \r
   //\r
   // Call the TPM\r
@@ -552,11 +553,11 @@ Tpm2ChangeEPS (
              &ResultBufSize,\r
              ResultBuf\r
              );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
 \r
-  if (ResultBufSize > sizeof(Res)) {\r
+  if (ResultBufSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "ChangeEPS: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -565,8 +566,8 @@ Tpm2ChangeEPS (
   //\r
   // Validate response headers\r
   //\r
-  RespSize = SwapBytes32(Res.Header.paramSize);\r
-  if (RespSize > sizeof(Res)) {\r
+  RespSize = SwapBytes32 (Res.Header.paramSize);\r
+  if (RespSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "ChangeEPS: Response size too large! %d\r\n", RespSize));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -575,8 +576,8 @@ Tpm2ChangeEPS (
   //\r
   // Fail if command failed\r
   //\r
-  if (SwapBytes32(Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG((DEBUG_ERROR,"ChangeEPS: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
+  if (SwapBytes32 (Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
+    DEBUG ((DEBUG_ERROR, "ChangeEPS: Response Code error! 0x%08x\r\n", SwapBytes32 (Res.Header.responseCode)));\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
@@ -585,8 +586,8 @@ Done:
   //\r
   // Clear AuthSession Content\r
   //\r
-  ZeroMem (&Cmd, sizeof(Cmd));\r
-  ZeroMem (&Res, sizeof(Res));\r
+  ZeroMem (&Cmd, sizeof (Cmd));\r
+  ZeroMem (&Res, sizeof (Res));\r
   return Status;\r
 }\r
 \r
@@ -603,8 +604,8 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 Tpm2ChangePPS (\r
-  IN TPMI_RH_PLATFORM          AuthHandle,\r
-  IN TPMS_AUTH_COMMAND         *AuthSession\r
+  IN TPMI_RH_PLATFORM   AuthHandle,\r
+  IN TPMS_AUTH_COMMAND  *AuthSession\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -620,10 +621,10 @@ Tpm2ChangePPS (
   //\r
   // Construct command\r
   //\r
-  Cmd.Header.tag          = SwapBytes16(TPM_ST_SESSIONS);\r
-  Cmd.Header.paramSize    = SwapBytes32(sizeof(Cmd));\r
-  Cmd.Header.commandCode  = SwapBytes32(TPM_CC_ChangePPS);\r
-  Cmd.AuthHandle          = SwapBytes32(AuthHandle);\r
+  Cmd.Header.tag         = SwapBytes16 (TPM_ST_SESSIONS);\r
+  Cmd.Header.paramSize   = SwapBytes32 (sizeof (Cmd));\r
+  Cmd.Header.commandCode = SwapBytes32 (TPM_CC_ChangePPS);\r
+  Cmd.AuthHandle         = SwapBytes32 (AuthHandle);\r
 \r
   //\r
   // Add in Auth session\r
@@ -631,15 +632,15 @@ Tpm2ChangePPS (
   Buffer = (UINT8 *)&Cmd.AuthSession;\r
 \r
   // sessionInfoSize\r
-  SessionInfoSize = CopyAuthSessionCommand (AuthSession, Buffer);\r
-  Buffer += SessionInfoSize;\r
-  Cmd.AuthorizationSize = SwapBytes32(SessionInfoSize);\r
+  SessionInfoSize       = CopyAuthSessionCommand (AuthSession, Buffer);\r
+  Buffer               += SessionInfoSize;\r
+  Cmd.AuthorizationSize = SwapBytes32 (SessionInfoSize);\r
 \r
-  CmdSize = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
-  Cmd.Header.paramSize = SwapBytes32(CmdSize);\r
+  CmdSize              = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
+  Cmd.Header.paramSize = SwapBytes32 (CmdSize);\r
 \r
-  ResultBuf     = (UINT8 *) &Res;\r
-  ResultBufSize = sizeof(Res);\r
+  ResultBuf     = (UINT8 *)&Res;\r
+  ResultBufSize = sizeof (Res);\r
 \r
   //\r
   // Call the TPM\r
@@ -650,11 +651,11 @@ Tpm2ChangePPS (
              &ResultBufSize,\r
              ResultBuf\r
              );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
 \r
-  if (ResultBufSize > sizeof(Res)) {\r
+  if (ResultBufSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "ChangePPS: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -663,8 +664,8 @@ Tpm2ChangePPS (
   //\r
   // Validate response headers\r
   //\r
-  RespSize = SwapBytes32(Res.Header.paramSize);\r
-  if (RespSize > sizeof(Res)) {\r
+  RespSize = SwapBytes32 (Res.Header.paramSize);\r
+  if (RespSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "ChangePPS: Response size too large! %d\r\n", RespSize));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -673,8 +674,8 @@ Tpm2ChangePPS (
   //\r
   // Fail if command failed\r
   //\r
-  if (SwapBytes32(Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG((DEBUG_ERROR,"ChangePPS: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
+  if (SwapBytes32 (Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
+    DEBUG ((DEBUG_ERROR, "ChangePPS: Response Code error! 0x%08x\r\n", SwapBytes32 (Res.Header.responseCode)));\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
@@ -683,8 +684,8 @@ Done:
   //\r
   // Clear AuthSession Content\r
   //\r
-  ZeroMem (&Cmd, sizeof(Cmd));\r
-  ZeroMem (&Res, sizeof(Res));\r
+  ZeroMem (&Cmd, sizeof (Cmd));\r
+  ZeroMem (&Res, sizeof (Res));\r
   return Status;\r
 }\r
 \r
@@ -703,10 +704,10 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 Tpm2HierarchyControl (\r
-  IN TPMI_RH_HIERARCHY         AuthHandle,\r
-  IN TPMS_AUTH_COMMAND         *AuthSession,\r
-  IN TPMI_RH_HIERARCHY         Hierarchy,\r
-  IN TPMI_YES_NO               State\r
+  IN TPMI_RH_HIERARCHY  AuthHandle,\r
+  IN TPMS_AUTH_COMMAND  *AuthSession,\r
+  IN TPMI_RH_HIERARCHY  Hierarchy,\r
+  IN TPMI_YES_NO        State\r
   )\r
 {\r
   EFI_STATUS                       Status;\r
@@ -722,10 +723,10 @@ Tpm2HierarchyControl (
   //\r
   // Construct command\r
   //\r
-  Cmd.Header.tag          = SwapBytes16(TPM_ST_SESSIONS);\r
-  Cmd.Header.paramSize    = SwapBytes32(sizeof(Cmd));\r
-  Cmd.Header.commandCode  = SwapBytes32(TPM_CC_HierarchyControl);\r
-  Cmd.AuthHandle          = SwapBytes32(AuthHandle);\r
+  Cmd.Header.tag         = SwapBytes16 (TPM_ST_SESSIONS);\r
+  Cmd.Header.paramSize   = SwapBytes32 (sizeof (Cmd));\r
+  Cmd.Header.commandCode = SwapBytes32 (TPM_CC_HierarchyControl);\r
+  Cmd.AuthHandle         = SwapBytes32 (AuthHandle);\r
 \r
   //\r
   // Add in Auth session\r
@@ -733,21 +734,21 @@ Tpm2HierarchyControl (
   Buffer = (UINT8 *)&Cmd.AuthSession;\r
 \r
   // sessionInfoSize\r
-  SessionInfoSize = CopyAuthSessionCommand (AuthSession, Buffer);\r
-  Buffer += SessionInfoSize;\r
-  Cmd.AuthorizationSize = SwapBytes32(SessionInfoSize);\r
+  SessionInfoSize       = CopyAuthSessionCommand (AuthSession, Buffer);\r
+  Buffer               += SessionInfoSize;\r
+  Cmd.AuthorizationSize = SwapBytes32 (SessionInfoSize);\r
 \r
-  WriteUnaligned32 ((UINT32 *)Buffer, SwapBytes32(Hierarchy));\r
-  Buffer += sizeof(UINT32);\r
+  WriteUnaligned32 ((UINT32 *)Buffer, SwapBytes32 (Hierarchy));\r
+  Buffer += sizeof (UINT32);\r
 \r
   *(UINT8 *)Buffer = State;\r
   Buffer++;\r
 \r
-  CmdSize = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
-  Cmd.Header.paramSize = SwapBytes32(CmdSize);\r
+  CmdSize              = (UINT32)(Buffer - (UINT8 *)&Cmd);\r
+  Cmd.Header.paramSize = SwapBytes32 (CmdSize);\r
 \r
-  ResultBuf     = (UINT8 *) &Res;\r
-  ResultBufSize = sizeof(Res);\r
+  ResultBuf     = (UINT8 *)&Res;\r
+  ResultBufSize = sizeof (Res);\r
 \r
   //\r
   // Call the TPM\r
@@ -758,11 +759,11 @@ Tpm2HierarchyControl (
              &ResultBufSize,\r
              ResultBuf\r
              );\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
 \r
-  if (ResultBufSize > sizeof(Res)) {\r
+  if (ResultBufSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "HierarchyControl: Failed ExecuteCommand: Buffer Too Small\r\n"));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -771,8 +772,8 @@ Tpm2HierarchyControl (
   //\r
   // Validate response headers\r
   //\r
-  RespSize = SwapBytes32(Res.Header.paramSize);\r
-  if (RespSize > sizeof(Res)) {\r
+  RespSize = SwapBytes32 (Res.Header.paramSize);\r
+  if (RespSize > sizeof (Res)) {\r
     DEBUG ((DEBUG_ERROR, "HierarchyControl: Response size too large! %d\r\n", RespSize));\r
     Status = EFI_BUFFER_TOO_SMALL;\r
     goto Done;\r
@@ -781,8 +782,8 @@ Tpm2HierarchyControl (
   //\r
   // Fail if command failed\r
   //\r
-  if (SwapBytes32(Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
-    DEBUG((DEBUG_ERROR,"HierarchyControl: Response Code error! 0x%08x\r\n", SwapBytes32(Res.Header.responseCode)));\r
+  if (SwapBytes32 (Res.Header.responseCode) != TPM_RC_SUCCESS) {\r
+    DEBUG ((DEBUG_ERROR, "HierarchyControl: Response Code error! 0x%08x\r\n", SwapBytes32 (Res.Header.responseCode)));\r
     Status = EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
@@ -791,7 +792,7 @@ Done:
   //\r
   // Clear AuthSession Content\r
   //\r
-  ZeroMem (&Cmd, sizeof(Cmd));\r
-  ZeroMem (&Res, sizeof(Res));\r
+  ZeroMem (&Cmd, sizeof (Cmd));\r
+  ZeroMem (&Res, sizeof (Res));\r
   return Status;\r
 }\r