Get rid of some crufty macros.

These were macros that were never used, or that were only set to one thing and
could be substituted up front.

I left in code guarded by the HAVE_ENDIAN_H and HAVE_LITTLE_ENDIAN macros even
though those are never defined because they guard a reportedly significantly
faster implementation of some functionality, at least according to a comment
in the source. It would be a good idea to enable that code path and see if it
really does make a big difference before removing it entirely.

BUG=None
TEST=Built for Link, Daisy, and the host with FEATURES=test. Built depthcharge
for Link and booted in normal mode.
BRANCH=None

Change-Id: I934a4dd0da169ac018ba07350d56924ab88b1acc
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/45687
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>

2 files changed, 13 insertions, 12 deletions

diff --git a/firmware/lib/tpm_lite/include/tlcl_internal.h b/firmware/lib/tpm_lite/include/tlcl_internal.h
index 91d3ee15..51fe6ef3 100644
--- a/firmware/lib/tpm_lite/include/tlcl_internal.h
+++ b/firmware/lib/tpm_lite/include/tlcl_internal.h
@@ -22,8 +22,8 @@
  * command buffer.  FromTpmTYPE gets a value of type TYPE from a TPM command
  * buffer into a variable.
  */
-POSSIBLY_UNUSED
-static INLINE void ToTpmUint32(uint8_t *buffer, uint32_t x) {
+__attribute__((unused))
+static inline void ToTpmUint32(uint8_t *buffer, uint32_t x) {
   buffer[0] = (uint8_t)(x >> 24);
   buffer[1] = (uint8_t)((x >> 16) & 0xff);
   buffer[2] = (uint8_t)((x >> 8) & 0xff);
@@ -33,8 +33,8 @@ static INLINE void ToTpmUint32(uint8_t *buffer, uint32_t x) {
 /*
  * See comment for above function.
  */
-POSSIBLY_UNUSED
-static INLINE void FromTpmUint32(const uint8_t *buffer, uint32_t *x) {
+__attribute__((unused))
+static inline void FromTpmUint32(const uint8_t *buffer, uint32_t *x) {
   *x = ((buffer[0] << 24) |
         (buffer[1] << 16) |
         (buffer[2] << 8) |
@@ -44,8 +44,8 @@ static INLINE void FromTpmUint32(const uint8_t *buffer, uint32_t *x) {
 /*
  * See comment for above function.
  */
-POSSIBLY_UNUSED
-static INLINE void ToTpmUint16(uint8_t *buffer, uint16_t x) {
+__attribute__((unused))
+static inline void ToTpmUint16(uint8_t *buffer, uint16_t x) {
   buffer[0] = (uint8_t)(x >> 8);
   buffer[1] = (uint8_t)(x & 0xff);
 }
@@ -53,8 +53,8 @@ static INLINE void ToTpmUint16(uint8_t *buffer, uint16_t x) {
 /*
  * See comment for above function.
  */
-POSSIBLY_UNUSED
-static INLINE void FromTpmUint16(const uint8_t *buffer, uint16_t *x) {
+__attribute__((unused))
+static inline void FromTpmUint16(const uint8_t *buffer, uint16_t *x) {
   *x = (buffer[0] << 8) | buffer[1];
 }
 
diff --git a/firmware/lib/tpm_lite/tlcl.c b/firmware/lib/tpm_lite/tlcl.c
index 7acca9a1..50b3877b 100644
--- a/firmware/lib/tpm_lite/tlcl.c
+++ b/firmware/lib/tpm_lite/tlcl.c
@@ -27,12 +27,13 @@
 #endif
 
 /* Sets the size field of a TPM command. */
-static INLINE void SetTpmCommandSize(uint8_t* buffer, uint32_t size) {
+static inline void SetTpmCommandSize(uint8_t* buffer, uint32_t size) {
   ToTpmUint32(buffer + sizeof(uint16_t), size);
 }
 
 /* Gets the size field of a TPM command. */
-POSSIBLY_UNUSED static INLINE int TpmCommandSize(const uint8_t* buffer) {
+__attribute__((unused))
+static inline int TpmCommandSize(const uint8_t* buffer) {
   uint32_t size;
   FromTpmUint32(buffer + sizeof(uint16_t), &size);
   return (int) size;
@@ -44,14 +45,14 @@ int TlclPacketSize(const uint8_t* packet) {
 }
 
 /* Gets the code field of a TPM command. */
-static INLINE int TpmCommandCode(const uint8_t* buffer) {
+static inline int TpmCommandCode(const uint8_t* buffer) {
   uint32_t code;
   FromTpmUint32(buffer + sizeof(uint16_t) + sizeof(uint32_t), &code);
   return code;
 }
 
 /* Gets the return code field of a TPM result. */
-static INLINE int TpmReturnCode(const uint8_t* buffer) {
+static inline int TpmReturnCode(const uint8_t* buffer) {
   return TpmCommandCode(buffer);
 }