sapi: cleanup tss2_sys.h

Fixes: #679

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>

1 files changed, 52 insertions, 91 deletions

diff --git a/include/sapi/tss2_sys.h b/include/sapi/tss2_sys.h
index 3aa6965a..394c9981 100644
--- a/include/sapi/tss2_sys.h
+++ b/include/sapi/tss2_sys.h
@@ -1,29 +1,32 @@
-//**********************************************************************;
-// Copyright (c) 2015, 2016 Intel Corporation
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-// THE POSSIBILITY OF SUCH DAMAGE.
-//**********************************************************************;
+/***********************************************************************;
+ * Copyright (c) 2015-2018, Intel Corporation
+ *
+ * Copyright 2015, Andreas Fuchs @ Fraunhofer SIT
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ ***********************************************************************/
 
 #ifndef TSS2_SYS_H
 #define TSS2_SYS_H
@@ -39,79 +42,52 @@ extern "C" {
 
 #include "sapi/tss2_tcti.h"
 
-// Fields for ABI negotiation.
 #define TSSWG_INTEROP 1
 #define MAX_NON_VENDOR_SPECIFIC 0x20000000
 #define TSS_SAPI_FIRST_FAMILY 1
 #define TSS_SAPI_FIRST_LEVEL 1
 #define TSS_SAPI_FIRST_VERSION 1
 
-//
-// SAPI context blob.
-//
+/* SAPI context blob */
 typedef struct _TSS2_SYS_OPAQUE_CONTEXT_BLOB TSS2_SYS_CONTEXT;
 
-//
-// Input structure for authorization area(s).
-//
+/* Input structure for authorization area(s). */
 typedef struct {
-    uint16_t          count;
+    uint16_t count;
     TPMS_AUTH_COMMAND auths[3];
 } TSS2L_SYS_AUTH_COMMAND;
 
 typedef struct {
-    uint16_t           count;
+    uint16_t count;
     TPMS_AUTH_RESPONSE auths[3];
 } TSS2L_SYS_AUTH_RESPONSE;
 
-
-//
-// SAPI data types
-//
-
-//
-// SAPI management functions, e.g. Part 3
-// Command-Independent functions.
-//
-
-//
-// Command Context Allocation and
-// De-Allocation Functions
-//
 size_t  Tss2_Sys_GetContextSize(
-    size_t maxCommandResponseSize
-    );
+    size_t maxCommandResponseSize);
 
 TSS2_RC Tss2_Sys_Initialize(
     TSS2_SYS_CONTEXT *sysContext,
     size_t contextSize,
     TSS2_TCTI_CONTEXT *tctiContext,
-    TSS2_ABI_VERSION *abiVersion
-    );
+    TSS2_ABI_VERSION *abiVersion);
 
 TSS2_RC Tss2_Sys_Finalize(
-    TSS2_SYS_CONTEXT *sysContext
-    );
+    TSS2_SYS_CONTEXT *sysContext);
 
 TSS2_RC Tss2_Sys_GetTctiContext(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_TCTI_CONTEXT **tctiContext
-    );
+    TSS2_TCTI_CONTEXT **tctiContext);
 
-//
-// Command Preparation Functions
-//
+/* Command Preparation Functions */
 TSS2_RC Tss2_Sys_GetDecryptParam(
     TSS2_SYS_CONTEXT *sysContext,
     size_t *decryptParamSize,
-    const uint8_t **decryptParamBuffer
-    );
+    const uint8_t **decryptParamBuffer);
 
 TSS2_RC Tss2_Sys_SetDecryptParam(
     TSS2_SYS_CONTEXT *sysContext,
     size_t decryptParamSize,
-    const uint8_t *decryptParamBuffer
-    );
+    const uint8_t *decryptParamBuffer);
 
 TSS2_RC Tss2_Sys_GetCpBuffer(
     TSS2_SYS_CONTEXT *sysContext,
@@ -119,62 +95,47 @@ TSS2_RC Tss2_Sys_GetCpBuffer(
     const uint8_t **cpBuffer);
 
 TSS2_RC Tss2_Sys_SetCmdAuths(
-    TSS2_SYS_CONTEXT * sysContext,
-    const TSS2L_SYS_AUTH_COMMAND *cmdAuthsArray
-    );
-
+    TSS2_SYS_CONTEXT *sysContext,
+    const TSS2L_SYS_AUTH_COMMAND *cmdAuthsArray);
 
-//
-// Command Execution Functions
-//
+/* Command Execution Functions */
 TSS2_RC Tss2_Sys_ExecuteAsync(
-    TSS2_SYS_CONTEXT *sysContext
-    );
+    TSS2_SYS_CONTEXT *sysContext);
 
 TSS2_RC Tss2_Sys_ExecuteFinish(
     TSS2_SYS_CONTEXT *sysContext,
-    int32_t timeout
-    );
+    int32_t timeout);
 
 TSS2_RC Tss2_Sys_Execute(
-    TSS2_SYS_CONTEXT *sysContext
-    );
+    TSS2_SYS_CONTEXT *sysContext);
 
-//
-// Command Completion functions:
-//
+/* Command Completion functions */
 TSS2_RC Tss2_Sys_GetCommandCode(
     TSS2_SYS_CONTEXT *sysContext,
-    UINT8 *commandCode
-    );
+    UINT8 *commandCode);
 
 TSS2_RC Tss2_Sys_GetRspAuths(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
-    );
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray);
 
 TSS2_RC Tss2_Sys_GetEncryptParam(
     TSS2_SYS_CONTEXT *sysContext,
     size_t *encryptParamSize,
-    const uint8_t **encryptParamBuffer
-    );
+    const uint8_t **encryptParamBuffer);
 
 TSS2_RC Tss2_Sys_SetEncryptParam(
     TSS2_SYS_CONTEXT *sysContext,
     size_t encryptParamSize,
-    const uint8_t *encryptParamBuffer
-    );
+    const uint8_t *encryptParamBuffer);
 
 TSS2_RC Tss2_Sys_GetRpBuffer(
     TSS2_SYS_CONTEXT *sysContext,
     size_t *rpBufferUsedSize,
-    const uint8_t **rpBuffer
-    );
+    const uint8_t **rpBuffer);
 
 #include "sys_api_part3.h"
 
 #ifdef __cplusplus
 }
 #endif
-
 #endif