Merge "Remove unused parameters, unused variables, unused functions" am: f02c223b66
am: 0b138d0190
Change-Id: I22fb8d468ebca5d7cfe1bb023f021f8381ebb16f
diff --git a/src/Android.bp b/src/Android.bp
index 44956be..19725dc 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -25,9 +25,8 @@
],
cflags: [
"-DBUILDCFG=1",
- "-Wno-deprecated-register",
- "-Wno-unused-parameter",
- "-Wno-missing-field-initializers",
+ "-Wall",
+ "-Werror",
],
local_include_dirs: [
"include",
diff --git a/src/adaptation/CrcChecksum.cc b/src/adaptation/CrcChecksum.cc
index 9f0e72e..81a9125 100644
--- a/src/adaptation/CrcChecksum.cc
+++ b/src/adaptation/CrcChecksum.cc
@@ -63,9 +63,9 @@
**
*******************************************************************************/
unsigned short crcChecksumCompute(const unsigned char* buffer, int bufferLen) {
- register unsigned short crc = 0;
- const register unsigned char* cp = buffer;
- register int cnt = bufferLen;
+ unsigned short crc = 0;
+ const unsigned char* cp = buffer;
+ int cnt = bufferLen;
while (cnt--) {
crc = ((crc >> 8) & 0xff) ^ crctab[(crc & 0xff) ^ *cp++];
diff --git a/src/adaptation/NfcAdaptation.cc b/src/adaptation/NfcAdaptation.cc
index b7821b8..1c231b1 100644
--- a/src/adaptation/NfcAdaptation.cc
+++ b/src/adaptation/NfcAdaptation.cc
@@ -161,8 +161,6 @@
if (GetNumValue(NAME_USE_RAW_NCI_TRACE, &num, sizeof(num))) {
if (num == 1) {
- // display protocol traces in raw format
- ProtoDispAdapterUseRawOutput(TRUE);
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: logging protocol in raw format", func);
}
@@ -294,7 +292,7 @@
** Returns: none
**
*******************************************************************************/
-uint32_t NfcAdaptation::NFCA_TASK(uint32_t arg) {
+uint32_t NfcAdaptation::NFCA_TASK(__attribute__((unused)) uint32_t arg) {
const char* func = "NfcAdaptation::NFCA_TASK";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", func);
GKI_run(0);
@@ -311,7 +309,7 @@
** Returns: none
**
*******************************************************************************/
-uint32_t NfcAdaptation::Thread(uint32_t arg) {
+uint32_t NfcAdaptation::Thread(__attribute__((unused)) uint32_t arg) {
const char* func = "NfcAdaptation::Thread";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", func);
@@ -353,7 +351,6 @@
void NfcAdaptation::InitializeHalDeviceContext() {
const char* func = "NfcAdaptation::InitializeHalDeviceContext";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", func);
- int ret = 0; // 0 means success
mHalEntryFuncs.initialize = HalInitialize;
mHalEntryFuncs.terminate = HalTerminate;
@@ -574,7 +571,6 @@
*******************************************************************************/
uint8_t NfcAdaptation::HalGetMaxNfcee() {
const char* func = "NfcAdaptation::HalPowerCycle";
- uint8_t maxNfcee = 0;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", func);
return nfa_ee_max_ee_cfg;
@@ -618,6 +614,7 @@
**
*******************************************************************************/
void NfcAdaptation::HalDownloadFirmwareCallback(nfc_event_t event,
+ __attribute__((unused))
nfc_status_t event_status) {
const char* func = "NfcAdaptation::HalDownloadFirmwareCallback";
DLOG_IF(INFO, nfc_debug_enabled)
@@ -647,7 +644,9 @@
** Returns: None.
**
*******************************************************************************/
-void NfcAdaptation::HalDownloadFirmwareDataCallback(uint16_t data_len,
+void NfcAdaptation::HalDownloadFirmwareDataCallback(__attribute__((unused))
+ uint16_t data_len,
+ __attribute__((unused))
uint8_t* p_data) {}
/*******************************************************************************
diff --git a/src/adaptation/OverrideLog.cc b/src/adaptation/OverrideLog.cc
index 84e784b..178614d 100644
--- a/src/adaptation/OverrideLog.cc
+++ b/src/adaptation/OverrideLog.cc
@@ -53,11 +53,6 @@
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: level=%u", __func__, nfc_debug_enabled);
- if (nfc_debug_enabled) {
- // display protocol traces in raw format
- ProtoDispAdapterUseRawOutput(TRUE);
- }
-
return nfc_debug_enabled;
}
diff --git a/src/adaptation/android_logmsg.cc b/src/adaptation/android_logmsg.cc
index 8aa6636..46b3836 100644
--- a/src/adaptation/android_logmsg.cc
+++ b/src/adaptation/android_logmsg.cc
@@ -32,21 +32,6 @@
static void ToHex(const uint8_t* data, uint16_t len, char* hexString,
uint16_t hexStringSize);
-static void dumpbin(const char* data, int size, uint32_t trace_layer,
- uint32_t trace_type);
-static inline void word2hex(const char* data, char** hex);
-static inline void byte2char(const char* data, char** str);
-static inline void byte2hex(const char* data, char** str);
-
-void BTDISP_LOCK_LOG() {}
-
-void BTDISP_UNLOCK_LOG() {}
-
-void BTDISP_INIT_LOCK() {}
-
-void BTDISP_UNINIT_LOCK() {}
-
-void ProtoDispAdapterUseRawOutput(bool isUseRaw) {}
void ProtoDispAdapterDisplayNciPacket(uint8_t* nciPacket, uint16_t nciPacketLen,
bool is_recv) {
@@ -69,89 +54,6 @@
hexString[j] = '\0';
}
-// Protodisp code calls ScrLog() to print decoded texts.
-void ScrLog(uint32_t trace_set_mask, const char* fmt_str, ...) {
- static char buffer[BTE_LOG_BUF_SIZE];
- va_list ap;
-
- va_start(ap, fmt_str);
- vsnprintf(buffer, BTE_LOG_MAX_SIZE, fmt_str, ap);
- va_end(ap);
- __android_log_write(ANDROID_LOG_INFO, "BrcmNci", buffer);
-}
-
-uint8_t* scru_dump_hex(uint8_t* p, char* pTitle, uint32_t len, uint32_t layer,
- uint32_t type) {
- if (pTitle && *pTitle) PRINT(pTitle);
- dumpbin((char*)p, len, layer, type);
- return p;
-}
-
-void dumpbin(const char* data, int size, uint32_t trace_layer,
- uint32_t trace_type) {
- char line_buff[256];
- char* line;
- int i, j, addr;
- const int width = 16;
- if (size <= 0) return;
- for (i = 0; i < size / width; i++) {
- line = line_buff;
- // write address:
- addr = i * width;
- word2hex((const char*)&addr, &line);
- *line++ = ':';
- *line++ = ' ';
- // write hex of data
- for (j = 0; j < width; j++) {
- byte2hex(&data[j], &line);
- *line++ = ' ';
- }
- // write char of data
- for (j = 0; j < width; j++) byte2char(data++, &line);
- // wirte the end of line
- *line = 0;
- // output the line
- PRINT(line_buff);
- }
- // last line of left over if any
- int leftover = size % width;
- if (leftover > 0) {
- line = line_buff;
- // write address:
- addr = i * width;
- word2hex((const char*)&addr, &line);
- *line++ = ':';
- *line++ = ' ';
- // write hex of data
- for (j = 0; j < leftover; j++) {
- byte2hex(&data[j], &line);
- *line++ = ' ';
- }
- // write hex padding
- for (; j < width; j++) {
- *line++ = ' ';
- *line++ = ' ';
- *line++ = ' ';
- }
- // write char of data
- for (j = 0; j < leftover; j++) byte2char(data++, &line);
- // write the end of line
- *line = 0;
- // output the line
- PRINT(line_buff);
- }
-}
-
-inline void word2hex(const char* data, char** hex) {
- byte2hex(&data[1], hex);
- byte2hex(&data[0], hex);
-}
-
-inline void byte2char(const char* data, char** str) {
- **str = *data < ' ' ? '.' : *data > '~' ? '.' : *data;
- ++(*str);
-}
-
inline void byte2hex(const char* data, char** str) {
**str = sTable[(*data >> 4) & 0xf];
++*str;
@@ -159,34 +61,6 @@
++*str;
}
-// Decode a few Bluetooth HCI packets into hex numbers.
-void DispHciCmd(NFC_HDR* p_buf) {
- uint32_t nBytes = ((NFC_HDR_SIZE + p_buf->offset + p_buf->len) * 2) + 1;
- uint8_t* data = (uint8_t*)p_buf;
- int data_len = NFC_HDR_SIZE + p_buf->offset + p_buf->len;
-
- if (!nfc_debug_enabled) return;
-
- if (nBytes > sizeof(log_line)) return;
-
- ToHex(data, data_len, log_line, sizeof(log_line));
- __android_log_write(ANDROID_LOG_DEBUG, "BrcmHciX", log_line);
-}
-
-// Decode a few Bluetooth HCI packets into hex numbers.
-void DispHciEvt(NFC_HDR* p_buf) {
- uint32_t nBytes = ((NFC_HDR_SIZE + p_buf->offset + p_buf->len) * 2) + 1;
- uint8_t* data = (uint8_t*)p_buf;
- int data_len = NFC_HDR_SIZE + p_buf->offset + p_buf->len;
-
- if (!nfc_debug_enabled) return;
-
- if (nBytes > sizeof(log_line)) return;
-
- ToHex(data, data_len, log_line, sizeof(log_line));
- __android_log_write(ANDROID_LOG_DEBUG, "BrcmHciR", log_line);
-}
-
/***************************************************************************
**
** Function DispLLCP
@@ -233,12 +107,3 @@
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s:%s", is_recv ? "HcpR" : "HcpX", log_line);
}
-
-void DispSNEP(uint8_t local_sap, uint8_t remote_sap, NFC_HDR* p_buf,
- bool is_first, bool is_rx) {}
-void DispCHO(uint8_t* pMsg, uint32_t MsgLen, bool is_rx) {}
-void DispT3TagMessage(NFC_HDR* p_msg, bool is_rx) {}
-void DispRWT4Tags(NFC_HDR* p_buf, bool is_rx) {}
-void DispCET4Tags(NFC_HDR* p_buf, bool is_rx) {}
-void DispRWI93Tag(NFC_HDR* p_buf, bool is_rx, uint8_t command_to_respond) {}
-void DispNDEFMsg(uint8_t* pMsg, uint32_t MsgLen, bool is_recv) {}
diff --git a/src/adaptation/libmain.cc b/src/adaptation/libmain.cc
index 03fa56e..25c7bc0 100644
--- a/src/adaptation/libmain.cc
+++ b/src/adaptation/libmain.cc
@@ -88,7 +88,7 @@
int fileStream = open(filename, O_RDONLY);
if (fileStream >= 0) {
unsigned short checksum = 0;
- size_t actualReadCrc = read(fileStream, &checksum, sizeof(checksum));
+ read(fileStream, &checksum, sizeof(checksum));
size_t actualReadData = read(fileStream, pBuffer, nbytes);
close(fileStream);
if (actualReadData > 0) {
diff --git a/src/gki/ulinux/gki_ulinux.cc b/src/gki/ulinux/gki_ulinux.cc
index 595ad63..58214c7 100644
--- a/src/gki/ulinux/gki_ulinux.cc
+++ b/src/gki/ulinux/gki_ulinux.cc
@@ -178,8 +178,6 @@
uint8_t GKI_create_task(TASKPTR task_entry, uint8_t task_id, int8_t* taskname,
uint16_t* stack, uint16_t stacksize, void* pCondVar,
void* pMutex) {
- uint16_t i;
- uint8_t* p;
struct sched_param param;
int policy, ret = 0;
pthread_condattr_t attr;
@@ -359,7 +357,9 @@
void gki_system_tick_start_stop_cback(bool start) {
tGKI_OS* p_os = &gki_cb.os;
volatile int* p_run_cond = &p_os->no_timer_suspend;
+#ifdef GKI_TICK_TIMER_DEBUG
static volatile int wake_lock_count;
+#endif
if (start == false) {
/* this can lead to a race condition. however as we only read this variable
* in the timer loop
@@ -440,7 +440,7 @@
** one step, If your OS does it in one step, this function
** should be empty.
*******************************************************************************/
-void GKI_run(void* p_task_id) {
+void GKI_run(__attribute__((unused)) void* p_task_id) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s enter", __func__);
struct timespec delay;
int err = 0;
@@ -921,7 +921,6 @@
void GKI_exception(uint16_t code, std::string msg) {
uint8_t task_id;
- int i = 0;
LOG(ERROR) << StringPrintf("Task State Table");
@@ -1184,9 +1183,9 @@
**
*******************************************************************************/
void GKI_shiftdown(uint8_t* p_mem, uint32_t len, uint32_t shift_amount) {
- register uint8_t* ps = p_mem + len - 1;
- register uint8_t* pd = ps + shift_amount;
- register uint32_t xx;
+ uint8_t* ps = p_mem + len - 1;
+ uint8_t* pd = ps + shift_amount;
+ uint32_t xx;
for (xx = 0; xx < len; xx++) *pd-- = *ps--;
}
@@ -1199,9 +1198,9 @@
**
*******************************************************************************/
void GKI_shiftup(uint8_t* p_dest, uint8_t* p_src, uint32_t len) {
- register uint8_t* ps = p_src;
- register uint8_t* pd = p_dest;
- register uint32_t xx;
+ uint8_t* ps = p_src;
+ uint8_t* pd = p_dest;
+ uint32_t xx;
for (xx = 0; xx < len; xx++) *pd++ = *ps++;
}
diff --git a/src/include/android_logmsg.h b/src/include/android_logmsg.h
index 8920994..ed38807 100644
--- a/src/include/android_logmsg.h
+++ b/src/include/android_logmsg.h
@@ -26,23 +26,5 @@
#define DISP_NCI ProtoDispAdapterDisplayNciPacket
void ProtoDispAdapterDisplayNciPacket(uint8_t* nciPacket, uint16_t nciPacketLen,
bool is_recv);
-void ProtoDispAdapterUseRawOutput(bool isUseRaw);
-void ScrLog(uint32_t trace_set_mask, const char* fmt_str, ...);
-uint8_t* scru_dump_hex(uint8_t* p, char* pTitle, uint32_t len, uint32_t layer,
- uint32_t type);
-void BTDISP_LOCK_LOG();
-void BTDISP_UNLOCK_LOG();
-void BTDISP_INIT_LOCK();
-void BTDISP_UNINIT_LOCK();
-void DispHciCmd(NFC_HDR* p_buf);
-void DispHciEvt(NFC_HDR* p_buf);
void DispLLCP(NFC_HDR* p_buf, bool is_recv);
void DispHcp(uint8_t* data, uint16_t len, bool is_recv);
-void DispSNEP(uint8_t local_sap, uint8_t remote_sap, NFC_HDR* p_buf,
- bool is_first, bool is_rx);
-void DispCHO(uint8_t* pMsg, uint32_t MsgLen, bool is_rx);
-void DispT3TagMessage(NFC_HDR* p_msg, bool is_rx);
-void DispRWT4Tags(NFC_HDR* p_buf, bool is_rx);
-void DispCET4Tags(NFC_HDR* p_buf, bool is_rx);
-void DispRWI93Tag(NFC_HDR* p_buf, bool is_rx, uint8_t command_to_respond);
-void DispNDEFMsg(uint8_t* pMsg, uint32_t MsgLen, bool is_recv);
diff --git a/src/include/buildcfg.h b/src/include/buildcfg.h
index 8cbd663..53f7aa2 100644
--- a/src/include/buildcfg.h
+++ b/src/include/buildcfg.h
@@ -44,9 +44,6 @@
#define GKI_NUM_FIXED_BUF_POOLS 4
-extern uint8_t* scru_dump_hex(uint8_t* p, char* p_title, uint32_t len,
- uint32_t trace_layer, uint32_t trace_type);
-extern void ScrLog(uint32_t trace_set_mask, const char* fmt_str, ...);
extern void DispNci(uint8_t* p, uint16_t len, bool is_recv);
void ProtoDispAdapterDisplayNciPacket(uint8_t* nciPacket, uint16_t nciPacketLen,
diff --git a/src/include/nfc_hal_int.h b/src/include/nfc_hal_int.h
index 6b7a972..6e4d422 100644
--- a/src/include/nfc_hal_int.h
+++ b/src/include/nfc_hal_int.h
@@ -271,9 +271,6 @@
void DispNci(uint8_t* p, uint16_t len, bool is_recv);
#endif /* DISP_NCI */
-/* For displaying vendor-specific HCI commands */
-void DispHciCmd(NFC_HDR* p_buf);
-void DispHciEvt(NFC_HDR* p_buf);
#endif /* NFC_HAL_TRACE_PROTOCOL */
#endif /* NFC_HAL_INT_H */
diff --git a/src/include/nfc_types.h b/src/include/nfc_types.h
index 08a8a4f..a889902 100644
--- a/src/include/nfc_types.h
+++ b/src/include/nfc_types.h
@@ -65,15 +65,14 @@
{ *(p)++ = (int8_t)(u8); }
#define ARRAY8_TO_STREAM(p, a) \
{ \
- register int ijk; \
+ int ijk; \
for (ijk = 0; ijk < 8; ijk++) *(p)++ = (uint8_t)(a)[7 - ijk]; \
}
#define ARRAY_TO_STREAM(p, a, len) \
{ \
- register int ijk; \
+ int ijk; \
for (ijk = 0; ijk < (len); ijk++) *(p)++ = (uint8_t)(a)[ijk]; \
}
-
#define STREAM_TO_UINT8(u8, p) \
{ \
(u8) = (uint8_t)(*(p)); \
@@ -93,13 +92,13 @@
}
#define STREAM_TO_ARRAY8(a, p) \
{ \
- register int ijk; \
- register uint8_t* _pa = (uint8_t*)(a) + 7; \
+ int ijk; \
+ uint8_t* _pa = (uint8_t*)(a) + 7; \
for (ijk = 0; ijk < 8; ijk++) *_pa-- = *(p)++; \
}
#define STREAM_TO_ARRAY(a, p, len) \
{ \
- register int ijk; \
+ int ijk; \
for (ijk = 0; ijk < (len); ijk++) ((uint8_t*)(a))[ijk] = *(p)++; \
}
@@ -129,7 +128,7 @@
{ *(p)++ = (uint8_t)(u8); }
#define ARRAY_TO_BE_STREAM(p, a, len) \
{ \
- register int ijk; \
+ int ijk; \
for (ijk = 0; ijk < (len); ijk++) *(p)++ = (uint8_t)(a)[ijk]; \
}
diff --git a/src/nfa/dm/nfa_dm_act.cc b/src/nfa/dm/nfa_dm_act.cc
index 51ccfc5..52d340b 100644
--- a/src/nfa/dm/nfa_dm_act.cc
+++ b/src/nfa/dm/nfa_dm_act.cc
@@ -707,7 +707,8 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_dm_act_release_excl_rf_ctrl(tNFA_DM_MSG* p_data) {
+bool nfa_dm_act_release_excl_rf_ctrl(__attribute__((unused))
+ tNFA_DM_MSG* p_data) {
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
/* nfa_dm_rel_excl_rf_control_and_notify() is called when discovery state goes
@@ -1024,7 +1025,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_dm_act_disable_polling(tNFA_DM_MSG* p_data) {
+bool nfa_dm_act_disable_polling(__attribute__((unused)) tNFA_DM_MSG* p_data) {
tNFA_CONN_EVT_DATA evt_data;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -1058,7 +1059,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_dm_act_enable_listening(tNFA_DM_MSG* p_data) {
+bool nfa_dm_act_enable_listening(__attribute__((unused)) tNFA_DM_MSG* p_data) {
tNFA_CONN_EVT_DATA evt_data;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -1079,7 +1080,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_dm_act_disable_listening(tNFA_DM_MSG* p_data) {
+bool nfa_dm_act_disable_listening(__attribute__((unused)) tNFA_DM_MSG* p_data) {
tNFA_CONN_EVT_DATA evt_data;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -1100,7 +1101,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_dm_act_pause_p2p(tNFA_DM_MSG* p_data) {
+bool nfa_dm_act_pause_p2p(__attribute__((unused)) tNFA_DM_MSG* p_data) {
tNFA_CONN_EVT_DATA evt_data;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -1121,7 +1122,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_dm_act_resume_p2p(tNFA_DM_MSG* p_data) {
+bool nfa_dm_act_resume_p2p(__attribute__((unused)) tNFA_DM_MSG* p_data) {
tNFA_CONN_EVT_DATA evt_data;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -1211,7 +1212,8 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_dm_act_start_rf_discovery(tNFA_DM_MSG* p_data) {
+bool nfa_dm_act_start_rf_discovery(__attribute__((unused))
+ tNFA_DM_MSG* p_data) {
tNFA_CONN_EVT_DATA evt_data;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -1240,7 +1242,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_dm_act_stop_rf_discovery(tNFA_DM_MSG* p_data) {
+bool nfa_dm_act_stop_rf_discovery(__attribute__((unused)) tNFA_DM_MSG* p_data) {
tNFA_CONN_EVT_DATA evt_data;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -1345,9 +1347,8 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_dm_act_disable_timeout(tNFA_DM_MSG* p_data) {
+bool nfa_dm_act_disable_timeout(__attribute__((unused)) tNFA_DM_MSG* p_data) {
tNFA_DM_MSG nfa_dm_msg;
-
nfa_dm_msg.disable.graceful = false;
nfa_dm_disable(&nfa_dm_msg);
return true;
@@ -1397,8 +1398,8 @@
** Returns None
**
*******************************************************************************/
-static void nfa_dm_act_data_cback(uint8_t conn_id, tNFC_CONN_EVT event,
- tNFC_CONN* p_data) {
+static void nfa_dm_act_data_cback(__attribute__((unused)) uint8_t conn_id,
+ tNFC_CONN_EVT event, tNFC_CONN* p_data) {
NFC_HDR* p_msg;
tNFA_CONN_EVT_DATA evt_data;
diff --git a/src/nfa/dm/nfa_dm_discover.cc b/src/nfa/dm/nfa_dm_discover.cc
index b91b2f6..2b3b87e 100644
--- a/src/nfa/dm/nfa_dm_discover.cc
+++ b/src/nfa/dm/nfa_dm_discover.cc
@@ -833,7 +833,8 @@
** Returns void
**
*******************************************************************************/
-static void nfa_dm_disc_deact_ntf_timeout_cback(TIMER_LIST_ENT* p_tle) {
+static void nfa_dm_disc_deact_ntf_timeout_cback(__attribute__((unused))
+ TIMER_LIST_ENT* p_tle) {
LOG(ERROR) << __func__;
nfa_dm_disc_force_to_idle();
@@ -1570,7 +1571,8 @@
** Returns void
**
*******************************************************************************/
-static void nfa_dm_disc_kovio_timeout_cback(TIMER_LIST_ENT* p_tle) {
+static void nfa_dm_disc_kovio_timeout_cback(__attribute__((unused))
+ TIMER_LIST_ENT* p_tle) {
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
/* notify presence check failure, if presence check is pending */
@@ -1671,8 +1673,8 @@
** Returns void
**
*******************************************************************************/
-static void nfa_dm_disc_data_cback(uint8_t conn_id, tNFC_CONN_EVT event,
- tNFC_CONN* p_data) {
+static void nfa_dm_disc_data_cback(__attribute__((unused)) uint8_t conn_id,
+ tNFC_CONN_EVT event, tNFC_CONN* p_data) {
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
/* if selection failed */
diff --git a/src/nfa/dm/nfa_dm_main.cc b/src/nfa/dm/nfa_dm_main.cc
index 7541020..fc81c29 100644
--- a/src/nfa/dm/nfa_dm_main.cc
+++ b/src/nfa/dm/nfa_dm_main.cc
@@ -33,9 +33,7 @@
nfa_dm_sys_disable,
nfa_dm_proc_nfcc_power_mode};
-tNFA_DM_CB nfa_dm_cb = {
- 0,
-};
+tNFA_DM_CB nfa_dm_cb = {};
#define NFA_DM_NUM_ACTIONS (NFA_DM_MAX_EVT & 0x00ff)
diff --git a/src/nfa/ee/nfa_ee_act.cc b/src/nfa/ee/nfa_ee_act.cc
index 4f9e0d0..eac75df 100644
--- a/src/nfa/ee/nfa_ee_act.cc
+++ b/src/nfa/ee/nfa_ee_act.cc
@@ -909,7 +909,7 @@
** Returns void
**
*******************************************************************************/
-void nfa_ee_api_lmrt_size(tNFA_EE_MSG* p_data) {
+void nfa_ee_api_lmrt_size(__attribute__((unused)) tNFA_EE_MSG* p_data) {
tNFA_EE_CBACK_DATA evt_data = {0};
uint16_t total_size = NFC_GetLmrtSize();
@@ -1905,7 +1905,6 @@
uint8_t max_tlv = (uint8_t)((*p_max_len > NFA_EE_ROUT_MAX_TLV_SIZE)
? NFA_EE_ROUT_MAX_TLV_SIZE
: *p_max_len);
- tNFA_STATUS status = NFA_STATUS_OK;
if (new_size + *p_cur_offset > max_tlv) {
if (NFC_SetRouting(true, *p, *p_cur_offset, p + 1) == NFA_STATUS_OK) {
@@ -2077,7 +2076,7 @@
** Returns void
**
*******************************************************************************/
-void nfa_ee_rout_timeout(tNFA_EE_MSG* p_data) {
+void nfa_ee_rout_timeout(__attribute__((unused)) tNFA_EE_MSG* p_data) {
uint8_t ee_cfged = nfa_ee_cb.ee_cfged;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -2107,7 +2106,7 @@
** Returns void
**
*******************************************************************************/
-void nfa_ee_discv_timeout(tNFA_EE_MSG* p_data) {
+void nfa_ee_discv_timeout(__attribute__((unused)) tNFA_EE_MSG* p_data) {
if (NFA_GetNCIVersion() != NCI_VERSION_2_0) NFC_NfceeDiscover(false);
if (nfa_ee_cb.p_enable_cback)
(*nfa_ee_cb.p_enable_cback)(NFA_EE_DISC_STS_OFF);
@@ -2123,7 +2122,7 @@
** Returns void
**
*******************************************************************************/
-void nfa_ee_lmrt_to_nfcc(tNFA_EE_MSG* p_data) {
+void nfa_ee_lmrt_to_nfcc(__attribute__((unused)) tNFA_EE_MSG* p_data) {
int xx;
tNFA_EE_ECB* p_cb;
uint8_t* p = NULL;
diff --git a/src/nfa/hci/nfa_hci_act.cc b/src/nfa/hci/nfa_hci_act.cc
index 264db1e..89bab21 100644
--- a/src/nfa/hci/nfa_hci_act.cc
+++ b/src/nfa/hci/nfa_hci_act.cc
@@ -51,10 +51,8 @@
uint16_t data_len,
tNFA_HCI_DYN_PIPE* p_pipe);
static void nfa_hci_handle_generic_gate_cmd(uint8_t* p_data, uint8_t data_len,
- tNFA_HCI_DYN_GATE* p_gate,
tNFA_HCI_DYN_PIPE* p_pipe);
static void nfa_hci_handle_generic_gate_rsp(uint8_t* p_data, uint8_t data_len,
- tNFA_HCI_DYN_GATE* p_gate,
tNFA_HCI_DYN_PIPE* p_pipe);
static void nfa_hci_handle_generic_gate_evt(uint8_t* p_data, uint16_t data_len,
tNFA_HCI_DYN_GATE* p_gate,
@@ -1594,7 +1592,7 @@
** Returns none
**
*******************************************************************************/
-void nfa_hci_handle_admin_gate_evt(uint8_t* p_data) {
+void nfa_hci_handle_admin_gate_evt() {
tNFA_HCI_EVT_DATA evt_data;
tNFA_HCI_API_GET_HOST_LIST* p_msg;
@@ -1698,13 +1696,11 @@
/* Check if data packet is a command, response or event */
switch (nfa_hci_cb.type) {
case NFA_HCI_COMMAND_TYPE:
- nfa_hci_handle_generic_gate_cmd(p_data, (uint8_t)data_len, p_gate,
- p_pipe);
+ nfa_hci_handle_generic_gate_cmd(p_data, (uint8_t)data_len, p_pipe);
break;
case NFA_HCI_RESPONSE_TYPE:
- nfa_hci_handle_generic_gate_rsp(p_data, (uint8_t)data_len, p_gate,
- p_pipe);
+ nfa_hci_handle_generic_gate_rsp(p_data, (uint8_t)data_len, p_pipe);
break;
case NFA_HCI_EVENT_TYPE:
@@ -1821,7 +1817,6 @@
**
*******************************************************************************/
static void nfa_hci_handle_generic_gate_cmd(uint8_t* p_data, uint8_t data_len,
- tNFA_HCI_DYN_GATE* p_gate,
tNFA_HCI_DYN_PIPE* p_pipe) {
tNFA_HCI_EVT_DATA evt_data;
tNFA_HANDLE app_handle = nfa_hciu_get_pipe_owner(p_pipe->pipe_id);
@@ -1891,7 +1886,6 @@
**
*******************************************************************************/
static void nfa_hci_handle_generic_gate_rsp(uint8_t* p_data, uint8_t data_len,
- tNFA_HCI_DYN_GATE* p_gate,
tNFA_HCI_DYN_PIPE* p_pipe) {
tNFA_HCI_EVT_DATA evt_data;
tNFA_STATUS status = NFA_STATUS_OK;
diff --git a/src/nfa/hci/nfa_hci_ci.cc b/src/nfa/hci/nfa_hci_ci.cc
index 7ca8aad..2f29745 100644
--- a/src/nfa/hci/nfa_hci_ci.cc
+++ b/src/nfa/hci/nfa_hci_ci.cc
@@ -69,7 +69,8 @@
p_msg = (tNFA_HCI_EVENT_DATA*)GKI_getbuf(sizeof(tNFA_HCI_EVENT_DATA));
if (p_msg != NULL) {
p_msg->nv_write.hdr.event = NFA_HCI_RSP_NV_WRITE_EVT;
- p_msg->nv_write.status = 0;
+ p_msg->nv_write.status =
+ (status == NFA_NV_CO_OK) ? NFA_STATUS_OK : NFA_STATUS_FAILED;
nfa_sys_sendmsg(p_msg);
}
}
diff --git a/src/nfa/hci/nfa_hci_main.cc b/src/nfa/hci/nfa_hci_main.cc
index b11da79..82163fe 100644
--- a/src/nfa/hci/nfa_hci_main.cc
+++ b/src/nfa/hci/nfa_hci_main.cc
@@ -54,7 +54,7 @@
static void nfa_hci_sys_enable(void);
static void nfa_hci_sys_disable(void);
-static void nfa_hci_rsp_timeout(tNFA_HCI_EVENT_DATA* p_evt_data);
+static void nfa_hci_rsp_timeout(void);
static void nfa_hci_conn_cback(uint8_t conn_id, tNFC_CONN_EVT event,
tNFC_CONN* p_data);
static void nfa_hci_set_receive_buf(uint8_t pipe);
@@ -796,7 +796,7 @@
} else if (nfa_hci_cb.type == NFA_HCI_RESPONSE_TYPE) {
nfa_hci_handle_admin_gate_rsp(p, (uint8_t)pkt_len);
} else if (nfa_hci_cb.type == NFA_HCI_EVENT_TYPE) {
- nfa_hci_handle_admin_gate_evt(p);
+ nfa_hci_handle_admin_gate_evt();
}
break;
@@ -872,7 +872,7 @@
** Returns None
**
*******************************************************************************/
-void nfa_hci_rsp_timeout(tNFA_HCI_EVENT_DATA* p_evt_data) {
+void nfa_hci_rsp_timeout() {
tNFA_HCI_EVT evt = 0;
tNFA_HCI_EVT_DATA evt_data;
uint8_t delete_pipe;
@@ -1119,7 +1119,7 @@
break;
case NFA_HCI_RSP_TIMEOUT_EVT:
- nfa_hci_rsp_timeout((tNFA_HCI_EVENT_DATA*)p_msg);
+ nfa_hci_rsp_timeout();
break;
case NFA_HCI_CHECK_QUEUE_EVT:
diff --git a/src/nfa/hci/nfa_hci_utils.cc b/src/nfa/hci/nfa_hci_utils.cc
index 2abdf0b..5946020 100644
--- a/src/nfa/hci/nfa_hci_utils.cc
+++ b/src/nfa/hci/nfa_hci_utils.cc
@@ -28,7 +28,7 @@
#include "nfa_hci_int.h"
#include "trace_api.h"
-static void handle_debug_loopback(NFC_HDR* p_buf, uint8_t pipe, uint8_t type,
+static void handle_debug_loopback(NFC_HDR* p_buf, uint8_t type,
uint8_t instruction);
uint8_t HCI_LOOPBACK_DEBUG = NFA_HCI_DEBUG_OFF;
@@ -345,7 +345,7 @@
DispHcp(((uint8_t*)(p_buf + 1) + p_buf->offset), p_buf->len, false);
if (HCI_LOOPBACK_DEBUG == NFA_HCI_DEBUG_ON)
- handle_debug_loopback(p_buf, pipe_id, type, instruction);
+ handle_debug_loopback(p_buf, type, instruction);
else
status = NFC_SendData(nfa_hci_cb.conn_id, p_buf);
} else {
@@ -1360,7 +1360,7 @@
}
}
-static void handle_debug_loopback(NFC_HDR* p_buf, uint8_t pipe, uint8_t type,
+static void handle_debug_loopback(NFC_HDR* p_buf, uint8_t type,
uint8_t instruction) {
uint8_t* p = (uint8_t*)(p_buf + 1) + p_buf->offset;
static uint8_t next_pipe = 0x10;
diff --git a/src/nfa/include/nfa_hci_int.h b/src/nfa/include/nfa_hci_int.h
index c1733d5..3001779 100644
--- a/src/nfa/include/nfa_hci_int.h
+++ b/src/nfa/include/nfa_hci_int.h
@@ -444,7 +444,7 @@
extern void nfa_hci_check_api_requests(void);
extern void nfa_hci_handle_admin_gate_cmd(uint8_t* p_data);
extern void nfa_hci_handle_admin_gate_rsp(uint8_t* p_data, uint8_t data_len);
-extern void nfa_hci_handle_admin_gate_evt(uint8_t* p_data);
+extern void nfa_hci_handle_admin_gate_evt();
extern void nfa_hci_handle_link_mgm_gate_cmd(uint8_t* p_data);
extern void nfa_hci_handle_dyn_pipe_pkt(uint8_t pipe, uint8_t* p_data,
uint16_t data_len);
diff --git a/src/nfa/p2p/nfa_p2p_act.cc b/src/nfa/p2p/nfa_p2p_act.cc
index e9369c2..c91d0a9 100644
--- a/src/nfa/p2p/nfa_p2p_act.cc
+++ b/src/nfa/p2p/nfa_p2p_act.cc
@@ -1120,7 +1120,7 @@
** Returns TRUE to deallocate buffer
**
*******************************************************************************/
-bool nfa_p2p_restart_rf_discovery(tNFA_P2P_MSG* p_msg) {
+bool nfa_p2p_restart_rf_discovery(__attribute__((unused)) tNFA_P2P_MSG* p_msg) {
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
nfa_dm_rf_deactivate(NFA_DEACTIVATE_TYPE_IDLE);
diff --git a/src/nfa/p2p/nfa_p2p_main.cc b/src/nfa/p2p/nfa_p2p_main.cc
index 6cc123b..c593969 100644
--- a/src/nfa/p2p/nfa_p2p_main.cc
+++ b/src/nfa/p2p/nfa_p2p_main.cc
@@ -158,7 +158,8 @@
** Returns void
**
*******************************************************************************/
-static void nfa_p2p_update_active_listen_timeout_cback(TIMER_LIST_ENT* p_tle) {
+static void nfa_p2p_update_active_listen_timeout_cback(__attribute__((unused))
+ TIMER_LIST_ENT* p_tle) {
LOG(ERROR) << __func__;
/* restore active listen mode */
diff --git a/src/nfa/rw/nfa_rw_act.cc b/src/nfa/rw/nfa_rw_act.cc
index 3c392a2..a7ea69e 100644
--- a/src/nfa/rw/nfa_rw_act.cc
+++ b/src/nfa/rw/nfa_rw_act.cc
@@ -41,7 +41,7 @@
static void nfa_rw_error_cleanup(uint8_t event);
static void nfa_rw_presence_check(tNFA_RW_MSG* p_data);
static void nfa_rw_handle_t2t_evt(tRW_EVENT event, tRW_DATA* p_rw_data);
-static bool nfa_rw_detect_ndef(tNFA_RW_MSG* p_data);
+static bool nfa_rw_detect_ndef(void);
static void nfa_rw_cback(tRW_EVENT event, tRW_DATA* p_rw_data);
/*******************************************************************************
@@ -185,7 +185,7 @@
** Returns Nothing
**
*******************************************************************************/
-static void nfa_rw_handle_ndef_detect(tRW_EVENT event, tRW_DATA* p_rw_data) {
+static void nfa_rw_handle_ndef_detect(tRW_DATA* p_rw_data) {
tNFA_CONN_EVT_DATA conn_evt_data;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
@@ -296,7 +296,7 @@
** Returns Nothing
**
*******************************************************************************/
-static void nfa_rw_handle_tlv_detect(tRW_EVENT event, tRW_DATA* p_rw_data) {
+static void nfa_rw_handle_tlv_detect(tRW_DATA* p_rw_data) {
tNFA_CONN_EVT_DATA conn_evt_data;
/* Set TLV detection state */
@@ -581,7 +581,7 @@
break;
case RW_T1T_TLV_DETECT_EVT:
- nfa_rw_handle_tlv_detect(event, p_rw_data);
+ nfa_rw_handle_tlv_detect(p_rw_data);
break;
case RW_T1T_NDEF_DETECT_EVT:
@@ -597,7 +597,7 @@
if (RW_T1tFormatNDef() == NFC_STATUS_OK) break;
}
- nfa_rw_handle_ndef_detect(event, p_rw_data);
+ nfa_rw_handle_ndef_detect(p_rw_data);
break;
@@ -749,18 +749,18 @@
(nfa_rw_cb.skip_dyn_locks == true)) {
/* NDEF Detection is complete */
nfa_rw_cb.skip_dyn_locks = false;
- nfa_rw_handle_ndef_detect(event, p_rw_data);
+ nfa_rw_handle_ndef_detect(p_rw_data);
} else {
/* Try to detect NDEF again, this time without reading dynamic lock
* bytes */
nfa_rw_cb.skip_dyn_locks = true;
- nfa_rw_detect_ndef(NULL);
+ nfa_rw_detect_ndef();
}
break;
case RW_T2T_TLV_DETECT_EVT: /* Lock control/Mem/Prop tlv detection complete
*/
- nfa_rw_handle_tlv_detect(event, p_rw_data);
+ nfa_rw_handle_tlv_detect(p_rw_data);
break;
case RW_T2T_NDEF_READ_EVT: /* NDEF read completed */
@@ -854,7 +854,7 @@
switch (event) {
case RW_T3T_NDEF_DETECT_EVT: /* NDEF detection complete */
- nfa_rw_handle_ndef_detect(event, p_rw_data);
+ nfa_rw_handle_ndef_detect(p_rw_data);
break;
case RW_T3T_UPDATE_CPLT_EVT: /* Write completed */
@@ -982,7 +982,7 @@
switch (event) {
case RW_T4T_NDEF_DETECT_EVT: /* Result of NDEF detection procedure */
- nfa_rw_handle_ndef_detect(event, p_rw_data);
+ nfa_rw_handle_ndef_detect(p_rw_data);
break;
case RW_T4T_NDEF_FORMAT_CPLT_EVT:
@@ -1116,7 +1116,7 @@
switch (event) {
case RW_I93_NDEF_DETECT_EVT: /* Result of NDEF detection procedure */
- nfa_rw_handle_ndef_detect(event, p_rw_data);
+ nfa_rw_handle_ndef_detect(p_rw_data);
break;
case RW_I93_NDEF_READ_EVT: /* Segment of data received from type 4 tag */
@@ -1523,7 +1523,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-static bool nfa_rw_detect_ndef(tNFA_RW_MSG* p_data) {
+static bool nfa_rw_detect_ndef() {
tNFA_CONN_EVT_DATA conn_evt_data;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -1600,7 +1600,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-static bool nfa_rw_read_ndef(tNFA_RW_MSG* p_data) {
+static bool nfa_rw_read_ndef() {
tNFA_STATUS status = NFA_STATUS_OK;
tNFA_CONN_EVT_DATA conn_evt_data;
@@ -1824,7 +1824,7 @@
** Returns TRUE (caller frees message buffer)
**
*******************************************************************************/
-bool nfa_rw_presence_check_tick(tNFA_RW_MSG* p_data) {
+bool nfa_rw_presence_check_tick(__attribute__((unused)) tNFA_RW_MSG* p_data) {
/* Store the current operation */
nfa_rw_cb.cur_op = NFA_RW_OP_PRESENCE_CHECK;
nfa_rw_cb.flags |= NFA_RW_FL_AUTO_PRESENCE_CHECK_BUSY;
@@ -1846,7 +1846,8 @@
** Returns TRUE (caller frees message buffer)
**
*******************************************************************************/
-bool nfa_rw_presence_check_timeout(tNFA_RW_MSG* p_data) {
+bool nfa_rw_presence_check_timeout(__attribute__((unused))
+ tNFA_RW_MSG* p_data) {
nfa_rw_handle_presence_check_rsp(NFC_STATUS_FAILED);
return true;
}
@@ -1860,7 +1861,7 @@
** Returns Nothing
**
*******************************************************************************/
-static void nfa_rw_format_tag(tNFA_RW_MSG* p_data) {
+static void nfa_rw_format_tag() {
tNFC_PROTOCOL protocol = nfa_rw_cb.protocol;
tNFC_STATUS status = NFC_STATUS_FAILED;
@@ -1890,7 +1891,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-static bool nfa_rw_detect_tlv(tNFA_RW_MSG* p_data, uint8_t tlv) {
+static bool nfa_rw_detect_tlv(uint8_t tlv) {
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
switch (nfa_rw_cb.protocol) {
@@ -1971,7 +1972,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-static bool nfa_rw_t1t_rid(tNFA_RW_MSG* p_data) {
+static bool nfa_rw_t1t_rid() {
if (RW_T1tRid() != NFC_STATUS_OK) nfa_rw_error_cleanup(NFA_READ_CPLT_EVT);
return true;
@@ -1986,7 +1987,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-static bool nfa_rw_t1t_rall(tNFA_RW_MSG* p_data) {
+static bool nfa_rw_t1t_rall() {
if (RW_T1tReadAll() != NFC_STATUS_OK) nfa_rw_error_cleanup(NFA_READ_CPLT_EVT);
return true;
@@ -2229,7 +2230,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-static bool nfa_rw_t3t_get_system_codes(tNFA_RW_MSG* p_data) {
+static bool nfa_rw_t3t_get_system_codes() {
tNFC_STATUS status;
tNFA_TAG_PARAMS tag_params;
@@ -2386,8 +2387,8 @@
** Returns nothing
**
*******************************************************************************/
-static void nfa_rw_raw_mode_data_cback(uint8_t conn_id, tNFC_CONN_EVT event,
- tNFC_CONN* p_data) {
+static void nfa_rw_raw_mode_data_cback(__attribute__((unused)) uint8_t conn_id,
+ tNFC_CONN_EVT event, tNFC_CONN* p_data) {
NFC_HDR* p_msg;
tNFA_CONN_EVT_DATA evt_data;
@@ -2642,7 +2643,7 @@
** Returns TRUE (message buffer to be freed by caller)
**
*******************************************************************************/
-bool nfa_rw_deactivate_ntf(tNFA_RW_MSG* p_data) {
+bool nfa_rw_deactivate_ntf(__attribute__((unused)) tNFA_RW_MSG* p_data) {
/* Clear the activated flag */
nfa_rw_cb.flags &= ~NFA_RW_FL_ACTIVATED;
@@ -2724,11 +2725,11 @@
switch (p_data->op_req.op) {
case NFA_RW_OP_DETECT_NDEF:
nfa_rw_cb.skip_dyn_locks = false;
- nfa_rw_detect_ndef(p_data);
+ nfa_rw_detect_ndef();
break;
case NFA_RW_OP_READ_NDEF:
- nfa_rw_read_ndef(p_data);
+ nfa_rw_read_ndef();
break;
case NFA_RW_OP_WRITE_NDEF:
@@ -2753,15 +2754,15 @@
break;
case NFA_RW_OP_FORMAT_TAG:
- nfa_rw_format_tag(p_data);
+ nfa_rw_format_tag();
break;
case NFA_RW_OP_DETECT_LOCK_TLV:
- nfa_rw_detect_tlv(p_data, TAG_LOCK_CTRL_TLV);
+ nfa_rw_detect_tlv(TAG_LOCK_CTRL_TLV);
break;
case NFA_RW_OP_DETECT_MEM_TLV:
- nfa_rw_detect_tlv(p_data, TAG_MEM_CTRL_TLV);
+ nfa_rw_detect_tlv(TAG_MEM_CTRL_TLV);
break;
case NFA_RW_OP_SET_TAG_RO:
@@ -2770,11 +2771,11 @@
break;
case NFA_RW_OP_T1T_RID:
- nfa_rw_t1t_rid(p_data);
+ nfa_rw_t1t_rid();
break;
case NFA_RW_OP_T1T_RALL:
- nfa_rw_t1t_rall(p_data);
+ nfa_rw_t1t_rall();
break;
case NFA_RW_OP_T1T_READ:
@@ -2820,7 +2821,7 @@
break;
case NFA_RW_OP_T3T_GET_SYSTEM_CODES:
- nfa_rw_t3t_get_system_codes(p_data);
+ nfa_rw_t3t_get_system_codes();
break;
/* ISO 15693 tag commands */
diff --git a/src/nfa/sys/nfa_sys_main.cc b/src/nfa/sys/nfa_sys_main.cc
index de4b8cd..98831c6 100644
--- a/src/nfa/sys/nfa_sys_main.cc
+++ b/src/nfa/sys/nfa_sys_main.cc
@@ -32,9 +32,8 @@
#endif
/* system manager control block definition */
-tNFA_SYS_CB nfa_sys_cb = {
- 0,
-}; /* nfa_sys control block. statically initialize 'flags' field to 0 */
+tNFA_SYS_CB nfa_sys_cb = {};
+/* nfa_sys control block. statically initialize 'flags' field to 0 */
/*******************************************************************************
**
diff --git a/src/nfc/include/nfc_int.h b/src/nfc/include/nfc_int.h
index ea70715..2144f6f 100644
--- a/src/nfc/include/nfc_int.h
+++ b/src/nfc/include/nfc_int.h
@@ -296,7 +296,7 @@
#endif
/* From nfc_task.c */
-extern uint32_t nfc_task(uint32_t param);
+extern uint32_t nfc_task();
void nfc_task_shutdown_nfcc(void);
/* From nfc_main.c */
diff --git a/src/nfc/include/rw_int.h b/src/nfc/include/rw_int.h
index 146df57..b6e1dc5 100644
--- a/src/nfc/include/rw_int.h
+++ b/src/nfc/include/rw_int.h
@@ -746,7 +746,7 @@
extern tNFC_STATUS rw_t2t_sector_change(uint8_t sector);
extern tNFC_STATUS rw_t2t_read(uint16_t block);
extern tNFC_STATUS rw_t2t_write(uint16_t block, uint8_t* p_write_data);
-extern void rw_t2t_process_timeout(TIMER_LIST_ENT* p_tle);
+extern void rw_t2t_process_timeout();
extern tNFC_STATUS rw_t2t_select(void);
void rw_t2t_handle_op_complete(void);
diff --git a/src/nfc/llcp/llcp_dlc.cc b/src/nfc/llcp/llcp_dlc.cc
index 30e2404..c4bc507 100644
--- a/src/nfc/llcp/llcp_dlc.cc
+++ b/src/nfc/llcp/llcp_dlc.cc
@@ -40,7 +40,7 @@
static tLLCP_STATUS llcp_dlsm_connected(tLLCP_DLCB* p_dlcb,
tLLCP_DLC_EVENT event, void* p_data);
static tLLCP_STATUS llcp_dlsm_w4_remote_dm(tLLCP_DLCB* p_dlcb,
- tLLCP_DLC_EVENT event, void* p_data);
+ tLLCP_DLC_EVENT event);
extern unsigned char appl_dta_mode_flag;
static std::string llcp_dlsm_get_state_name(tLLCP_DLC_STATE state);
@@ -83,7 +83,7 @@
break;
case LLCP_DLC_STATE_W4_REMOTE_DM:
- status = llcp_dlsm_w4_remote_dm(p_dlcb, event, p_data);
+ status = llcp_dlsm_w4_remote_dm(p_dlcb, event);
break;
default:
@@ -499,8 +499,7 @@
**
*******************************************************************************/
static tLLCP_STATUS llcp_dlsm_w4_remote_dm(tLLCP_DLCB* p_dlcb,
- tLLCP_DLC_EVENT event,
- void* p_data) {
+ tLLCP_DLC_EVENT event) {
tLLCP_STATUS status = LLCP_STATUS_SUCCESS;
tLLCP_SAP_CBACK_DATA data;
@@ -730,8 +729,8 @@
** Returns void
**
*******************************************************************************/
-static void llcp_dlc_proc_disc_pdu(uint8_t dsap, uint8_t ssap, uint16_t length,
- uint8_t* p_data) {
+static void llcp_dlc_proc_disc_pdu(uint8_t dsap, uint8_t ssap,
+ uint16_t length) {
tLLCP_DLCB* p_dlcb;
DLOG_IF(INFO, nfc_debug_enabled) << __func__;
@@ -1165,7 +1164,7 @@
break;
case LLCP_PDU_DISC_TYPE:
- llcp_dlc_proc_disc_pdu(dsap, ssap, length, p_data);
+ llcp_dlc_proc_disc_pdu(dsap, ssap, length);
break;
case LLCP_PDU_CC_TYPE:
diff --git a/src/nfc/llcp/llcp_link.cc b/src/nfc/llcp/llcp_link.cc
index bfd3dbf..37b9b4e 100644
--- a/src/nfc/llcp/llcp_link.cc
+++ b/src/nfc/llcp/llcp_link.cc
@@ -1579,8 +1579,8 @@
** Returns void
**
*******************************************************************************/
-void llcp_link_connection_cback(uint8_t conn_id, tNFC_CONN_EVT event,
- tNFC_CONN* p_data) {
+void llcp_link_connection_cback(__attribute__((unused)) uint8_t conn_id,
+ tNFC_CONN_EVT event, tNFC_CONN* p_data) {
if (event == NFC_DATA_CEVT) {
DispLLCP((NFC_HDR*)p_data->data.p_data, true);
if (llcp_cb.lcb.link_state == LLCP_LINK_STATE_DEACTIVATED) {
diff --git a/src/nfc/llcp/llcp_sdp.cc b/src/nfc/llcp/llcp_sdp.cc
index 7cbf147..4607330 100644
--- a/src/nfc/llcp/llcp_sdp.cc
+++ b/src/nfc/llcp/llcp_sdp.cc
@@ -39,7 +39,7 @@
** Returns void
**
*******************************************************************************/
-void llcp_sdp_proc_data(tLLCP_SAP_CBACK_DATA* p_data) {
+void llcp_sdp_proc_data(__attribute__((unused)) tLLCP_SAP_CBACK_DATA* p_data) {
/*
** Do nothing
** llcp_sdp_proc_SNL () is called by link layer
diff --git a/src/nfc/ndef/ndef_utils.cc b/src/nfc/ndef/ndef_utils.cc
index 7bb44de..993efd8 100644
--- a/src/nfc/ndef/ndef_utils.cc
+++ b/src/nfc/ndef/ndef_utils.cc
@@ -39,9 +39,9 @@
**
*******************************************************************************/
static void shiftdown(uint8_t* p_mem, uint32_t len, uint32_t shift_amount) {
- register uint8_t* ps = p_mem + len - 1;
- register uint8_t* pd = ps + shift_amount;
- register uint32_t xx;
+ uint8_t* ps = p_mem + len - 1;
+ uint8_t* pd = ps + shift_amount;
+ uint32_t xx;
for (xx = 0; xx < len; xx++) *pd-- = *ps--;
}
@@ -54,9 +54,9 @@
**
*******************************************************************************/
static void shiftup(uint8_t* p_dest, uint8_t* p_src, uint32_t len) {
- register uint8_t* ps = p_src;
- register uint8_t* pd = p_dest;
- register uint32_t xx;
+ uint8_t* ps = p_src;
+ uint8_t* pd = p_dest;
+ uint32_t xx;
for (xx = 0; xx < len; xx++) *pd++ = *ps++;
}
diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 7aa434e..5601de0 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -471,7 +471,8 @@
** Returns void
**
*******************************************************************************/
-void nfc_ncif_set_config_status(uint8_t* p, uint8_t len) {
+void nfc_ncif_set_config_status(uint8_t* p,
+ __attribute__((unused)) uint8_t len) {
tNFC_RESPONSE evt_data;
if (nfc_cb.p_resp_cback) {
evt_data.set_config.status = (tNFC_STATUS)*p++;
@@ -569,7 +570,7 @@
** Returns void
**
*******************************************************************************/
-void nfc_ncif_proc_credits(uint8_t* p, uint16_t plen) {
+void nfc_ncif_proc_credits(uint8_t* p, __attribute__((unused)) uint16_t plen) {
uint8_t num, xx;
tNFC_CONN_CB* p_cb;
@@ -766,7 +767,8 @@
** Returns void
**
*******************************************************************************/
-void nfc_ncif_proc_discover_ntf(uint8_t* p, uint16_t plen) {
+void nfc_ncif_proc_discover_ntf(uint8_t* p,
+ __attribute__((unused)) uint16_t plen) {
tNFC_DISCOVER evt_data;
if (nfc_cb.p_discv_cback) {
@@ -1191,7 +1193,8 @@
** Returns void
**
*******************************************************************************/
-void nfc_ncif_proc_get_routing(uint8_t* p, uint8_t len) {
+void nfc_ncif_proc_get_routing(uint8_t* p,
+ __attribute__((unused)) uint8_t len) {
tNFC_GET_ROUTING_REVT evt_data;
uint8_t more, num_entries, xx, yy, *pn, tl;
tNFC_STATUS status = NFC_STATUS_CONTINUE;
@@ -1231,7 +1234,8 @@
** Returns void
**
*******************************************************************************/
-void nfc_ncif_proc_conn_create_rsp(uint8_t* p, uint16_t plen,
+void nfc_ncif_proc_conn_create_rsp(uint8_t* p,
+ __attribute__((unused)) uint16_t plen,
uint8_t dest_type) {
tNFC_CONN_CB* p_cb;
tNFC_STATUS status;
diff --git a/src/nfc/nfc/nfc_task.cc b/src/nfc/nfc/nfc_task.cc
index 808eadd..7a4c91d 100644
--- a/src/nfc/nfc/nfc_task.cc
+++ b/src/nfc/nfc/nfc_task.cc
@@ -245,7 +245,7 @@
rw_t1t_process_timeout(p_tle);
break;
case NFC_TTYPE_RW_T2T_RESPONSE:
- rw_t2t_process_timeout(p_tle);
+ rw_t2t_process_timeout();
break;
case NFC_TTYPE_RW_T3T_RESPONSE:
rw_t3t_process_timeout(p_tle);
@@ -329,7 +329,7 @@
** Returns nothing
**
*******************************************************************************/
-uint32_t nfc_task(uint32_t param) {
+uint32_t nfc_task() {
uint16_t event;
NFC_HDR* p_msg;
bool free_buf;
diff --git a/src/nfc/tags/ce_t3t.cc b/src/nfc/tags/ce_t3t.cc
index c6fb8cc..2774ae5 100644
--- a/src/nfc/tags/ce_t3t.cc
+++ b/src/nfc/tags/ce_t3t.cc
@@ -86,8 +86,6 @@
UINT8_TO_STREAM(p, (p_msg->len + 1));
p_msg->len += 1; /* Increment len to include SoD */
- DispT3TagMessage(p_msg, false);
-
if (NFC_SendData(NFC_RF_CONN_ID, p_msg) != NFC_STATUS_OK) {
LOG(ERROR) << StringPrintf("failed");
}
@@ -608,7 +606,7 @@
** Returns none
**
*******************************************************************************/
-void ce_t3t_data_cback(uint8_t conn_id, tNFC_DATA_CEVT* p_data) {
+void ce_t3t_data_cback(tNFC_DATA_CEVT* p_data) {
tCE_CB* p_ce_cb = &ce_cb;
tCE_T3T_MEM* p_cb = &p_ce_cb->mem.t3t;
NFC_HDR* p_msg = p_data->p_data;
@@ -623,8 +621,6 @@
uint8_t sod;
uint8_t cmd_type;
- DispT3TagMessage(p_msg, true);
-
/* If activate system code is not NDEF, or if no local NDEF contents was set,
* then pass data up to the app */
if ((p_cb->system_code != T3T_SYSTEM_CODE_NDEF) ||
@@ -794,7 +790,7 @@
case NFC_DATA_CEVT:
if (p_data->data.status == NFC_STATUS_OK) {
- ce_t3t_data_cback(conn_id, &p_data->data);
+ ce_t3t_data_cback(&p_data->data);
}
break;
diff --git a/src/nfc/tags/ce_t4t.cc b/src/nfc/tags/ce_t4t.cc
index 60b314d..4d69834 100644
--- a/src/nfc/tags/ce_t4t.cc
+++ b/src/nfc/tags/ce_t4t.cc
@@ -48,8 +48,6 @@
**
*******************************************************************************/
static bool ce_t4t_send_to_lower(NFC_HDR* p_r_apdu) {
- DispCET4Tags(p_r_apdu, false);
-
if (NFC_SendData(NFC_RF_CONN_ID, p_r_apdu) != NFC_STATUS_OK) {
LOG(ERROR) << StringPrintf("failed");
return false;
@@ -549,8 +547,6 @@
p_c_apdu = (NFC_HDR*)p_data->data.p_data;
- DispCET4Tags(p_c_apdu, true);
-
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("conn_id = 0x%02X", conn_id);
p_cmd = (uint8_t*)(p_c_apdu + 1) + p_c_apdu->offset;
diff --git a/src/nfc/tags/rw_i93.cc b/src/nfc/tags/rw_i93.cc
index 2f1b3cd..e5c5551 100644
--- a/src/nfc/tags/rw_i93.cc
+++ b/src/nfc/tags/rw_i93.cc
@@ -550,8 +550,6 @@
**
*******************************************************************************/
bool rw_i93_send_to_lower(NFC_HDR* p_msg) {
- DispRWI93Tag(p_msg, false, 0x00);
-
/* store command for retransmitting */
if (rw_cb.tcb.i93.p_retry_cmd) {
GKI_freebuf(rw_cb.tcb.i93.p_retry_cmd);
@@ -2884,8 +2882,8 @@
** Returns none
**
*******************************************************************************/
-static void rw_i93_data_cback(uint8_t conn_id, tNFC_CONN_EVT event,
- tNFC_CONN* p_data) {
+static void rw_i93_data_cback(__attribute__((unused)) uint8_t conn_id,
+ tNFC_CONN_EVT event, tNFC_CONN* p_data) {
tRW_I93_CB* p_i93 = &rw_cb.tcb.i93;
NFC_HDR* p_resp;
tRW_DATA rw_data;
@@ -2947,8 +2945,6 @@
p_i93->retry_count = 0;
}
- DispRWI93Tag(p_resp, true, p_i93->sent_cmd);
-
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"RW I93 state: <%s (%d)>", rw_i93_get_state_name(p_i93->state).c_str(),
p_i93->state);
diff --git a/src/nfc/tags/rw_t1t.cc b/src/nfc/tags/rw_t1t.cc
index 130ba7c..6ea307f 100644
--- a/src/nfc/tags/rw_t1t.cc
+++ b/src/nfc/tags/rw_t1t.cc
@@ -51,7 +51,8 @@
** Returns none
**
*******************************************************************************/
-static void rw_t1t_data_cback(uint8_t conn_id, tNFC_CONN_EVT event,
+static void rw_t1t_data_cback(__attribute__((unused)) uint8_t conn_id,
+ __attribute__((unused)) tNFC_CONN_EVT event,
tNFC_CONN* p_data) {
tRW_T1T_CB* p_t1t = &rw_cb.tcb.t1t;
tRW_EVENT rw_event = RW_RAW_FRAME_EVT;
@@ -515,7 +516,7 @@
** Returns none
**
*******************************************************************************/
-void rw_t1t_process_timeout(TIMER_LIST_ENT* p_tle) {
+void rw_t1t_process_timeout(__attribute__((unused)) TIMER_LIST_ENT* p_tle) {
tRW_T1T_CB* p_t1t = &rw_cb.tcb.t1t;
LOG(ERROR) << StringPrintf("T1T timeout. state=%s command (opcode)=0x%02x ",
diff --git a/src/nfc/tags/rw_t2t.cc b/src/nfc/tags/rw_t2t.cc
index a288cbd..2ea8241 100644
--- a/src/nfc/tags/rw_t2t.cc
+++ b/src/nfc/tags/rw_t2t.cc
@@ -60,9 +60,7 @@
bool b_notify = true;
bool b_release = true;
uint8_t* p;
- tRW_READ_DATA evt_data = {
- 0,
- };
+ tRW_READ_DATA evt_data = {};
tT2T_CMD_RSP_INFO* p_cmd_rsp_info =
(tT2T_CMD_RSP_INFO*)rw_cb.tcb.t2t.p_cmd_rsp_info;
tRW_DETECT_NDEF_DATA ndef_data;
@@ -402,7 +400,7 @@
** Returns none
**
*******************************************************************************/
-void rw_t2t_process_timeout(TIMER_LIST_ENT* p_tle) {
+void rw_t2t_process_timeout() {
tRW_READ_DATA evt_data;
tRW_T2T_CB* p_t2t = &rw_cb.tcb.t2t;
diff --git a/src/nfc/tags/rw_t2t_ndef.cc b/src/nfc/tags/rw_t2t_ndef.cc
index d05defe..a01db88 100644
--- a/src/nfc/tags/rw_t2t_ndef.cc
+++ b/src/nfc/tags/rw_t2t_ndef.cc
@@ -239,9 +239,7 @@
if (p_t2t->tlv_detect == TAG_NDEF_TLV) {
/* Notify upper layer the result of NDEF detect op */
- tRW_DETECT_NDEF_DATA ndef_data = {
- 0,
- };
+ tRW_DETECT_NDEF_DATA ndef_data = {};
ndef_data.status = status;
ndef_data.protocol = NFC_PROTOCOL_T2T;
ndef_data.flags = rw_t2t_get_ndef_flags();
diff --git a/src/nfc/tags/rw_t3t.cc b/src/nfc/tags/rw_t3t.cc
index a0eef78..c0ed5ff 100644
--- a/src/nfc/tags/rw_t3t.cc
+++ b/src/nfc/tags/rw_t3t.cc
@@ -124,7 +124,7 @@
/* Local static functions */
static void rw_t3t_update_ndef_flag(uint8_t* p_flag);
-static tNFC_STATUS rw_t3t_unselect(uint8_t peer_nfcid2[]);
+static tNFC_STATUS rw_t3t_unselect();
static NFC_HDR* rw_t3t_get_cmd_buf(void);
static tNFC_STATUS rw_t3t_send_to_lower(NFC_HDR* p_msg);
static void rw_t3t_handle_get_system_codes_cplt(void);
@@ -134,17 +134,11 @@
uint8_t* p_sensf_res_buf);
static void rw_t3t_handle_ndef_detect_poll_rsp(tRW_T3T_CB* p_cb,
uint8_t nci_status,
- uint8_t num_responses,
- uint8_t sensf_res_buf_size,
- uint8_t* p_sensf_res_buf);
+ uint8_t num_responses);
static void rw_t3t_handle_fmt_poll_rsp(tRW_T3T_CB* p_cb, uint8_t nci_status,
- uint8_t num_responses,
- uint8_t sensf_res_buf_size,
- uint8_t* p_sensf_res_buf);
+ uint8_t num_responses);
static void rw_t3t_handle_sro_poll_rsp(tRW_T3T_CB* p_cb, uint8_t nci_status,
- uint8_t num_responses,
- uint8_t sensf_res_buf_size,
- uint8_t* p_sensf_res_buf);
+ uint8_t num_responses);
/* Default NDEF attribute information block (used when formatting Felica-Lite
* tags) */
@@ -352,18 +346,15 @@
} else if (p_cb->flags & RW_T3T_FL_W4_FMT_FELICA_LITE_POLL_RSP) {
/* Handle POLL ntf in response to get system codes */
p_cb->flags &= ~RW_T3T_FL_W4_FMT_FELICA_LITE_POLL_RSP;
- rw_t3t_handle_fmt_poll_rsp(p_cb, nci_status, num_responses,
- sensf_res_buf_size, p_sensf_res_buf);
+ rw_t3t_handle_fmt_poll_rsp(p_cb, nci_status, num_responses);
} else if (p_cb->flags & RW_T3T_FL_W4_SRO_FELICA_LITE_POLL_RSP) {
/* Handle POLL ntf in response to get system codes */
p_cb->flags &= ~RW_T3T_FL_W4_SRO_FELICA_LITE_POLL_RSP;
- rw_t3t_handle_sro_poll_rsp(p_cb, nci_status, num_responses,
- sensf_res_buf_size, p_sensf_res_buf);
+ rw_t3t_handle_sro_poll_rsp(p_cb, nci_status, num_responses);
} else if (p_cb->flags & RW_T3T_FL_W4_NDEF_DETECT_POLL_RSP) {
/* Handle POLL ntf in response to ndef detection */
p_cb->flags &= ~RW_T3T_FL_W4_NDEF_DETECT_POLL_RSP;
- rw_t3t_handle_ndef_detect_poll_rsp(p_cb, nci_status, num_responses,
- sensf_res_buf_size, p_sensf_res_buf);
+ rw_t3t_handle_ndef_detect_poll_rsp(p_cb, nci_status, num_responses);
} else {
/* Handle POLL ntf in response to RW_T3tPoll */
evt_data.t3t_poll.status = nci_status;
@@ -509,7 +500,7 @@
} else if (p_cb->flags & RW_T3T_FL_W4_NDEF_DETECT_POLL_RSP) {
/* POLL timeout for ndef detection */
p_cb->flags &= ~RW_T3T_FL_W4_NDEF_DETECT_POLL_RSP;
- rw_t3t_handle_ndef_detect_poll_rsp(p_cb, NFC_STATUS_TIMEOUT, 0, 0, NULL);
+ rw_t3t_handle_ndef_detect_poll_rsp(p_cb, NFC_STATUS_TIMEOUT, 0);
} else {
/* Timeout waiting for response for RW_T3tPoll */
evt_data.t3t_poll.status = NFC_STATUS_FAILED;
@@ -567,8 +558,6 @@
UINT8_TO_STREAM(p, (p_msg->len + 1));
p_msg->len += 1; /* Increment len to include SoD */
- DispT3TagMessage(p_msg, false);
-
return (NFC_SendData(NFC_RF_CONN_ID, p_msg));
}
@@ -1661,9 +1650,7 @@
*****************************************************************************/
static void rw_t3t_handle_ndef_detect_poll_rsp(tRW_T3T_CB* p_cb,
uint8_t nci_status,
- uint8_t num_responses,
- uint8_t sensf_res_buf_size,
- uint8_t* p_sensf_res_buf) {
+ uint8_t num_responses) {
NFC_HDR* p_cmd_buf;
uint8_t *p, *p_cmd_start;
tRW_DATA evt_data;
@@ -1785,9 +1772,7 @@
**
*****************************************************************************/
static void rw_t3t_handle_fmt_poll_rsp(tRW_T3T_CB* p_cb, uint8_t nci_status,
- uint8_t num_responses,
- uint8_t sensf_res_buf_size,
- uint8_t* p_sensf_res_buf) {
+ uint8_t num_responses) {
tRW_DATA evt_data;
evt_data.status = NFC_STATUS_OK;
@@ -1929,9 +1914,7 @@
**
*****************************************************************************/
static void rw_t3t_handle_sro_poll_rsp(tRW_T3T_CB* p_cb, uint8_t nci_status,
- uint8_t num_responses,
- uint8_t sensf_res_buf_size,
- uint8_t* p_sensf_res_buf) {
+ uint8_t num_responses) {
tRW_DATA evt_data;
uint8_t rw_t3t_ndef_attrib_info[T3T_MSG_BLOCKSIZE];
uint8_t* p;
@@ -2117,7 +2100,8 @@
** Returns none
**
*******************************************************************************/
-void rw_t3t_data_cback(uint8_t conn_id, tNFC_DATA_CEVT* p_data) {
+void rw_t3t_data_cback(__attribute__((unused)) uint8_t conn_id,
+ tNFC_DATA_CEVT* p_data) {
tRW_T3T_CB* p_cb = &rw_cb.tcb.t3t;
NFC_HDR* p_msg = p_data->p_data;
bool free_msg = false; /* if TRUE, free msg buffer before returning */
@@ -2158,8 +2142,6 @@
return;
}
- DispT3TagMessage(p_msg, true);
-
/* Skip over SoD */
p_msg->offset++;
p_msg->len--;
@@ -2232,7 +2214,7 @@
switch (event) {
case NFC_DEACTIVATE_CEVT:
- rw_t3t_unselect(NULL);
+ rw_t3t_unselect();
break;
case NFC_DATA_CEVT: /* check for status in tNFC_CONN */
@@ -2338,7 +2320,7 @@
** Returns NFC_STATUS_OK
**
*******************************************************************************/
-static tNFC_STATUS rw_t3t_unselect(uint8_t peer_nfcid2[]) {
+static tNFC_STATUS rw_t3t_unselect() {
tRW_T3T_CB* p_cb = &rw_cb.tcb.t3t;
#if (RW_STATS_INCLUDED == TRUE)
diff --git a/src/nfc/tags/rw_t4t.cc b/src/nfc/tags/rw_t4t.cc
index 259efc4..b5bfe8f 100644
--- a/src/nfc/tags/rw_t4t.cc
+++ b/src/nfc/tags/rw_t4t.cc
@@ -120,8 +120,6 @@
**
*******************************************************************************/
static bool rw_t4t_send_to_lower(NFC_HDR* p_c_apdu) {
- DispRWT4Tags(p_c_apdu, false);
-
if (NFC_SendData(NFC_RF_CONN_ID, p_c_apdu) != NFC_STATUS_OK) {
LOG(ERROR) << StringPrintf("failed");
return false;
@@ -1057,8 +1055,8 @@
*******************************************************************************/
static void rw_t4t_sm_ndef_format(NFC_HDR* p_r_apdu) {
tRW_T4T_CB* p_t4t = &rw_cb.tcb.t4t;
- uint8_t *p, type, length;
- uint16_t status_words, nlen;
+ uint8_t* p;
+ uint16_t status_words;
tRW_DATA rw_data;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
@@ -1735,8 +1733,8 @@
** Returns none
**
*******************************************************************************/
-static void rw_t4t_data_cback(uint8_t conn_id, tNFC_CONN_EVT event,
- tNFC_CONN* p_data) {
+static void rw_t4t_data_cback(__attribute__((unused)) uint8_t conn_id,
+ tNFC_CONN_EVT event, tNFC_CONN* p_data) {
tRW_T4T_CB* p_t4t = &rw_cb.tcb.t4t;
NFC_HDR* p_r_apdu;
tRW_DATA rw_data;
@@ -1779,8 +1777,6 @@
return;
}
- if (p_t4t->state != RW_T4T_STATE_IDLE) DispRWT4Tags(p_r_apdu, true);
-
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"RW T4T state: <%s (%d)>", rw_t4t_get_state_name(p_t4t->state).c_str(),
p_t4t->state);