Fix misc-macro-parentheses warnings in system/nfc.
Bug: 28705665
Test: make with WITH_TIDY=1 WITH_TIDY_CHECKS=-*,misc-macro-* \
WITH_TIDY_FLAGS=-header-filter=system/nfc/.*
Change-Id: I96c51baad1d2fc8ede2d19aba557cad76ed9d9df
diff --git a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
index 74743c4..6efa48d 100644
--- a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
+++ b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
@@ -56,9 +56,9 @@
#define LINUX_SEC (1000 / TICKS_PER_SEC)
// #define GKI_TICK_TIMER_DEBUG
-#define LOCK(m) pthread_mutex_lock(&m)
-#define UNLOCK(m) pthread_mutex_unlock(&m)
-#define INIT(m) pthread_mutex_init(&m, NULL)
+#define LOCK(m) pthread_mutex_lock(&(m))
+#define UNLOCK(m) pthread_mutex_unlock(&(m))
+#define INIT(m) pthread_mutex_init(&(m), NULL)
/* this kind of mutex go into tGKI_OS control block!!!! */
/* static pthread_mutex_t GKI_sched_mutex; */
diff --git a/src/gki/ulinux/gki_ulinux.c b/src/gki/ulinux/gki_ulinux.c
index 31bdcd6..cb02add 100644
--- a/src/gki/ulinux/gki_ulinux.c
+++ b/src/gki/ulinux/gki_ulinux.c
@@ -53,9 +53,9 @@
#define LINUX_SEC (1000 / TICKS_PER_SEC)
// #define GKI_TICK_TIMER_DEBUG
-#define LOCK(m) pthread_mutex_lock(&m)
-#define UNLOCK(m) pthread_mutex_unlock(&m)
-#define INIT(m) pthread_mutex_init(&m, NULL)
+#define LOCK(m) pthread_mutex_lock(&(m))
+#define UNLOCK(m) pthread_mutex_unlock(&(m))
+#define INIT(m) pthread_mutex_init(&(m), NULL)
/* this kind of mutex go into tGKI_OS control block!!!! */
/* static pthread_mutex_t GKI_sched_mutex; */
diff --git a/src/hal/include/nci_defs.h b/src/hal/include/nci_defs.h
index 1428e50..46969e0 100644
--- a/src/hal/include/nci_defs.h
+++ b/src/hal/include/nci_defs.h
@@ -122,19 +122,19 @@
#define NCI_MSG_BLD_HDR1(p, oid) *(p)++ = (uint8_t)(((oid) << NCI_OID_SHIFT));
/* parse byte0 of NCI packet */
-#define NCI_MSG_PRS_HDR0(p, mt, pbf, gid) \
- mt = (*(p)&NCI_MT_MASK) >> NCI_MT_SHIFT; \
- pbf = (*(p)&NCI_PBF_MASK) >> NCI_PBF_SHIFT; \
- gid = *(p)++ & NCI_GID_MASK;
+#define NCI_MSG_PRS_HDR0(p, mt, pbf, gid) \
+ mt = (*(p)&NCI_MT_MASK) >> NCI_MT_SHIFT; \
+ (pbf) = (*(p)&NCI_PBF_MASK) >> NCI_PBF_SHIFT; \
+ (gid) = *(p)++ & NCI_GID_MASK;
/* parse MT and PBF bits of NCI packet */
#define NCI_MSG_PRS_MT_PBF(p, mt, pbf) \
mt = (*(p)&NCI_MT_MASK) >> NCI_MT_SHIFT; \
- pbf = (*(p)&NCI_PBF_MASK) >> NCI_PBF_SHIFT;
+ (pbf) = (*(p)&NCI_PBF_MASK) >> NCI_PBF_SHIFT;
/* parse byte1 of NCI Cmd/Ntf */
-#define NCI_MSG_PRS_HDR1(p, oid) \
- oid = (*(p)&NCI_OID_MASK); \
+#define NCI_MSG_PRS_HDR1(p, oid) \
+ (oid) = (*(p)&NCI_OID_MASK); \
(p)++;
/* NCI Data Format:
@@ -156,11 +156,11 @@
*(p)++ = 0; \
*(p)++ = (len);
-#define NCI_DATA_PRS_HDR(p, pbf, cid, len) \
- (pbf) = (*(p)&NCI_PBF_MASK) >> NCI_PBF_SHIFT; \
- (cid) = (*(p)&NCI_CID_MASK); \
- p++; \
- p++; \
+#define NCI_DATA_PRS_HDR(p, pbf, cid, len) \
+ (pbf) = (*(p)&NCI_PBF_MASK) >> NCI_PBF_SHIFT; \
+ (cid) = (*(p)&NCI_CID_MASK); \
+ (p)++; \
+ (p)++; \
(len) = *(p)++;
/* Logical target ID 0x01-0xFE */
diff --git a/src/hal/include/nfc_types.h b/src/hal/include/nfc_types.h
index 6ba5efc..d373335 100644
--- a/src/hal/include/nfc_types.h
+++ b/src/hal/include/nfc_types.h
@@ -91,119 +91,119 @@
{ *(p)++ = (uint8_t)(u8); }
#define INT8_TO_STREAM(p, u8) \
{ *(p)++ = (int8_t)(u8); }
-#define ARRAY32_TO_STREAM(p, a) \
+#define ARRAY32_TO_STREAM(p, a) \
+ { \
+ register int ijk; \
+ for (ijk = 0; ijk < 32; ijk++) *(p)++ = (uint8_t)(a)[31 - ijk]; \
+ }
+#define ARRAY16_TO_STREAM(p, a) \
+ { \
+ register int ijk; \
+ for (ijk = 0; ijk < 16; ijk++) *(p)++ = (uint8_t)(a)[15 - ijk]; \
+ }
+#define ARRAY8_TO_STREAM(p, a) \
{ \
register int ijk; \
- for (ijk = 0; ijk < 32; ijk++) *(p)++ = (uint8_t)a[31 - ijk]; \
+ for (ijk = 0; ijk < 8; ijk++) *(p)++ = (uint8_t)(a)[7 - ijk]; \
}
-#define ARRAY16_TO_STREAM(p, a) \
- { \
- register int ijk; \
- for (ijk = 0; ijk < 16; ijk++) *(p)++ = (uint8_t)a[15 - ijk]; \
- }
-#define ARRAY8_TO_STREAM(p, a) \
- { \
- register int ijk; \
- for (ijk = 0; ijk < 8; ijk++) *(p)++ = (uint8_t)a[7 - ijk]; \
- }
-#define BDADDR_TO_STREAM(p, a) \
- { \
- register int ijk; \
- for (ijk = 0; ijk < BD_ADDR_LEN; ijk++) \
- *(p)++ = (uint8_t)a[BD_ADDR_LEN - 1 - ijk]; \
- }
-#define LAP_TO_STREAM(p, a) \
- { \
- register int ijk; \
- for (ijk = 0; ijk < LAP_LEN; ijk++) \
- *(p)++ = (uint8_t)a[LAP_LEN - 1 - ijk]; \
- }
-#define DEVCLASS_TO_STREAM(p, a) \
+#define BDADDR_TO_STREAM(p, a) \
{ \
register int ijk; \
- for (ijk = 0; ijk < DEV_CLASS_LEN; ijk++) \
- *(p)++ = (uint8_t)a[DEV_CLASS_LEN - 1 - ijk]; \
+ for (ijk = 0; ijk < BD_ADDR_LEN; ijk++) \
+ *(p)++ = (uint8_t)(a)[BD_ADDR_LEN - 1 - ijk]; \
}
-#define ARRAY_TO_STREAM(p, a, len) \
- { \
- register int ijk; \
- for (ijk = 0; ijk < len; ijk++) *(p)++ = (uint8_t)a[ijk]; \
+#define LAP_TO_STREAM(p, a) \
+ { \
+ register int ijk; \
+ for (ijk = 0; ijk < LAP_LEN; ijk++) \
+ *(p)++ = (uint8_t)(a)[LAP_LEN - 1 - ijk]; \
}
-#define REVERSE_ARRAY_TO_STREAM(p, a, len) \
- { \
- register int ijk; \
- for (ijk = 0; ijk < len; ijk++) *(p)++ = (uint8_t)a[len - 1 - ijk]; \
+#define DEVCLASS_TO_STREAM(p, a) \
+ { \
+ register int ijk; \
+ for (ijk = 0; ijk < DEV_CLASS_LEN; ijk++) \
+ *(p)++ = (uint8_t)(a)[DEV_CLASS_LEN - 1 - ijk]; \
+ }
+#define ARRAY_TO_STREAM(p, a, len) \
+ { \
+ register int ijk; \
+ for (ijk = 0; ijk < (len); ijk++) *(p)++ = (uint8_t)(a)[ijk]; \
+ }
+#define REVERSE_ARRAY_TO_STREAM(p, a, len) \
+ { \
+ register int ijk; \
+ for (ijk = 0; ijk < (len); ijk++) *(p)++ = (uint8_t)(a)[(len) - 1 - ijk]; \
}
-#define STREAM_TO_UINT8(u8, p) \
- { \
- u8 = (uint8_t)(*(p)); \
- (p) += 1; \
+#define STREAM_TO_UINT8(u8, p) \
+ { \
+ (u8) = (uint8_t)(*(p)); \
+ (p) += 1; \
}
-#define STREAM_TO_UINT16(u16, p) \
- { \
- u16 = ((uint16_t)(*(p)) + (((uint16_t)(*((p) + 1))) << 8)); \
- (p) += 2; \
+#define STREAM_TO_UINT16(u16, p) \
+ { \
+ (u16) = ((uint16_t)(*(p)) + (((uint16_t)(*((p) + 1))) << 8)); \
+ (p) += 2; \
}
-#define STREAM_TO_UINT24(u32, p) \
- { \
- u32 = (((uint32_t)(*(p))) + ((((uint32_t)(*((p) + 1)))) << 8) + \
- ((((uint32_t)(*((p) + 2)))) << 16)); \
- (p) += 3; \
+#define STREAM_TO_UINT24(u32, p) \
+ { \
+ (u32) = (((uint32_t)(*(p))) + ((((uint32_t)(*((p) + 1)))) << 8) + \
+ ((((uint32_t)(*((p) + 2)))) << 16)); \
+ (p) += 3; \
}
-#define STREAM_TO_UINT32(u32, p) \
- { \
- u32 = (((uint32_t)(*(p))) + ((((uint32_t)(*((p) + 1)))) << 8) + \
- ((((uint32_t)(*((p) + 2)))) << 16) + \
- ((((uint32_t)(*((p) + 3)))) << 24)); \
- (p) += 4; \
+#define STREAM_TO_UINT32(u32, p) \
+ { \
+ (u32) = (((uint32_t)(*(p))) + ((((uint32_t)(*((p) + 1)))) << 8) + \
+ ((((uint32_t)(*((p) + 2)))) << 16) + \
+ ((((uint32_t)(*((p) + 3)))) << 24)); \
+ (p) += 4; \
}
-#define STREAM_TO_BDADDR(a, p) \
- { \
- register int ijk; \
- register uint8_t* pbda = (uint8_t*)a + BD_ADDR_LEN - 1; \
- for (ijk = 0; ijk < BD_ADDR_LEN; ijk++) *pbda-- = *p++; \
+#define STREAM_TO_BDADDR(a, p) \
+ { \
+ register int ijk; \
+ register uint8_t* pbda = (uint8_t*)(a) + BD_ADDR_LEN - 1; \
+ for (ijk = 0; ijk < BD_ADDR_LEN; ijk++) *pbda-- = *(p)++; \
}
-#define STREAM_TO_ARRAY32(a, p) \
- { \
- register int ijk; \
- register uint8_t* _pa = (uint8_t*)a + 31; \
- for (ijk = 0; ijk < 32; ijk++) *_pa-- = *p++; \
+#define STREAM_TO_ARRAY32(a, p) \
+ { \
+ register int ijk; \
+ register uint8_t* _pa = (uint8_t*)(a) + 31; \
+ for (ijk = 0; ijk < 32; ijk++) *_pa-- = *(p)++; \
}
-#define STREAM_TO_ARRAY16(a, p) \
- { \
- register int ijk; \
- register uint8_t* _pa = (uint8_t*)a + 15; \
- for (ijk = 0; ijk < 16; ijk++) *_pa-- = *p++; \
+#define STREAM_TO_ARRAY16(a, p) \
+ { \
+ register int ijk; \
+ register uint8_t* _pa = (uint8_t*)(a) + 15; \
+ for (ijk = 0; ijk < 16; ijk++) *_pa-- = *(p)++; \
}
-#define STREAM_TO_ARRAY8(a, p) \
- { \
- register int ijk; \
- register uint8_t* _pa = (uint8_t*)a + 7; \
- for (ijk = 0; ijk < 8; ijk++) *_pa-- = *p++; \
- }
-#define STREAM_TO_DEVCLASS(a, p) \
- { \
- register int ijk; \
- register uint8_t* _pa = (uint8_t*)a + DEV_CLASS_LEN - 1; \
- for (ijk = 0; ijk < DEV_CLASS_LEN; ijk++) *_pa-- = *p++; \
- }
-#define STREAM_TO_LAP(a, p) \
- { \
- register int ijk; \
- register uint8_t* plap = (uint8_t*)a + LAP_LEN - 1; \
- for (ijk = 0; ijk < LAP_LEN; ijk++) *plap-- = *p++; \
- }
-#define STREAM_TO_ARRAY(a, p, len) \
- { \
- register int ijk; \
- for (ijk = 0; ijk < len; ijk++) ((uint8_t*)a)[ijk] = *p++; \
- }
-#define REVERSE_STREAM_TO_ARRAY(a, p, len) \
+#define STREAM_TO_ARRAY8(a, p) \
{ \
register int ijk; \
- register uint8_t* _pa = (uint8_t*)a + len - 1; \
- for (ijk = 0; ijk < len; ijk++) *_pa-- = *p++; \
+ register uint8_t* _pa = (uint8_t*)(a) + 7; \
+ for (ijk = 0; ijk < 8; ijk++) *_pa-- = *(p)++; \
+ }
+#define STREAM_TO_DEVCLASS(a, p) \
+ { \
+ register int ijk; \
+ register uint8_t* _pa = (uint8_t*)(a) + DEV_CLASS_LEN - 1; \
+ for (ijk = 0; ijk < DEV_CLASS_LEN; ijk++) *_pa-- = *(p)++; \
+ }
+#define STREAM_TO_LAP(a, p) \
+ { \
+ register int ijk; \
+ register uint8_t* plap = (uint8_t*)(a) + LAP_LEN - 1; \
+ for (ijk = 0; ijk < LAP_LEN; ijk++) *plap-- = *(p)++; \
+ }
+#define STREAM_TO_ARRAY(a, p, len) \
+ { \
+ register int ijk; \
+ for (ijk = 0; ijk < (len); ijk++) ((uint8_t*)(a))[ijk] = *(p)++; \
+ }
+#define REVERSE_STREAM_TO_ARRAY(a, p, len) \
+ { \
+ register int ijk; \
+ register uint8_t* _pa = (uint8_t*)(a) + (len) - 1; \
+ for (ijk = 0; ijk < (len); ijk++) *_pa-- = *(p)++; \
}
/*****************************************************************************
@@ -256,38 +256,38 @@
}
#define UINT8_TO_BE_STREAM(p, u8) \
{ *(p)++ = (uint8_t)(u8); }
-#define ARRAY_TO_BE_STREAM(p, a, len) \
- { \
- register int ijk; \
- for (ijk = 0; ijk < len; ijk++) *(p)++ = (uint8_t)a[ijk]; \
+#define ARRAY_TO_BE_STREAM(p, a, len) \
+ { \
+ register int ijk; \
+ for (ijk = 0; ijk < (len); ijk++) *(p)++ = (uint8_t)(a)[ijk]; \
}
-#define BE_STREAM_TO_UINT8(u8, p) \
- { \
- u8 = (uint8_t)(*(p)); \
- (p) += 1; \
+#define BE_STREAM_TO_UINT8(u8, p) \
+ { \
+ (u8) = (uint8_t)(*(p)); \
+ (p) += 1; \
}
-#define BE_STREAM_TO_UINT16(u16, p) \
+#define BE_STREAM_TO_UINT16(u16, p) \
+ { \
+ (u16) = (uint16_t)(((uint16_t)(*(p)) << 8) + (uint16_t)(*((p) + 1))); \
+ (p) += 2; \
+ }
+#define BE_STREAM_TO_UINT24(u32, p) \
{ \
- u16 = (uint16_t)(((uint16_t)(*(p)) << 8) + (uint16_t)(*((p) + 1))); \
- (p) += 2; \
- }
-#define BE_STREAM_TO_UINT24(u32, p) \
- { \
- u32 = (((uint32_t)(*((p) + 2))) + ((uint32_t)(*((p) + 1)) << 8) + \
- ((uint32_t)(*(p)) << 16)); \
- (p) += 3; \
+ (u32) = (((uint32_t)(*((p) + 2))) + ((uint32_t)(*((p) + 1)) << 8) + \
+ ((uint32_t)(*(p)) << 16)); \
+ (p) += 3; \
}
#define BE_STREAM_TO_UINT32(u32, p) \
{ \
- u32 = ((uint32_t)(*((p) + 3)) + ((uint32_t)(*((p) + 2)) << 8) + \
+ (u32) = ((uint32_t)(*((p) + 3)) + ((uint32_t)(*((p) + 2)) << 8) + \
((uint32_t)(*((p) + 1)) << 16) + ((uint32_t)(*(p)) << 24)); \
(p) += 4; \
}
-#define BE_STREAM_TO_ARRAY(p, a, len) \
- { \
- register int ijk; \
- for (ijk = 0; ijk < len; ijk++) ((uint8_t*)a)[ijk] = *p++; \
+#define BE_STREAM_TO_ARRAY(p, a, len) \
+ { \
+ register int ijk; \
+ for (ijk = 0; ijk < (len); ijk++) ((uint8_t*)(a))[ijk] = *(p)++; \
}
/*****************************************************************************
diff --git a/src/include/nfc_target.h b/src/include/nfc_target.h
index fd56462..7cd1f51 100644
--- a/src/include/nfc_target.h
+++ b/src/include/nfc_target.h
@@ -652,10 +652,10 @@
** as the NFC stack.
*****************************************************************************/
#ifndef HAL_WRITE
-#define HAL_WRITE(p) \
- { \
- nfc_cb.p_hal->write(p->len, (uint8_t*)(p + 1) + p->offset); \
- GKI_freebuf(p); \
+#define HAL_WRITE(p) \
+ { \
+ nfc_cb.p_hal->write((p)->len, (uint8_t*)((p) + 1) + (p)->offset); \
+ GKI_freebuf(p); \
}
#ifdef NFC_HAL_SHARED_GKI
diff --git a/src/nfc/include/nfc_api.h b/src/nfc/include/nfc_api.h
index 2a35942..ae9b0df 100644
--- a/src/nfc/include/nfc_api.h
+++ b/src/nfc/include/nfc_api.h
@@ -395,7 +395,7 @@
/* Type5Tag - NFC-V/ISO15693*/
#define NFC_PROTOCOL_T5T NFC_PROTOCOL_T5T_(NFC_GetNCIVersion())
#define NFC_PROTOCOL_T5T_(x) \
- ((x == NCI_VERSION_2_0) ? NCI_PROTOCOL_T5T : NCI_PROTOCOL_15693)
+ (((x) == NCI_VERSION_2_0) ? NCI_PROTOCOL_T5T : NCI_PROTOCOL_15693)
/* Type 4A,4B - NFC-A or NFC-B */
#define NFC_PROTOCOL_ISO_DEP NCI_PROTOCOL_ISO_DEP
/* NFCDEP/LLCP - NFC-A or NFC-F */
diff --git a/src/nfc/include/rw_api.h b/src/nfc/include/rw_api.h
index c8bb55b..301b14e 100644
--- a/src/nfc/include/rw_api.h
+++ b/src/nfc/include/rw_api.h
@@ -27,8 +27,8 @@
#define RW_API_H
#include "tags_defs.h"
-#define RW_T1T_BLD_ADD(a, k, y) a = ((k & 0xF) << 3) | (y & 0x7);
-#define RW_T1T_BLD_ADDS(a, s) a = ((s & 0xF) << 4);
+#define RW_T1T_BLD_ADD(a, k, y) (a) = (((k) & 0xF) << 3) | ((y) & 0x7);
+#define RW_T1T_BLD_ADDS(a, s) (a) = (((s) & 0xF) << 4);
#define RW_T1T_FIRST_EVT 0x20
#define RW_T2T_FIRST_EVT 0x40
diff --git a/src/nfc/int/nfc_int.h b/src/nfc/int/nfc_int.h
index c3fb85c..347456e 100644
--- a/src/nfc/int/nfc_int.h
+++ b/src/nfc/int/nfc_int.h
@@ -243,7 +243,7 @@
****************************************************************************/
#define NCI_CALCULATE_ACK(a, v) \
- { a &= ((1 << v) - 1); }
+ { (a) &= ((1 << (v)) - 1); }
#define MAX_NUM_VALID_BITS_FOR_ACK 0x07
extern void nfc_init(void);
diff --git a/src/nfc/tags/rw_t3t.c b/src/nfc/tags/rw_t3t.c
index 817901d..88859f0 100644
--- a/src/nfc/tags/rw_t3t.c
+++ b/src/nfc/tags/rw_t3t.c
@@ -60,7 +60,7 @@
#define RW_T3T_MIN_TIMEOUT_TICKS 10
/* Macro to extract major version from NDEF version byte */
-#define T3T_GET_MAJOR_VERSION(ver) (ver >> 4)
+#define T3T_GET_MAJOR_VERSION(ver) ((ver) >> 4)
/* Enumeration of API commands */
enum {