git: 35c8063ab1de - main - bhyve: dos2unix
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 20 Jun 2023 09:52:47 UTC
The branch main has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=35c8063ab1dec62bf9ff36c0f75d92c32f021462
commit 35c8063ab1dec62bf9ff36c0f75d92c32f021462
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2023-06-20 09:47:42 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-06-20 09:52:43 +0000
bhyve: dos2unix
tpm_intf.h was incorrectly committed with dos line endings.
Fixes: 0917f925b46e3142c4373d1591bf22014d0f338e ("bhyve: add basic CRB interface for TPM devices")
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
---
usr.sbin/bhyve/tpm_intf.h | 76 +++++++++++++++++++++++------------------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/usr.sbin/bhyve/tpm_intf.h b/usr.sbin/bhyve/tpm_intf.h
index 020743c0c3f1..0bfecf9206d4 100644
--- a/usr.sbin/bhyve/tpm_intf.h
+++ b/usr.sbin/bhyve/tpm_intf.h
@@ -1,38 +1,38 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG
- * Author: Corvin Köhne <c.koehne@beckhoff.com>
- */
-
-#pragma once
-
-#include <vmmapi.h>
-
-#include "config.h"
-#include "tpm_device.h"
-#include "tpm_emul.h"
-
-#define TPM_INTF_TYPE_FIFO_PTP 0x0
-#define TPM_INTF_TYPE_CRB 0x1
-#define TPM_INTF_TYPE_FIFO_TIS 0xF
-
-#define TPM_INTF_VERSION_FIFO 0
-#define TPM_INTF_VERSION_CRB 1
-
-#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_4 0
-#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_8 1
-#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_32 2
-#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_64 3
-
-#define TPM_INTF_SELECTOR_FIFO 0
-#define TPM_INTF_SELECTOR_CRB 1
-
-struct tpm_intf {
- const char *name;
-
- int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc);
- void (*deinit)(void *sc);
- int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx);
-};
-#define TPM_INTF_SET(x) DATA_SET(tpm_intf_set, x)
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG
+ * Author: Corvin Köhne <c.koehne@beckhoff.com>
+ */
+
+#pragma once
+
+#include <vmmapi.h>
+
+#include "config.h"
+#include "tpm_device.h"
+#include "tpm_emul.h"
+
+#define TPM_INTF_TYPE_FIFO_PTP 0x0
+#define TPM_INTF_TYPE_CRB 0x1
+#define TPM_INTF_TYPE_FIFO_TIS 0xF
+
+#define TPM_INTF_VERSION_FIFO 0
+#define TPM_INTF_VERSION_CRB 1
+
+#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_4 0
+#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_8 1
+#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_32 2
+#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_64 3
+
+#define TPM_INTF_SELECTOR_FIFO 0
+#define TPM_INTF_SELECTOR_CRB 1
+
+struct tpm_intf {
+ const char *name;
+
+ int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc);
+ void (*deinit)(void *sc);
+ int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx);
+};
+#define TPM_INTF_SET(x) DATA_SET(tpm_intf_set, x)