Apply clang-format
am: c76c21dd27
Change-Id: I0b33b132733f76dc109e37a2a186b88ccf5a97dd
diff --git a/halimpl/bcm2079x/adaptation/config.cpp b/halimpl/bcm2079x/adaptation/config.cpp
index dcf46a9..709ea19 100644
--- a/halimpl/bcm2079x/adaptation/config.cpp
+++ b/halimpl/bcm2079x/adaptation/config.cpp
@@ -488,8 +488,8 @@
m_list.push_back(pParam);
return;
}
- for (list<const CNfcParam*>::iterator it = m_list.begin(),
- itEnd = m_list.end();
+ for (list<const CNfcParam *>::iterator it = m_list.begin(),
+ itEnd = m_list.end();
it != itEnd; ++it) {
if (**it < pParam->c_str()) continue;
m_list.insert(it, pParam);
@@ -510,8 +510,8 @@
void CNfcConfig::moveFromList() {
if (m_list.size() == 0) return;
- for (list<const CNfcParam*>::iterator it = m_list.begin(),
- itEnd = m_list.end();
+ for (list<const CNfcParam *>::iterator it = m_list.begin(),
+ itEnd = m_list.end();
it != itEnd; ++it)
push_back(*it);
m_list.clear();
diff --git a/halimpl/pn54x/dnld/phDnldNfc.h b/halimpl/pn54x/dnld/phDnldNfc.h
index 210ac87..5b7e420 100644
--- a/halimpl/pn54x/dnld/phDnldNfc.h
+++ b/halimpl/pn54x/dnld/phDnldNfc.h
@@ -48,8 +48,8 @@
/* PN551 ChipVersion MRA1.0 */
#define PHDNLDNFC_HWVER_PN551_MRA1_0 (0x08U)
-#define PHDNLDNFC_HWVER_PN553_MRA1_0 \
- (0x0BU) /* PN553-NCI1.0 ChipVersion MRA1.0 */
+/* PN553-NCI1.0 ChipVersion MRA1.0 */
+#define PHDNLDNFC_HWVER_PN553_MRA1_0 (0x0BU)
/* PN553 A0 -> 0x40 hardware version
PN553 B0 -> 0x41
PN80T A0 -> 0x50
diff --git a/halimpl/pn54x/tml/phTmlNfc.h b/halimpl/pn54x/tml/phTmlNfc.h
index 24b7af8..3955354 100644
--- a/halimpl/pn54x/tml/phTmlNfc.h
+++ b/halimpl/pn54x/tml/phTmlNfc.h
@@ -188,8 +188,8 @@
* TML Deferred Callback structure used to invoke Upper layer Callback function.
*/
typedef struct {
- pphTmlNfc_DeferFuncPointer_t
- pDef_call; /*Deferred callback function to be invoked */
+ /* Deferred callback function to be invoked */
+ pphTmlNfc_DeferFuncPointer_t pDef_call;
/* Source identifier
*
* Identifier of the source which posted the message
diff --git a/halimpl/pn54x/utils/phNxpConfig.cpp b/halimpl/pn54x/utils/phNxpConfig.cpp
index 50bd7b6..5380193 100644
--- a/halimpl/pn54x/utils/phNxpConfig.cpp
+++ b/halimpl/pn54x/utils/phNxpConfig.cpp
@@ -567,8 +567,8 @@
m_list.push_back(pParam);
return;
}
- for (list<const CNfcParam*>::iterator it = m_list.begin(),
- itEnd = m_list.end();
+ for (list<const CNfcParam *>::iterator it = m_list.begin(),
+ itEnd = m_list.end();
it != itEnd; ++it) {
if (**it < pParam->c_str()) continue;
m_list.insert(it, pParam);
@@ -589,8 +589,8 @@
void CNfcConfig::moveFromList() {
if (m_list.size() == 0) return;
- for (list<const CNfcParam*>::iterator it = m_list.begin(),
- itEnd = m_list.end();
+ for (list<const CNfcParam *>::iterator it = m_list.begin(),
+ itEnd = m_list.end();
it != itEnd; ++it)
push_back(*it);
m_list.clear();
diff --git a/src/adaptation/config.cpp b/src/adaptation/config.cpp
index 3470efe..8085daa 100644
--- a/src/adaptation/config.cpp
+++ b/src/adaptation/config.cpp
@@ -499,8 +499,8 @@
m_list.push_back(pParam);
return;
}
- for (list<const CNfcParam*>::iterator it = m_list.begin(),
- itEnd = m_list.end();
+ for (list<const CNfcParam *>::iterator it = m_list.begin(),
+ itEnd = m_list.end();
it != itEnd; ++it) {
if (**it < pParam->c_str()) continue;
m_list.insert(it, pParam);
@@ -521,8 +521,8 @@
void CNfcConfig::moveFromList() {
if (m_list.size() == 0) return;
- for (list<const CNfcParam*>::iterator it = m_list.begin(),
- itEnd = m_list.end();
+ for (list<const CNfcParam *>::iterator it = m_list.begin(),
+ itEnd = m_list.end();
it != itEnd; ++it)
push_back(*it);
m_list.clear();
diff --git a/src/nfc/tags/rw_i93.c b/src/nfc/tags/rw_i93.c
index 5778cfd..e6b1323 100644
--- a/src/nfc/tags/rw_i93.c
+++ b/src/nfc/tags/rw_i93.c
@@ -323,7 +323,7 @@
**
*******************************************************************************/
void rw_i93_send_to_upper(NFC_HDR* p_resp) {
- uint8_t *p = (uint8_t*)(p_resp + 1) + p_resp->offset, *p_uid;
+ uint8_t *p = (uint8_t *)(p_resp + 1) + p_resp->offset, *p_uid;
uint16_t length = p_resp->len;
tRW_I93_CB* p_i93 = &rw_cb.tcb.i93;
tRW_DATA rw_data;
@@ -1377,7 +1377,7 @@
**
*******************************************************************************/
void rw_i93_sm_detect_ndef(NFC_HDR* p_resp) {
- uint8_t *p = (uint8_t*)(p_resp + 1) + p_resp->offset, *p_uid;
+ uint8_t *p = (uint8_t *)(p_resp + 1) + p_resp->offset, *p_uid;
uint8_t flags, u8 = 0, cc[4];
uint16_t length = p_resp->len, xx, block, first_block, last_block, num_blocks;
tRW_I93_CB* p_i93 = &rw_cb.tcb.i93;
@@ -2102,7 +2102,7 @@
**
*******************************************************************************/
void rw_i93_sm_format(NFC_HDR* p_resp) {
- uint8_t *p = (uint8_t*)(p_resp + 1) + p_resp->offset, *p_uid;
+ uint8_t *p = (uint8_t *)(p_resp + 1) + p_resp->offset, *p_uid;
uint8_t flags;
uint16_t length = p_resp->len, xx, block_number;
tRW_I93_CB* p_i93 = &rw_cb.tcb.i93;
diff --git a/src/nfc/tags/rw_t3t.c b/src/nfc/tags/rw_t3t.c
index 2d1768b..817901d 100644
--- a/src/nfc/tags/rw_t3t.c
+++ b/src/nfc/tags/rw_t3t.c
@@ -170,15 +170,10 @@
RW_T3T_DEFAULT_FELICALITE_NBW, /* NBw (max block write per cmd)*/
(RW_T3T_DEFAULT_FELICALITE_NMAXB >> 8), /* Nmaxb (max size in blocks) */
(RW_T3T_DEFAULT_FELICALITE_NMAXB & 0xFF), /* Nmaxb (max size in blocks) */
- 0,
- 0,
- 0,
- 0, /* Unused */
- T3T_MSG_NDEF_WRITEF_OFF, /* WriteF */
- T3T_MSG_NDEF_RWFLAG_RW, /* RW Flag */
- 0,
- 0,
- 0, /* Ln (current size in bytes) */
+ 0, 0, 0, 0, /* Unused */
+ T3T_MSG_NDEF_WRITEF_OFF, /* WriteF */
+ T3T_MSG_NDEF_RWFLAG_RW, /* RW Flag */
+ 0, 0, 0, /* Ln (current size in bytes) */
(RW_T3T_DEFAULT_FELICALITE_ATTRIB_INFO_CHECKSUM >>
8), /* checksum (high-byte) */
