From bf7faa1a634e8bed0d0a8b6634dfe10f42ab986c Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Mon, 19 Sep 2016 19:21:24 -0700 Subject: Revert "drivers/i2c/tpm: Move common variables to header" This reverts commit 64df72e8e2d1c086705325533767ca5e201e842a. --- src/drivers/i2c/tpm/tpm.c | 22 ++++++++++++++++++++++ src/drivers/i2c/tpm/tpm.h | 23 ----------------------- 2 files changed, 22 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c index 6b96774f60..f75bcd7269 100644 --- a/src/drivers/i2c/tpm/tpm.c +++ b/src/drivers/i2c/tpm/tpm.c @@ -240,6 +240,28 @@ static int iic_tpm_write_long(uint8_t addr, uint8_t *buffer, size_t len) MAX_COUNT_LONG); } +#define TPM_HEADER_SIZE 10 + +enum tis_access { + TPM_ACCESS_VALID = 0x80, + TPM_ACCESS_ACTIVE_LOCALITY = 0x20, + TPM_ACCESS_REQUEST_PENDING = 0x04, + TPM_ACCESS_REQUEST_USE = 0x02, +}; + +enum tis_status { + TPM_STS_VALID = 0x80, + TPM_STS_COMMAND_READY = 0x40, + TPM_STS_GO = 0x20, + TPM_STS_DATA_AVAIL = 0x10, + TPM_STS_DATA_EXPECT = 0x08, +}; + +#define TPM_ACCESS(l) (0x0000 | ((l) << 4)) +#define TPM_STS(l) (0x0001 | ((l) << 4)) +#define TPM_DATA_FIFO(l) (0x0005 | ((l) << 4)) +#define TPM_DID_VID(l) (0x0006 | ((l) << 4)) + static int check_locality(struct tpm_chip *chip, int loc) { uint8_t buf; diff --git a/src/drivers/i2c/tpm/tpm.h b/src/drivers/i2c/tpm/tpm.h index 048c848de2..ddf12a9e98 100644 --- a/src/drivers/i2c/tpm/tpm.h +++ b/src/drivers/i2c/tpm/tpm.h @@ -36,9 +36,6 @@ enum tpm_timeout { /* Size of external transmit buffer (used for stack buffer in tpm_sendrecv) */ #define TPM_BUFSIZE 1260 -/* Number of bytes in the TPM header */ -#define TPM_HEADER_SIZE 10 - /* Index of fields in TPM command buffer */ #define TPM_CMD_SIZE_BYTE 2 #define TPM_CMD_ORDINAL_BYTE 6 @@ -47,26 +44,6 @@ enum tpm_timeout { #define TPM_RSP_SIZE_BYTE 2 #define TPM_RSP_RC_BYTE 6 -enum tis_access { - TPM_ACCESS_VALID = 0x80, - TPM_ACCESS_ACTIVE_LOCALITY = 0x20, - TPM_ACCESS_REQUEST_PENDING = 0x04, - TPM_ACCESS_REQUEST_USE = 0x02, -}; - -enum tis_status { - TPM_STS_VALID = 0x80, - TPM_STS_COMMAND_READY = 0x40, - TPM_STS_GO = 0x20, - TPM_STS_DATA_AVAIL = 0x10, - TPM_STS_DATA_EXPECT = 0x08, -}; - -#define TPM_ACCESS(l) (0x0000 | ((l) << 4)) -#define TPM_STS(l) (0x0001 | ((l) << 4)) -#define TPM_DATA_FIFO(l) (0x0005 | ((l) << 4)) -#define TPM_DID_VID(l) (0x0006 | ((l) << 4)) - struct tpm_chip; struct tpm_vendor_specific { -- cgit v1.2.3