TPM: remove duplicate definitions
With the recent change to tpm-v2.h, some enums are now defined twice and tpm2_tis_spi.c fails to build. Unfortunately I fear removing the defines from tpm_tis.h, like in this diff, will break the TPMv1 drivers tpm_tis_infineon.c and pm_tis_st33zp24_i2c.c, which depend on those defines. Maybe they should be added to tpm-v1.h as well? Or maybe they should be moved from tpm-v2.h to tpm_tis.h? I have no solution.
drivers/tpm/tpm_tis.h +0 -15
@@ -113,19 +113,4 @@ struct tpm_cmd_t {*/ #define MAX_COUNT_LONG 50 -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 , -}; -#endif
Hi Patrick,
Quoted 10 lines · Patrick Wildt
With the recent change to
tpm-v2.h, some enums are now defined twice andtpm2_tis_spi.cfails to build. Unfortunately I fear removing the defines fromtpm_tis.h, like in this diff, will break the TPMv1 driverstpm_tis_infineon.candpm_tis_st33zp24_i2c.c, which depend on those defines. Maybe they should be added totpm-v1.has well? Or maybe they should be moved fromtpm-v2.htotpm_tis.h? I have no solution.Signed-off-by Patrick Wildt <[email protected]>
There is a tpm_common.h so they could go in there perhaps.
Regards,
Simon