Remove unused global declaration
Test: Tag reading, HCE
Change-Id: I89962090c03a2c373f9bdadf4785320d1f30908a
diff --git a/src/adaptation/android_logmsg.cc b/src/adaptation/android_logmsg.cc
index b0e5330..8aa6636 100644
--- a/src/adaptation/android_logmsg.cc
+++ b/src/adaptation/android_logmsg.cc
@@ -29,7 +29,7 @@
#define PRINT(s) __android_log_write(ANDROID_LOG_DEBUG, "BrcmNci", s)
static char log_line[MAX_LOGCAT_LINE];
static const char* sTable = "0123456789abcdef";
-static bool sIsUseRaw = FALSE;
+
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,
@@ -46,7 +46,7 @@
void BTDISP_UNINIT_LOCK() {}
-void ProtoDispAdapterUseRawOutput(bool isUseRaw) { sIsUseRaw = isUseRaw; }
+void ProtoDispAdapterUseRawOutput(bool isUseRaw) {}
void ProtoDispAdapterDisplayNciPacket(uint8_t* nciPacket, uint16_t nciPacketLen,
bool is_recv) {
diff --git a/src/adaptation/config.cc b/src/adaptation/config.cc
index 9bc787d..5736d26 100644
--- a/src/adaptation/config.cc
+++ b/src/adaptation/config.cc
@@ -73,7 +73,6 @@
inline bool Is(unsigned long f) { return (state & f) == f; }
inline void Set(unsigned long f) { state |= f; }
- inline void Reset(unsigned long f) { state &= ~f; }
};
/*******************************************************************************
diff --git a/src/gki/common/gki.h b/src/gki/common/gki.h
index 4eaf500..f1284c0 100644
--- a/src/gki/common/gki.h
+++ b/src/gki/common/gki.h
@@ -350,7 +350,6 @@
extern void GKI_run(void*);
extern void GKI_stop(void);
extern uint8_t GKI_suspend_task(uint8_t);
-extern uint8_t GKI_is_task_running(uint8_t);
/* memory management
*/
diff --git a/src/gki/common/gki_buffer.cc b/src/gki/common/gki_buffer.cc
index 8827809..d722995 100644
--- a/src/gki/common/gki_buffer.cc
+++ b/src/gki/common/gki_buffer.cc
@@ -975,45 +975,6 @@
/*******************************************************************************
**
-** Function GKI_igetpoolbuf
-**
-** Description Called by an interrupt service routine to get a free buffer
-** from a specific buffer pool.
-**
-** Parameters pool_id - (input) pool ID to get a buffer out of.
-**
-** Returns A pointer to the buffer, or NULL if none available
-**
-*******************************************************************************/
-void* GKI_igetpoolbuf(uint8_t pool_id) {
- FREE_QUEUE_T* Q;
- BUFFER_HDR_T* p_hdr;
-
- if (pool_id >= GKI_NUM_TOTAL_BUF_POOLS) return (NULL);
-
- Q = &gki_cb.com.freeq[pool_id];
- if (Q->cur_cnt < Q->total) {
- p_hdr = Q->p_first;
- Q->p_first = p_hdr->p_next;
-
- if (!Q->p_first) Q->p_last = NULL;
-
- if (++Q->cur_cnt > Q->max_cnt) Q->max_cnt = Q->cur_cnt;
-
- p_hdr->task_id = GKI_get_taskid();
-
- p_hdr->status = BUF_STATUS_UNLINKED;
- p_hdr->p_next = NULL;
- p_hdr->Type = 0;
-
- return ((void*)((uint8_t*)p_hdr + BUFFER_HDR_SIZE));
- }
-
- return (NULL);
-}
-
-/*******************************************************************************
-**
** Function GKI_poolcount
**
** Description Called by an application to get the total number of buffers
diff --git a/src/gki/common/gki_common.h b/src/gki/common/gki_common.h
index ba9f8c5..5cf7028 100644
--- a/src/gki/common/gki_common.h
+++ b/src/gki/common/gki_common.h
@@ -278,11 +278,4 @@
extern void gki_timers_init(void);
extern void gki_adjust_timer_count(int32_t);
-extern void OSStartRdy(void);
-extern void OSCtxSw(void);
-extern void OSIntCtxSw(void);
-extern void OSSched(void);
-extern void OSIntEnter(void);
-extern void OSIntExit(void);
-
#endif
diff --git a/src/gki/ulinux/data_types.h b/src/gki/ulinux/data_types.h
index 5e97d54..727cd3c 100644
--- a/src/gki/ulinux/data_types.h
+++ b/src/gki/ulinux/data_types.h
@@ -29,14 +29,10 @@
#define FALSE 0
#endif
-typedef uint32_t TIME_STAMP;
-
#ifndef TRUE
#define TRUE (!FALSE)
#endif
-typedef unsigned char UBYTE;
-
#ifdef __arm
#define PACKED __packed
#define INLINE __inline
diff --git a/src/include/NfcAdaptation.h b/src/include/NfcAdaptation.h
index 606f66b..49138b6 100644
--- a/src/include/NfcAdaptation.h
+++ b/src/include/NfcAdaptation.h
@@ -89,7 +89,6 @@
static ThreadMutex sLock;
ThreadCondVar mCondVar;
tHAL_NFC_ENTRY mHalEntryFuncs; // function pointers for HAL entry points
- static nfc_nci_device_t* mHalDeviceContext;
static android::sp<android::hardware::nfc::V1_0::INfc> mHal;
static android::hardware::nfc::V1_0::INfcClientCallback* mCallback;
static tHAL_NFC_CBACK* mHalCallback;
diff --git a/src/include/buildcfg.h b/src/include/buildcfg.h
index 87bfc4c..8cbd663 100644
--- a/src/include/buildcfg.h
+++ b/src/include/buildcfg.h
@@ -49,21 +49,7 @@
extern void ScrLog(uint32_t trace_set_mask, const char* fmt_str, ...);
extern void DispNci(uint8_t* p, uint16_t len, bool is_recv);
-extern void downloadFirmwarePatchFile(uint32_t brcm_hw_id);
-
void ProtoDispAdapterDisplayNciPacket(uint8_t* nciPacket, uint16_t nciPacketLen,
bool is_recv);
#define DISP_NCI ProtoDispAdapterDisplayNciPacket
-
-#ifndef _TIMEB
-#define _TIMEB
-struct _timeb {
- long time;
- short millitm;
- short timezone;
- short dstflag;
-};
-void _ftime(struct _timeb*);
-
-#endif
#endif
diff --git a/src/include/config.h b/src/include/config.h
index 59a804b..de282c3 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -40,25 +40,4 @@
#define NAME_NFA_PROPRIETARY_CFG "NFA_PROPRIETARY_CFG"
#define NAME_NFA_AID_BLOCK_ROUTE "NFA_AID_BLOCK_ROUTE"
-struct tUART_CONFIG {
- int m_iBaudrate; // 115200
- int m_iDatabits; // 8
- int m_iParity; // 0 - none, 1 = odd, 2 = even
- int m_iStopbits;
-};
-
-extern struct tUART_CONFIG uartConfig;
-
-void readOptionalConfig(const char* option);
-
-/* Snooze mode configuration structure */
-typedef struct {
- unsigned char snooze_mode; /* Snooze Mode */
- unsigned char idle_threshold_dh; /* Idle Threshold Host */
- unsigned char idle_threshold_nfcc; /* Idle Threshold NFCC */
- unsigned char
- nfc_wake_active_mode; /* NFC_LP_ACTIVE_LOW or NFC_LP_ACTIVE_HIGH */
- unsigned char
- dh_wake_active_mode; /* NFC_LP_ACTIVE_LOW or NFC_LP_ACTIVE_HIGH */
-} tSNOOZE_MODE_CONFIG;
#endif
diff --git a/src/include/gki_hal_target.h b/src/include/gki_hal_target.h
index 447b11e..9ae1bfe 100644
--- a/src/include/gki_hal_target.h
+++ b/src/include/gki_hal_target.h
@@ -215,6 +215,4 @@
#define GKI_SEND_MSG_FROM_ISR FALSE
#endif
-extern void LogMsg(uint32_t trace_set_mask, const char* fmt_str, ...);
-
#endif /* GKI_TARGET_H */
diff --git a/src/include/gki_target.h b/src/include/gki_target.h
index 0de753f..3bf0c8f 100644
--- a/src/include/gki_target.h
+++ b/src/include/gki_target.h
@@ -353,6 +353,4 @@
#define GKI_BUF8_MAX 30
#endif
-extern void LogMsg(uint32_t trace_set_mask, const char* fmt_str, ...);
-
#endif /* GKI_TARGET_H */
diff --git a/src/include/nci_defs.h b/src/include/nci_defs.h
index 23b4ae6..dc70523 100644
--- a/src/include/nci_defs.h
+++ b/src/include/nci_defs.h
@@ -163,8 +163,6 @@
#define NCI_STATUS_EE_PROTOCOL_ERR 0xC2
#define NCI_STATUS_EE_TIMEOUT 0xC3
-typedef uint8_t tNCI_STATUS;
-
/* RF Technologies */
#define NCI_RF_TECHNOLOGY_A 0x00
#define NCI_RF_TECHNOLOGY_B 0x01
@@ -541,28 +539,6 @@
/* AID is blocked in unsupported power mode */
#define NCI_ROUTE_QUAL_BLOCK_ROUTE 0x40
-typedef struct {
- uint16_t addr;
- uint8_t len;
- uint8_t* data;
-} NCIP_T1T_SETMEM_CMD_t;
-
-typedef struct { uint8_t status; } NCIP_T1T_SETMEM_RSP_t;
-
-typedef struct { uint16_t addr; } NCIP_T1T_GETMEM_CMD_t;
-
-typedef struct {
- uint8_t status;
- uint8_t* data;
-} NCIP_T1T_GETMEM_RSP_t;
-
-typedef struct {
- uint8_t hr0;
- uint8_t hr1;
-} NCIP_T1T_SETHR_CMD_t;
-
-typedef struct { uint8_t status; } NCIP_T1T_SETHR_RSP_t;
-
#ifndef NCI_GET_CMD_BUF
#if (HCI_USE_VARIABLE_SIZE_CMD_BUF == FALSE)
/* Allocate fixed-size buffer from HCI_CMD_POOL (default case) */
@@ -627,16 +603,6 @@
Interface */
} tNCI_RF_LF_PARAMS;
-typedef struct {
- tNCI_DISCOVERY_TYPE mode;
- union {
- tNCI_RF_PA_PARAMS pa;
- tNCI_RF_PB_PARAMS pb;
- tNCI_RF_PF_PARAMS pf;
- tNCI_RF_LF_PARAMS lf;
- } param; /* Discovery Type specific parameters */
-} tNCI_RF_TECH_PARAMS;
-
#ifndef NCI_MAX_ATS_LEN
#define NCI_MAX_ATS_LEN 60
#endif
@@ -692,20 +658,6 @@
} tNCI_INTF_LB_ISO_DEP;
typedef struct {
- tNCI_INTF_TYPE type; /* Interface Type 1 Byte See Table 67 */
- union {
- tNCI_INTF_LA_ISO_DEP la_iso;
- tNCI_INTF_PA_ISO_DEP pa_iso;
- tNCI_INTF_LB_ISO_DEP lb_iso;
- tNCI_INTF_PB_ISO_DEP pb_iso;
- tNCI_INTF_LA_NFC_DEP la_nfc;
- tNCI_INTF_PA_NFC_DEP pa_nfc;
- tNCI_INTF_LF_NFC_DEP lf_nfc;
- tNCI_INTF_PF_NFC_DEP pf_nfc;
- } intf_param; /* Activation Parameters 0 - n Bytes */
-} tNCI_INTF_PARAMS;
-
-typedef struct {
uint8_t atr_res_len; /* Length of ATR_RES */
uint8_t atr_res[NCI_MAX_ATS_LEN]; /* ATR_RES (Byte 3 - Byte 17+n) */
uint8_t max_payload_size; /* 64, 128, 192 or 254 */
diff --git a/src/include/nfc_brcm_defs.h b/src/include/nfc_brcm_defs.h
index 62a0995..16a3e20 100644
--- a/src/include/nfc_brcm_defs.h
+++ b/src/include/nfc_brcm_defs.h
@@ -88,114 +88,4 @@
/* DH HCI Network command definitions */
#define NFC_HAL_HCI_DH_MAX_DYN_PIPES 20
-/* Card emulation RF Gate A registry information */
-typedef struct {
- uint8_t pipe_id; /* if MSB is set then valid, 7 bits for Pipe ID */
- uint8_t mode; /* Type A card emulation enabled indicator, 0x02:enabled */
- uint8_t sak;
- uint8_t uid_reg_len;
- uint8_t uid_reg[NFC_HAL_HCI_CE_RF_A_UID_REG_LEN];
- uint8_t atqa[NFC_HAL_HCI_CE_RF_A_ATQA_RSP_CODE_LEN]; /* ATQA response code */
- uint8_t app_data_len;
- uint8_t
- app_data[NFC_HAL_HCI_CE_RF_A_MAX_HIST_DATA_LEN]; /* 15 bytes optional
- storage for historic
- data, use 2 slots */
- uint8_t fwi_sfgi; /* FRAME WAITING TIME, START-UP FRAME GUARD TIME */
- uint8_t cid_support;
- uint8_t datarate_max[NFC_HAL_HCI_CE_RF_A_MAX_DATA_RATE_LEN];
- uint8_t clt_support;
-} tNCI_HCI_CE_RF_A;
-
-/* Card emulation RF Gate B registry information */
-typedef struct {
- uint8_t pipe_id; /* if MSB is set then valid, 7 bits for Pipe ID */
- uint8_t mode; /* Type B card emulation enabled indicator, 0x02:enabled */
- uint8_t pupi_len;
- uint8_t pupi_reg[NFC_HAL_HCI_CE_RF_B_PUPI_LEN];
- uint8_t afi;
- uint8_t
- atqb[NFC_HAL_HCI_CE_RF_B_ATQB_LEN]; /* 4 bytes ATQB application data */
- uint8_t higherlayer_resp
- [NFC_HAL_HCI_CE_RF_B_HIGHER_LAYER_RSP_LEN]; /* 0~ 61 bytes ATRB_INF use
- 1~4 personality slots */
- uint8_t datarate_max[NFC_HAL_HCI_CE_RF_B_MAX_DATA_RATE_LEN];
- uint8_t natrb;
-} tNCI_HCI_CE_RF_B;
-
-/* Card emulation RF Gate BP registry information */
-typedef struct {
- uint8_t pipe_id; /* if MSB is set then valid, 7 bits for Pipe ID */
- uint8_t
- mode; /* Type B prime card emulation enabled indicator, 0x02:enabled */
- uint8_t pat_in_len;
- uint8_t pat_in[NFC_HAL_HCI_CE_RF_BP_MAX_PAT_IN_LEN];
- uint8_t dat_out_len;
- uint8_t
- dat_out[NFC_HAL_HCI_CE_RF_BP_DATA_OUT_LEN]; /* ISO7816-3 <=64 byte, and
- other fields are 9 bytes */
- uint8_t natr;
-} tNCI_HCI_CE_RF_BP;
-
-/* Card emulation RF Gate F registry information */
-typedef struct {
- uint8_t pipe_id; /* if MSB is set then valid, 7 bits for Pipe ID */
- uint8_t mode; /* Type F card emulation enabled indicator, 0x02:enabled */
- uint8_t speed_cap;
- uint8_t clt_support;
-} tNCI_HCI_CE_RF_F;
-
-/* Reader RF Gate A registry information */
-typedef struct {
- uint8_t pipe_id; /* if MSB is set then valid, 7 bits for Pipe ID */
- uint8_t datarate_max;
-} tNCI_HCI_RD_RF_A;
-
-/* Reader RF Gate B registry information */
-typedef struct {
- uint8_t pipe_id; /* if MSB is set then valid, 7 bits for Pipe ID */
- uint8_t afi;
- uint8_t hldata_len;
- uint8_t
- high_layer_data[NFC_HAL_HCI_RD_RF_B_HIGHER_LAYER_DATA_LEN]; /* INF field
- in ATTRIB
- command */
-} tNCI_HCI_RD_RF_B;
-
-/* Dynamic pipe information */
-typedef struct {
- uint8_t source_host;
- uint8_t dest_host;
- uint8_t source_gate;
- uint8_t dest_gate;
- uint8_t pipe_id; /* if MSB is set then valid, 7 bits for Pipe ID */
-} tNCI_HCI_DYN_PIPE_INFO;
-
-/*************************************************************
- * HCI Network CMD/NTF structure for UICC host in the network
- *************************************************************/
-typedef struct {
- uint8_t target_handle;
- uint8_t session_id[NFC_HAL_HCI_SESSION_ID_LEN];
- uint8_t sync_id[NFC_HAL_HCI_SYNC_ID_LEN];
- uint8_t static_pipe_info;
- tNCI_HCI_CE_RF_A ce_rf_a;
- tNCI_HCI_CE_RF_B ce_rf_b;
- tNCI_HCI_CE_RF_BP ce_rf_bp;
- tNCI_HCI_CE_RF_F ce_rf_f;
- tNCI_HCI_RD_RF_A rw_rf_a;
- tNCI_HCI_RD_RF_B rw_rf_b;
-} tNCI_HCI_NETWK;
-
-/************************************************
- * HCI Network CMD/NTF structure for Device host
- ************************************************/
-typedef struct {
- uint8_t target_handle;
- uint8_t session_id[NFC_HAL_HCI_SESSION_ID_LEN];
- uint8_t static_pipe_info;
- uint8_t num_dyn_pipes;
- tNCI_HCI_DYN_PIPE_INFO dyn_pipe_info[NFC_HAL_HCI_DH_MAX_DYN_PIPES];
-} tNCI_HCI_NETWK_DH;
-
#endif /* NFC_BRCM_DEFS_H */
diff --git a/src/include/nfc_hal_api.h b/src/include/nfc_hal_api.h
index 8022587..205c6f7 100644
--- a/src/include/nfc_hal_api.h
+++ b/src/include/nfc_hal_api.h
@@ -50,30 +50,6 @@
typedef uint8_t(tHAL_API_GET_MAX_NFCEE)(void);
typedef struct {
- uint32_t addr;
- uint32_t data;
-} tNFC_HAL_DM_PRE_SET_MEM;
-
-/* data members for NFC_HAL-HCI */
-typedef struct {
- bool nfc_hal_prm_nvm_required; /* set nfc_hal_prm_nvm_required to TRUE, if the
- platform wants to abort PRM process without
- NVM */
- uint16_t nfc_hal_nfcc_enable_timeout; /* max time to wait for RESET NTF after
- setting REG_PU to high */
- uint16_t nfc_hal_post_xtal_timeout; /* max time to wait for RESET NTF after
- setting Xtal frequency */
-#if (NFC_HAL_HCI_INCLUDED == TRUE)
- bool nfc_hal_first_boot; /* set nfc_hal_first_boot to TRUE, if platform
- enables NFC for the first time after bootup */
- uint8_t nfc_hal_hci_uicc_support; /* set nfc_hal_hci_uicc_support to Zero, if
- no UICC is supported otherwise set
- corresponding bit(s) for every supported
- UICC(s) */
-#endif
-} tNFC_HAL_CFG;
-
-typedef struct {
tHAL_API_INITIALIZE* initialize;
tHAL_API_TERMINATE* terminate;
tHAL_API_OPEN* open;
@@ -91,142 +67,4 @@
** HAL API Function Prototypes
*******************************************************************************/
-/*******************************************************************************
-**
-** Function HAL_NfcInitialize
-**
-** Description Called when HAL library is loaded.
-**
-** Initialize GKI and start the HCIT task
-**
-** Returns void
-**
-*******************************************************************************/
-void HAL_NfcInitialize(void);
-
-/*******************************************************************************
-**
-** Function HAL_NfcTerminate
-**
-** Description Called to terminate NFC HAL
-**
-** Returns void
-**
-*******************************************************************************/
-void HAL_NfcTerminate(void);
-
-/*******************************************************************************
-**
-** Function HAL_NfcOpen
-**
-** Description Open transport and intialize the NFCC, and
-** Register callback for HAL event notifications,
-**
-** HAL_OPEN_CPLT_EVT will notify when operation is complete.
-**
-** Returns void
-**
-*******************************************************************************/
-void HAL_NfcOpen(tHAL_NFC_CBACK* p_hal_cback,
- tHAL_NFC_DATA_CBACK* p_data_cback);
-
-/*******************************************************************************
-**
-** Function HAL_NfcClose
-**
-** Description Prepare for shutdown. A HAL_CLOSE_CPLT_EVT will be
-** reported when complete.
-**
-** Returns void
-**
-*******************************************************************************/
-void HAL_NfcClose(void);
-
-/*******************************************************************************
-**
-** Function HAL_NfcCoreInitialized
-**
-** Description Called after the CORE_INIT_RSP is received from the NFCC.
-** At this time, the HAL can do any chip-specific
-** configuration, and when finished signal the libnfc-nci with
-** event HAL_POST_INIT_CPLT_EVT.
-**
-** Returns void
-**
-*******************************************************************************/
-void HAL_NfcCoreInitialized(uint16_t data_len, uint8_t* p_core_init_rsp_params);
-
-/*******************************************************************************
-**
-** Function HAL_NfcWrite
-**
-** Description Send an NCI control message or data packet to the
-** transport. If an NCI command message exceeds the transport
-** size, HAL is responsible for fragmenting it, Data packets
-** must be of the correct size.
-**
-** Returns void
-**
-*******************************************************************************/
-void HAL_NfcWrite(uint16_t data_len, uint8_t* p_data);
-
-/*******************************************************************************
-**
-** Function HAL_NfcPreDiscover
-**
-** Description Perform any vendor-specific pre-discovery actions (if
-** needed). If any actions were performed TRUE will be
-** returned, and HAL_PRE_DISCOVER_CPLT_EVT will notify when
-** actions are completed.
-**
-** Returns TRUE if vendor-specific pre-discovery actions initialized
-** FALSE if no vendor-specific pre-discovery actions are
-** needed.
-**
-*******************************************************************************/
-bool HAL_NfcPreDiscover(void);
-
-/*******************************************************************************
-**
-** Function HAL_NfcControlGranted
-**
-** Description Grant control to HAL control for sending NCI commands.
-**
-** Call in response to HAL_REQUEST_CONTROL_EVT.
-**
-** Must only be called when there are no NCI commands pending.
-**
-** HAL_RELEASE_CONTROL_EVT will notify when HAL no longer
-** needs control of NCI.
-**
-**
-** Returns void
-**
-*******************************************************************************/
-void HAL_NfcControlGranted(void);
-
-/*******************************************************************************
-**
-** Function HAL_NfcPowerCycle
-**
-** Description Restart NFCC by power cyle
-**
-** HAL_OPEN_CPLT_EVT will notify when operation is complete.
-**
-** Returns void
-**
-*******************************************************************************/
-void HAL_NfcPowerCycle(void);
-
-/*******************************************************************************
-**
-** Function HAL_NfcGetMaxNfcee
-**
-** Description Retrieve the maximum number of NFCEEs supported by NFCC
-**
-** Returns the maximum number of NFCEEs supported by NFCC
-**
-*******************************************************************************/
-uint8_t HAL_NfcGetMaxNfcee(void);
-
#endif /* NFC_HAL_API_H */
diff --git a/src/include/nfc_hal_int.h b/src/include/nfc_hal_int.h
index 6f10161..6b7a972 100644
--- a/src/include/nfc_hal_int.h
+++ b/src/include/nfc_hal_int.h
@@ -45,8 +45,6 @@
#if (NFC_HAL_HCI_INCLUDED == TRUE)
-typedef uint16_t tNFC_HAL_HCI_EVT;
-
#endif
/* NFC HAL transport configuration */
@@ -69,35 +67,10 @@
** Internal constants and definitions
****************************************************************************/
-/* NFC HAL receiving states */
-enum {
- NFC_HAL_RCV_IDLE_ST, /* waiting for packet type byte */
- NFC_HAL_RCV_NCI_MSG_ST, /* waiting for the first byte of NCI header */
- NFC_HAL_RCV_NCI_HDR_ST, /* reading NCI header */
- NFC_HAL_RCV_NCI_PAYLOAD_ST, /* reading NCI payload */
- NFC_HAL_RCV_BT_MSG_ST, /* waiting for the first byte of BT header */
- NFC_HAL_RCV_BT_HDR_ST, /* reading BT HCI header */
- NFC_HAL_RCV_BT_PAYLOAD_ST /* reading BT HCI payload */
-};
-
typedef uint8_t tNFC_HAL_NCI_RAS;
-/* NFC HAL power mode */
-enum {
- NFC_HAL_POWER_MODE_FULL, /* NFCC is full power mode */
- NFC_HAL_POWER_MODE_LAST
-};
typedef uint8_t tNFC_HAL_POWER_MODE;
-/* NFC HAL event for low power mode */
-enum {
- NFC_HAL_LP_TX_DATA_EVT, /* DH is sending data to NFCC */
- NFC_HAL_LP_RX_DATA_EVT, /* DH received data from NFCC */
- NFC_HAL_LP_TIMEOUT_EVT, /* Timeout */
- NFC_HAL_LP_LAST_EVT
-};
-typedef uint8_t tNFC_HAL_LP_EVT;
-
#define NFC_HAL_SAVED_HDR_SIZE (2)
#define NFC_HAL_SAVED_CMD_SIZE (2)
@@ -117,35 +90,8 @@
nfc_hal_cb.dev_cb.initializing_state = state;
#endif
-/* NFC HAL - NFCC initializing state */
-enum {
- NFC_HAL_INIT_STATE_IDLE, /* Initialization is done */
- NFC_HAL_INIT_STATE_W4_XTAL_SET, /* Waiting for crystal setting rsp */
- NFC_HAL_INIT_STATE_POST_XTAL_SET, /* Waiting for reset ntf after xtal set */
- NFC_HAL_INIT_STATE_W4_NFCC_ENABLE, /* Waiting for reset ntf atter REG_PU up */
- NFC_HAL_INIT_STATE_W4_BUILD_INFO, /* Waiting for build info rsp */
- NFC_HAL_INIT_STATE_W4_PATCH_INFO, /* Waiting for patch info rsp */
- NFC_HAL_INIT_STATE_W4_APP_COMPLETE, /* Waiting for complete from application
- */
- NFC_HAL_INIT_STATE_W4_POST_INIT_DONE, /* Waiting for complete of post init */
- NFC_HAL_INIT_STATE_W4_CONTROL_DONE, /* Waiting for control release */
- NFC_HAL_INIT_STATE_W4_PREDISCOVER_DONE, /* Waiting for complete of prediscover
- */
- NFC_HAL_INIT_STATE_W4_NFCC_TURN_OFF, /* Waiting for NFCC to turn OFF */
- NFC_HAL_INIT_STATE_CLOSING /* Shutting down */
-};
typedef uint8_t tNFC_HAL_INIT_STATE;
-/* NFC HAL - NFCC config items during post initialization */
-enum {
- NFC_HAL_DM_CONFIG_LPTD,
- NFC_HAL_DM_CONFIG_PLL_325,
- NFC_HAL_DM_CONFIG_START_UP,
- NFC_HAL_DM_CONFIG_I93_DATA_RATE,
- NFC_HAL_DM_CONFIG_FW_FSM,
- NFC_HAL_DM_CONFIG_START_UP_VSC,
- NFC_HAL_DM_CONFIG_NONE
-};
typedef uint8_t tNFC_HAL_DM_CONFIG;
/* callback function prototype */
@@ -155,8 +101,6 @@
uint8_t* p_param_buf;
} tNFC_HAL_BTVSC_CPLT;
-typedef void(tNFC_HAL_BTVSC_CPLT_CBACK)(tNFC_HAL_BTVSC_CPLT* p1);
-
#if (NFC_HAL_HCI_INCLUDED == TRUE)
/* data type for NFC_HAL_HCI_RSP_NV_READ_EVT */
@@ -186,63 +130,6 @@
** Control block for NFC HAL
*****************************************************************************/
-/* Patch RAM Download Control block */
-
-/* PRM states */
-enum {
- NFC_HAL_PRM_ST_IDLE,
-
- /* Secure patch download stated */
- NFC_HAL_PRM_ST_SPD_COMPARE_VERSION,
- NFC_HAL_PRM_ST_SPD_GET_PATCH_HEADER,
- NFC_HAL_PRM_ST_SPD_DOWNLOADING,
- NFC_HAL_PRM_ST_SPD_AUTHENTICATING,
- NFC_HAL_PRM_ST_SPD_AUTH_DONE,
- NFC_HAL_PRM_ST_W4_GET_VERSION
-};
-typedef uint8_t tNFC_HAL_PRM_STATE;
-
-/* Maximum number of patches (currently 2: LPM and FPM) */
-#define NFC_HAL_PRM_MAX_PATCH_COUNT 2
-#define NFC_HAL_PRM_MAX_CHIP_VER_LEN 8
-
-/* Structures for PRM Control Block */
-typedef struct {
- uint8_t power_mode;
- uint16_t len;
-} tNFC_HAL_PRM_PATCHDESC;
-
-typedef struct {
- tNFC_HAL_PRM_STATE state; /* download state */
- uint32_t flags; /* internal flags */
- uint16_t
- cur_patch_len_remaining; /* bytes remaining in patchfile to process */
- const uint8_t*
- p_cur_patch_data; /* pointer to patch currently being downloaded */
- uint16_t cur_patch_offset; /* offset of next byte to process */
- uint32_t dest_ram;
- TIMER_LIST_ENT timer; /* Timer for patch download */
- void* p_param; /* general purpose param for PRM */
- uint8_t param_idx; /* information related to general purpose param*/
-
- /* Secure Patch Download */
- uint32_t
- spd_patch_needed_mask; /* Mask of patches that need to be downloaded */
- uint8_t spd_patch_count; /* Number of patches left to download */
- uint8_t spd_cur_patch_idx; /* Current patch being downloaded */
-
- tNFC_HAL_PRM_PATCHDESC spd_patch_desc[NFC_HAL_PRM_MAX_PATCH_COUNT];
-
- /* I2C-patch */
- uint8_t* p_spd_patch; /* pointer to spd patch */
- uint16_t spd_patch_len_remaining; /* patch length */
- uint16_t spd_patch_offset; /* offset of next byte to process */
-
- tNFC_HAL_PRM_FORMAT format; /* format of patch ram */
- tNFC_HAL_PRM_CBACK* p_cback; /* Callback for download status notifications */
- uint32_t patchram_delay; /* the dealy after patch */
-} tNFC_HAL_PRM_CB;
-
/* Information about current patch in NVM */
typedef struct {
uint16_t project_id; /* Current project_id of patch in nvm */
@@ -364,65 +251,11 @@
** Internal nfc functions
****************************************************************************/
-/* From nfc_hal_main.c */
-uint32_t nfc_hal_main_task(uint32_t param);
-void nfc_hal_main_init(void);
-void nfc_hal_main_close(void);
-void nfc_hal_main_pre_init_done(tHAL_NFC_STATUS);
-void nfc_hal_main_exit_op_done(tNFC_HAL_NCI_EVT event, uint16_t data_len,
- uint8_t* p_data);
-void nfc_hal_main_start_quick_timer(TIMER_LIST_ENT* p_tle, uint16_t type,
- uint32_t timeout);
-void nfc_hal_main_stop_quick_timer(TIMER_LIST_ENT* p_tle);
-void nfc_hal_main_send_error(tHAL_NFC_STATUS status);
-void nfc_hal_send_nci_msg_to_nfc_task(NFC_HDR* p_msg);
-
-/* nfc_hal_nci.c */
-bool nfc_hal_nci_receive_msg(uint8_t byte);
-bool nfc_hal_nci_preproc_rx_nci_msg(NFC_HDR* p_msg);
-NFC_HDR* nfc_hal_nci_postproc_rx_nci_msg(void);
-void nfc_hal_nci_assemble_nci_msg(void);
-void nfc_hal_nci_add_nfc_pkt_type(NFC_HDR* p_msg);
-void nfc_hal_nci_send_cmd(NFC_HDR* p_buf);
-void nfc_hal_nci_cmd_timeout_cback(void* p_tle);
-
-/* nfc_hal_dm.c */
-void nfc_hal_dm_init(void);
-void nfc_hal_dm_set_xtal_freq_index(void);
-void nfc_hal_dm_set_power_level_zero(void);
-void nfc_hal_dm_send_get_build_info_cmd(void);
-void nfc_hal_dm_proc_msg_during_init(NFC_HDR* p_msg);
-void nfc_hal_dm_proc_msg_during_exit(NFC_HDR* p_msg);
-void nfc_hal_dm_config_nfcc(void);
-void nfc_hal_dm_send_nci_cmd(const uint8_t* p_data, uint16_t len,
- tNFC_HAL_NCI_CBACK* p_cback);
-void nfc_hal_dm_send_bt_cmd(const uint8_t* p_data, uint16_t len,
- tNFC_HAL_BTVSC_CPLT_CBACK* p_cback);
-void nfc_hal_dm_set_nfc_wake(uint8_t cmd);
-void nfc_hal_dm_pre_init_nfcc(void);
-void nfc_hal_dm_shutting_down_nfcc(void);
-bool nfc_hal_dm_power_mode_execute(tNFC_HAL_LP_EVT event);
-void nfc_hal_dm_send_pend_cmd(void);
-tHAL_NFC_STATUS nfc_hal_dm_set_config(uint8_t tlv_size, uint8_t* p_param_tlvs,
- tNFC_HAL_NCI_CBACK* p_cback);
-bool nfc_hal_dm_check_pre_set_mem(void);
-tNFC_HAL_NCI_CBACK* nfc_hal_dm_got_vs_rsp(void);
-
-/* nfc_hal_prm.c */
-void nfc_hal_prm_spd_reset_ntf(uint8_t reset_reason, uint8_t reset_type);
-void nfc_hal_prm_nci_command_complete_cback(tNFC_HAL_NCI_EVT event,
- uint16_t data_len, uint8_t* p_data);
-void nfc_hal_prm_process_timeout(void* p_tle);
-
#if (NFC_HAL_HCI_INCLUDED == TRUE)
/* nfc_hal_hci.c */
void nfc_hal_hci_enable(void);
void nfc_hal_hci_evt_hdlr(tNFC_HAL_HCI_EVENT_DATA* p_evt_data);
-void nfc_hal_hci_handle_hci_netwk_info(uint8_t* p_data);
-void nfc_hal_hci_handle_hcp_pkt_from_hc(uint8_t* p_data);
-NFC_HDR* nfc_hal_hci_postproc_hcp(void);
-bool nfc_hal_hci_handle_hcp_pkt_to_hc(uint8_t* p_data);
-void nfc_hal_hci_timeout_cback(void* p_tle);
+
void nfc_hal_hci_handle_build_info(uint8_t chipverlen, uint8_t* p_chipverstr);
#else
#define nfc_hal_hci_enable() NFC_HAL_SET_INIT_STATE(NFC_HAL_INIT_STATE_IDLE);
diff --git a/src/include/nfc_hal_int_api.h b/src/include/nfc_hal_int_api.h
index 9198c90..58b51d3 100644
--- a/src/include/nfc_hal_int_api.h
+++ b/src/include/nfc_hal_int_api.h
@@ -28,22 +28,6 @@
** Device Configuration definitions
****************************************************************************/
-/* Crystal Frequency Index (in 1 KHz) */
-enum {
- NFC_HAL_XTAL_INDEX_9600,
- NFC_HAL_XTAL_INDEX_13000,
- NFC_HAL_XTAL_INDEX_16200,
- NFC_HAL_XTAL_INDEX_19200,
- NFC_HAL_XTAL_INDEX_24000,
- NFC_HAL_XTAL_INDEX_26000,
- NFC_HAL_XTAL_INDEX_38400,
- NFC_HAL_XTAL_INDEX_52000,
- NFC_HAL_XTAL_INDEX_37400,
- NFC_HAL_XTAL_INDEX_MAX,
- NFC_HAL_XTAL_INDEX_SPECIAL = 0xFF
-};
-typedef uint8_t tNFC_HAL_XTAL_INDEX;
-
/* Broadcom specific device initialization before sending NCI reset */
typedef struct {
@@ -54,11 +38,6 @@
#define NFC_HAL_DEV_INIT_MAX_XTAL_CFG 5
-typedef struct {
- uint8_t num_xtal_cfg;
- tNFC_HAL_DEV_INIT_XTAL_CFG xtal_cfg[NFC_HAL_DEV_INIT_MAX_XTAL_CFG];
-} tNFC_HAL_DEV_INIT_CFG;
-
/*****************************************************************************
** Patch RAM Constants
*****************************************************************************/
@@ -69,164 +48,8 @@
/*****************************************************************************
** Patch RAM Callback for event notificaton
*****************************************************************************/
-/* Events for tNFC_HAL_PRM_CBACK */
-enum {
- NFC_HAL_PRM_CONTINUE_EVT,
- NFC_HAL_PRM_COMPLETE_EVT,
- NFC_HAL_PRM_ABORT_EVT,
- NFC_HAL_PRM_ABORT_INVALID_PATCH_EVT, /* Patch is invalid (bad version, project
- id, or chip) */
- NFC_HAL_PRM_ABORT_BAD_SIGNATURE_EVT, /* Patch has invalid signature */
- NFC_HAL_PRM_SPD_GET_PATCHFILE_HDR_EVT, /* Secure Patch Download: request for
- patchfile header */
- NFC_HAL_PRM_SPD_GET_NEXT_PATCH, /* Get first command of next patch in
- patchfile */
- NFC_HAL_PRM_ABORT_NO_NVM_EVT /* nfc_hal_prm_nvm_required is TRUE and NVM is
- unavail */
-};
-
-typedef void(tNFC_HAL_PRM_CBACK)(uint8_t event);
typedef uint8_t tNFC_HAL_NCI_EVT; /* MT + Opcode */
-typedef void(tNFC_HAL_NCI_CBACK)(tNFC_HAL_NCI_EVT event, uint16_t data_len,
- uint8_t* p_data);
-
-/*******************************************************************************
-**
-** Function HAL_NfcPreInitDone
-**
-** Description Notify that pre-initialization of NFCC is complete
-**
-** Returns void
-**
-*******************************************************************************/
-void HAL_NfcPreInitDone(tHAL_NFC_STATUS status);
-
-/*******************************************************************************
-**
-** Function HAL_NfcReInit
-**
-** Description This function is called to restart initialization after
-** REG_PU toggled because of failure to detect NVM type or
-** download patchram.
-**
-** Note This function should be called only during the HAL init
-** process
-**
-** Returns HAL_NFC_STATUS_OK if successfully initiated
-** HAL_NFC_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-tHAL_NFC_STATUS HAL_NfcReInit(void);
-
-/*******************************************************************************
-**
-** Function HAL_NfcSetSnoozeMode
-**
-** Description Set snooze mode
-** snooze_mode
-** NFC_HAL_LP_SNOOZE_MODE_NONE - Snooze mode disabled
-** NFC_HAL_LP_SNOOZE_MODE_UART - Snooze mode for UART
-** NFC_HAL_LP_SNOOZE_MODE_SPI_I2C - Snooze mode for SPI/I2C
-**
-** idle_threshold_dh/idle_threshold_nfcc
-** Idle Threshold Host in 100ms unit
-**
-** nfc_wake_active_mode/dh_wake_active_mode
-** NFC_HAL_LP_ACTIVE_LOW - high to low voltage is asserting
-** NFC_HAL_LP_ACTIVE_HIGH - low to high voltage is
-** asserting
-**
-** p_snooze_cback
-** Notify status of operation
-**
-** Returns tHAL_NFC_STATUS
-**
-*******************************************************************************/
-tHAL_NFC_STATUS HAL_NfcSetSnoozeMode(uint8_t snooze_mode,
- uint8_t idle_threshold_dh,
- uint8_t idle_threshold_nfcc,
- uint8_t nfc_wake_active_mode,
- uint8_t dh_wake_active_mode,
- tHAL_NFC_STATUS_CBACK* p_snooze_cback);
-
-/*******************************************************************************
-**
-** Function HAL_NfcPrmDownloadStart
-**
-** Description Initiate patch download
-**
-** Input Params
-** format_type patch format type
-** (NFC_HAL_PRM_FORMAT_BIN,
-** NFC_HAL_PRM_FORMAT_HCD, or
-** NFC_HAL_PRM_FORMAT_NCD)
-**
-** dest_address destination adderess (needed for BIN format
-** only)
-**
-** p_patchram_buf pointer to patchram buffer. If NULL, then
-** app must call HAL_NfcPrmDownloadContinue
-** when NFC_HAL_PRM_CONTINUE_EVT is received,
-** to send the next segment of patchram
-**
-** patchram_len size of p_patchram_buf (if non-NULL)
-**
-** patchram_delay The delay after each patch.
-** If the given value is less than the size of
-** the patchram, the size of patchram is used
-** instead.
-**
-** p_cback callback for download status
-**
-**
-** Returns TRUE if successful, otherwise FALSE
-**
-**
-*******************************************************************************/
-bool HAL_NfcPrmDownloadStart(tNFC_HAL_PRM_FORMAT format_type,
- uint32_t dest_address, uint8_t* p_patchram_buf,
- uint32_t patchram_len, uint32_t patchram_delay,
- tNFC_HAL_PRM_CBACK* p_cback);
-
-/*******************************************************************************
-**
-** Function HAL_NfcPrmDownloadContinue
-**
-** Description Send next segment of patchram to controller. Called when
-** NFC_HAL_PRM_CONTINUE_EVT is received.
-**
-** Only needed if HAL_NfcPrmDownloadStart was called with
-** p_patchram_buf=NULL
-**
-** Input Params p_patch_data pointer to patch data
-** patch_data_len patch data len
-**
-** Returns TRUE if successful, otherwise FALSE
-**
-*******************************************************************************/
-bool HAL_NfcPrmDownloadContinue(uint8_t* p_patch_data, uint16_t patch_data_len);
-
-/*******************************************************************************
-**
-** Function HAL_NfcPrmSetI2cPatch
-**
-** Description Specify patchfile for BCM20791B3 I2C fix. This fix
-** must be downloaded prior to initial patch download for I2C
-** transport
-**
-** Input Params p_i2c_patchfile_buf: pointer to patch for i2c fix
-** i2c_patchfile_len: length of patch
-** prei2c_delay: the delay before downloading main patch
-** if 0 is given, NFC_HAL_PRM_POST_I2C_FIX_DELAY
-** is used instead.
-**
-** Returns Nothing
-**
-**
-*******************************************************************************/
-void HAL_NfcPrmSetI2cPatch(uint8_t* p_i2c_patchfile_buf,
- uint16_t i2c_patchfile_len, uint32_t prei2c_delay);
/*******************************************************************************
**
@@ -251,16 +74,4 @@
*******************************************************************************/
tHAL_NFC_STATUS HAL_NfcPrmSetSpdNciCmdPayloadSize(uint8_t max_payload_size);
-/*******************************************************************************
-**
-** Function HAL_NfcSetMaxRfDataCredits
-**
-** Description This function sets the maximum RF data credit for HAL.
-** If 0, use the value reported from NFCC.
-**
-** Returns none
-**
-*******************************************************************************/
-void HAL_NfcSetMaxRfDataCredits(uint8_t max_credits);
-
#endif /* NFC_HAL_INT_API_H */
diff --git a/src/include/nfc_hal_nv_ci.h b/src/include/nfc_hal_nv_ci.h
index 73d1123..a9ec13d 100644
--- a/src/include/nfc_hal_nv_ci.h
+++ b/src/include/nfc_hal_nv_ci.h
@@ -34,50 +34,6 @@
** Function Declarations
*****************************************************************************/
-/*******************************************************************************
-**
-** Function nfc_hal_nv_ci_write
-**
-** Description This function sends an event to NFAA indicating the phone
-** has written the number of bytes specified in the call-out
-** function, nfa_nv_co_write (), and is ready for more data.
-** This function is used to control the TX data flow.
-** Note: The data buffer is released by the stack aioer
-** calling this function.
-**
-** Parameters status - NFA_NV_CO_OK, NFA_NV_CO_NOSPACE, or NFA_NV_CO_FAIL
-** evt - Used Internally by NFA -> MUST be same value passed
-** in call-out function.
-**
-** Returns void
-**
-*******************************************************************************/
-void nfc_hal_nv_ci_write(tNFC_HAL_NV_CO_STATUS status);
-
-/*******************************************************************************
-**
-** Function nfc_hal_nv_ci_read
-**
-** Description This function sends an event to NCIT indicating the phone
-** has read in the requested amount of data specified in the
-** nfa_nv_co_read () call-out function. It should only be
-** called when the requested number of bytes has been read.
-**
-** Parameters num_bytes_read - number of bytes read into the buffer
-** specified in the read callout-function.
-** status - NFC_HAL_NV_CO_OK if full buffer of data,
-** NFC_HAL_NV_CO_EOF if the end of file has been
-** reached,
-** NFC_HAL_NV_CO_FAIL if an error has occurred.
-** evt - Used Internally by NFA -> MUST be same value passed
-** in call-out function.
-**
-** Returns void
-**
-*******************************************************************************/
-void nfc_hal_nv_ci_read(uint16_t num_bytes_read, tNFC_HAL_NV_CO_STATUS status,
- uint8_t block);
-
#endif /* NFC_HAL_HCI_INCLUDED */
#endif /* NFC_HAL_NV_CI_H */
diff --git a/src/include/nfc_hal_nv_co.h b/src/include/nfc_hal_nv_co.h
index 8497321..7fffb65 100644
--- a/src/include/nfc_hal_nv_co.h
+++ b/src/include/nfc_hal_nv_co.h
@@ -53,48 +53,5 @@
** Common Functions
***************************/
-/*******************************************************************************
-**
-** Function nfc_hal_nv_co_read
-**
-** Description This function is called by NFA to read in data from the
-** previously opened file.
-**
-** Parameters p_buf - buffer to read the data into.
-** nbytes - number of bytes to read into the buffer.
-**
-** Returns void
-**
-** Note: Upon completion of the request, nfa_nv_ci_read () is
-** called with the buffer of data, along with the number
-** of bytes read into the buffer, and a status. The
-** call-in function should only be called when ALL
-** requested bytes have been read, the end of file has
-** been detected, or an error has occurred.
-**
-*******************************************************************************/
-void nfc_hal_nv_co_read(uint8_t* p_buf, uint16_t nbytes, uint8_t block);
-
-/*******************************************************************************
-**
-** Function nfc_hal_nv_co_write
-**
-** Description This function is called by io to send file data to the
-** phone.
-**
-** Parameters p_buf - buffer to read the data from.
-** nbytes - number of bytes to write out to the file.
-**
-** Returns void
-**
-** Note: Upon completion of the request, nfa_nv_ci_write () is
-** called with the file descriptor and the status. The
-** call-in function should only be called when ALL
-** requested bytes have been written, or an error has
-** been detected,
-**
-*******************************************************************************/
-void nfc_hal_nv_co_write(const uint8_t* p_buf, uint16_t nbytes, uint8_t block);
-
#endif /* NFC_HAL_HCI_INCLUDED */
#endif /* NFC_HAL_NV_CO_H */
diff --git a/src/include/nfc_hal_post_reset.h b/src/include/nfc_hal_post_reset.h
index ceb0ca4..cc703a1 100644
--- a/src/include/nfc_hal_post_reset.h
+++ b/src/include/nfc_hal_post_reset.h
@@ -60,13 +60,4 @@
} tNFC_POST_RESET_CB;
extern tNFC_POST_RESET_CB nfc_post_reset_cb;
-/*
-** Post NCI reset handler
-**
-** This function is called to start device pre-initialization after
-** NCI CORE-RESET. When pre-initialization is completed,
-** HAL_NfcPreInitDone() must be called to proceed with stack start up.
-*/
-void nfc_hal_post_reset_init(uint32_t brcm_hw_id, uint8_t nvm_type);
-
#endif /* NFC_HAL_POST_RESET_H */
diff --git a/src/include/nfc_hal_target.h b/src/include/nfc_hal_target.h
index 5fb0ceb..38b2fb3 100644
--- a/src/include/nfc_hal_target.h
+++ b/src/include/nfc_hal_target.h
@@ -93,10 +93,6 @@
#define NFC_HAL_PRE_I2C_PATCH_INCLUDED TRUE
#endif
-/* Mininum payload size for SPD NCI commands (used to validate
- * HAL_NfcPrmSetSpdNciCmdPayloadSize) */
-/* Default is 32, as required by the NCI specifications; however this value may
- * be */
/* over-riden for platforms that have transport packet limitations */
#ifndef NFC_HAL_PRM_MIN_NCI_CMD_PAYLOAD_SIZE
#define NFC_HAL_PRM_MIN_NCI_CMD_PAYLOAD_SIZE (32)
diff --git a/src/include/nfc_types.h b/src/include/nfc_types.h
index e6619ed..08a8a4f 100644
--- a/src/include/nfc_types.h
+++ b/src/include/nfc_types.h
@@ -61,6 +61,8 @@
}
#define UINT8_TO_STREAM(p, u8) \
{ *(p)++ = (uint8_t)(u8); }
+#define INT8_TO_STREAM(p, u8) \
+ { *(p)++ = (int8_t)(u8); }
#define ARRAY8_TO_STREAM(p, a) \
{ \
register int ijk; \
diff --git a/src/nfa/dm/nfa_dm_cfg.cc b/src/nfa/dm/nfa_dm_cfg.cc
index 9e51a6a..b182ee3 100644
--- a/src/nfa/dm/nfa_dm_cfg.cc
+++ b/src/nfa/dm/nfa_dm_cfg.cc
@@ -42,12 +42,6 @@
uint8_t* p_nfa_dm_ce_cfg = (uint8_t*)nfa_dm_ce_cfg;
-/* the SetConfig for optional general NFC stack functions */
-const uint8_t nfa_dm_gen_cfg[] = {
- 3, /* total length */
- /* Instruct NFCC to report RF field generated by remote device (or not) */
- NFC_PMID_RF_FIELD_INFO, 1, 0x01};
-
uint8_t* p_nfa_dm_gen_cfg = NULL;
/* the RF Discovery Frequency for each technology */
@@ -68,13 +62,6 @@
uint8_t nfa_ee_max_ee_cfg = NFA_EE_MAX_EE_SUPPORTED;
-const tNCI_DISCOVER_MAPS nfa_dm_interface_mapping[NFA_DM_NUM_INTERFACE_MAP] = {
- /* Protocols that use Frame Interface do not need to be included in the
- interface mapping */
- {NCI_PROTOCOL_ISO_DEP, NCI_INTERFACE_MODE_POLL_N_LISTEN,
- NCI_INTERFACE_ISO_DEP},
- {NCI_PROTOCOL_NFC_DEP, NCI_INTERFACE_MODE_POLL_N_LISTEN,
- NCI_INTERFACE_NFC_DEP}};
/* set to NULL to use the default mapping set by stack */
tNCI_DISCOVER_MAPS* p_nfa_dm_interface_mapping = NULL;
uint8_t nfa_dm_num_dm_interface_mapping = 0;
diff --git a/src/nfa/ee/nfa_ee_act.cc b/src/nfa/ee/nfa_ee_act.cc
index 9c7463c..4f9e0d0 100644
--- a/src/nfa/ee/nfa_ee_act.cc
+++ b/src/nfa/ee/nfa_ee_act.cc
@@ -1925,184 +1925,6 @@
/*******************************************************************************
**
-** Function nfa_ee_route_add_one_ecb
-**
-** Description Add the routing entries for one NFCEE/DH
-**
-** Returns NFA_STATUS_OK, if ok to continue
-**
-*******************************************************************************/
-tNFA_STATUS nfa_ee_route_add_one_ecb(tNFA_EE_ECB* p_cb, int* p_max_len,
- bool more, uint8_t* ps,
- int* p_cur_offset) {
- uint8_t *p, *pa;
- uint16_t tlv_size;
- uint8_t num_tlv, len;
- int xx;
- int start_offset;
- uint8_t power_cfg = 0;
- uint8_t* pp = ps + *p_cur_offset;
- uint8_t entry_size;
- uint8_t max_tlv;
- uint8_t* p_start;
- uint8_t new_size;
- tNFA_STATUS status = NFA_STATUS_OK;
-
- nfa_ee_check_set_routing(p_cb->size_mask, p_max_len, ps, p_cur_offset);
- max_tlv = (uint8_t)((*p_max_len > NFA_EE_ROUT_MAX_TLV_SIZE)
- ? NFA_EE_ROUT_MAX_TLV_SIZE
- : *p_max_len);
- /* use the first byte of the buffer (ps) to keep the num_tlv */
- num_tlv = *ps;
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "nfa_ee_route_add_one_ecb max_len:%d, max_tlv:%d, cur_offset:%d, "
- "more:%d, num_tlv:%d",
- *p_max_len, max_tlv, *p_cur_offset, more, num_tlv);
- pp = ps + 1 + *p_cur_offset;
- p = pp;
- tlv_size = (uint8_t)*p_cur_offset;
- /* add the Technology based routing */
- for (xx = 0; xx < NFA_EE_NUM_TECH; xx++) {
- power_cfg = 0;
- if (p_cb->tech_switch_on & nfa_ee_tech_mask_list[xx])
- power_cfg |= NCI_ROUTE_PWR_STATE_ON;
- if (p_cb->tech_switch_off & nfa_ee_tech_mask_list[xx])
- power_cfg |= NCI_ROUTE_PWR_STATE_SWITCH_OFF;
- if (p_cb->tech_battery_off & nfa_ee_tech_mask_list[xx])
- power_cfg |= NCI_ROUTE_PWR_STATE_BATT_OFF;
- if (power_cfg) {
- *pp++ = NFC_ROUTE_TAG_TECH;
- *pp++ = 3;
- *pp++ = p_cb->nfcee_id;
- *pp++ = power_cfg;
- *pp++ = nfa_ee_tech_list[xx];
- num_tlv++;
- if (power_cfg != NCI_ROUTE_PWR_STATE_ON)
- nfa_ee_cb.ee_cfged |= NFA_EE_CFGED_OFF_ROUTING;
- }
- }
-
- /* add the Protocol based routing */
- for (xx = 0; xx < NFA_EE_NUM_PROTO; xx++) {
- power_cfg = 0;
- if (p_cb->proto_switch_on & nfa_ee_proto_mask_list[xx])
- power_cfg |= NCI_ROUTE_PWR_STATE_ON;
- if (p_cb->proto_switch_off & nfa_ee_proto_mask_list[xx])
- power_cfg |= NCI_ROUTE_PWR_STATE_SWITCH_OFF;
- if (p_cb->proto_battery_off & nfa_ee_proto_mask_list[xx])
- power_cfg |= NCI_ROUTE_PWR_STATE_BATT_OFF;
- if (power_cfg) {
- *pp++ = NFC_ROUTE_TAG_PROTO;
- *pp++ = 3;
- *pp++ = p_cb->nfcee_id;
- *pp++ = power_cfg;
- *pp++ = nfa_ee_proto_list[xx];
- num_tlv++;
- if (power_cfg != NCI_ROUTE_PWR_STATE_ON)
- nfa_ee_cb.ee_cfged |= NFA_EE_CFGED_OFF_ROUTING;
- }
- }
-
- /* add NFC-DEP routing to HOST */
- if (p_cb->nfcee_id == NFC_DH_ID) {
- *pp++ = NFC_ROUTE_TAG_PROTO;
- *pp++ = 3;
- *pp++ = NFC_DH_ID;
- *pp++ = NCI_ROUTE_PWR_STATE_ON;
- *pp++ = NFC_PROTOCOL_NFC_DEP;
- num_tlv++;
- }
-
- /* update the num_tlv and current offset */
- entry_size = (uint8_t)(pp - p);
- *p_cur_offset += entry_size;
- *ps = num_tlv;
- /* add the AID routing */
- if (p_cb->aid_entries) {
- start_offset = 0;
- for (xx = 0; xx < p_cb->aid_entries; xx++) {
- /* rememebr the beginning of this AID routing entry, just in case we need
- * to put it in next command */
- p_start = pp;
- /* add one AID entry */
- if (p_cb->aid_rt_info[xx] & NFA_EE_AE_ROUTE) {
- num_tlv++;
- pa = &p_cb->aid_cfg[start_offset];
- pa++; /* EMV tag */
- len = *pa++; /* aid_len */
- *pp++ = NFC_ROUTE_TAG_AID;
- *pp++ = len + 2;
- *pp++ = p_cb->nfcee_id;
- *pp++ = p_cb->aid_pwr_cfg[xx];
- /* copy the AID */
- memcpy(pp, pa, len);
- pp += len;
- }
- start_offset += p_cb->aid_len[xx];
- new_size = (uint8_t)(pp - p_start);
- nfa_ee_check_set_routing(new_size, p_max_len, ps, p_cur_offset);
- if (*ps == 0) {
- /* just sent routing command, update local */
- *ps = 1;
- num_tlv = *ps;
- *p_cur_offset = new_size;
- pp = ps + 1;
- p = pp;
- tlv_size = (uint8_t)*p_cur_offset;
- max_tlv = (uint8_t)((*p_max_len > NFA_EE_ROUT_MAX_TLV_SIZE)
- ? NFA_EE_ROUT_MAX_TLV_SIZE
- : *p_max_len);
- memcpy(p, p_start, new_size);
- pp += new_size;
- } else {
- /* add the new entry */
- *ps = num_tlv;
- *p_cur_offset += new_size;
- }
- }
- }
-
- tlv_size = nfa_ee_total_lmrt_size();
- if (tlv_size) {
- nfa_ee_cb.ee_cfged |= nfa_ee_ecb_to_mask(p_cb);
- }
- if (p_cb->ecb_flags & NFA_EE_ECB_FLAGS_ROUTING) {
- nfa_ee_cb.ee_cfg_sts |= NFA_EE_STS_CHANGED_ROUTING;
- }
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "ee_cfg_sts:0x%02x lmrt_size:%d", nfa_ee_cb.ee_cfg_sts, tlv_size);
-
- if (more == false) {
- /* last entry. update routing table now */
- if (nfa_ee_cb.ee_cfg_sts & NFA_EE_STS_CHANGED_ROUTING) {
- if (tlv_size) {
- nfa_ee_cb.ee_cfg_sts |= NFA_EE_STS_PREV_ROUTING;
- } else {
- nfa_ee_cb.ee_cfg_sts &= ~NFA_EE_STS_PREV_ROUTING;
- }
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "nfa_ee_route_add_one_ecb: set routing num_tlv:%d tlv_size:%d",
- num_tlv, tlv_size);
- if (NFC_SetRouting(more, num_tlv, (uint8_t)(*p_cur_offset), ps + 1) ==
- NFA_STATUS_OK) {
- nfa_ee_cb.wait_rsp++;
- }
- } else if (nfa_ee_cb.ee_cfg_sts & NFA_EE_STS_PREV_ROUTING) {
- if (tlv_size == 0) {
- nfa_ee_cb.ee_cfg_sts &= ~NFA_EE_STS_PREV_ROUTING;
- /* indicated routing is configured to NFCC */
- nfa_ee_cb.ee_cfg_sts |= NFA_EE_STS_CHANGED_ROUTING;
- if (NFC_SetRouting(more, 0, 0, ps + 1) == NFA_STATUS_OK) {
- nfa_ee_cb.wait_rsp++;
- }
- }
- }
- }
-
- return status;
-}
-/*******************************************************************************
-**
** Function nfa_ee_route_add_one_ecb_order
**
** Description Add the routing entries for NFCEE/DH in order defined
diff --git a/src/nfa/ee/nfa_ee_main.cc b/src/nfa/ee/nfa_ee_main.cc
index 646fd63..d47d986 100644
--- a/src/nfa/ee/nfa_ee_main.cc
+++ b/src/nfa/ee/nfa_ee_main.cc
@@ -26,7 +26,6 @@
#include "nfa_dm_int.h"
#include "nfa_ee_int.h"
-extern void nfa_ee_vs_cback(tNFC_VS_EVT event, NFC_HDR* p_data);
/*****************************************************************************
** Global Variables
*****************************************************************************/
diff --git a/src/nfa/hci/nfa_hci_api.cc b/src/nfa/hci/nfa_hci_api.cc
index 1024eb2..10e4b0e 100644
--- a/src/nfa/hci/nfa_hci_api.cc
+++ b/src/nfa/hci/nfa_hci_api.cc
@@ -503,67 +503,6 @@
/*******************************************************************************
**
-** Function NFA_HciSetRegistry
-**
-** Description This function requests a peer host to set the desired
-** registry field value for the gate that the pipe is on.
-**
-** When the peer host responds,the app is notified with
-** NFA_HCI_SET_REG_RSP_EVT or
-** if an error occurs in sending the command the app will be
-** notified by NFA_HCI_CMD_SENT_EVT
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_HciSetRegistry(tNFA_HANDLE hci_handle, uint8_t pipe,
- uint8_t reg_inx, uint8_t data_size,
- uint8_t* p_data) {
- tNFA_HCI_API_SET_REGISTRY* p_msg;
-
- if ((NFA_HANDLE_GROUP_MASK & hci_handle) != NFA_HANDLE_GROUP_HCI) {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("Invalid hci_handle:0x%04x", hci_handle);
- return (NFA_STATUS_FAILED);
- }
-
- if (pipe < NFA_HCI_FIRST_DYNAMIC_PIPE) {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("Invalid Pipe:0x%02x", pipe);
- return (NFA_STATUS_FAILED);
- }
-
- if ((data_size == 0) || (p_data == NULL) ||
- (data_size > NFA_MAX_HCI_CMD_LEN)) {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("Invalid data size:0x%02x", data_size);
- return (NFA_STATUS_FAILED);
- }
-
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("hci_handle:0x%04x Pipe: 0x%02x", hci_handle, pipe);
-
- /* Request HCI to get list of gates supported by the specified host */
- if ((nfa_hci_cb.hci_state != NFA_HCI_STATE_DISABLED) &&
- ((p_msg = (tNFA_HCI_API_SET_REGISTRY*)GKI_getbuf(
- sizeof(tNFA_HCI_API_SET_REGISTRY))) != NULL)) {
- p_msg->hdr.event = NFA_HCI_API_SET_REGISTRY_EVT;
- p_msg->hci_handle = hci_handle;
- p_msg->pipe = pipe;
- p_msg->reg_inx = reg_inx;
- p_msg->size = data_size;
-
- memcpy(p_msg->data, p_data, data_size);
- nfa_sys_sendmsg(p_msg);
- return (NFA_STATUS_OK);
- }
-
- return (NFA_STATUS_FAILED);
-}
-
-/*******************************************************************************
-**
** Function NFA_HciSendCommand
**
** Description This function is called to send a command on a pipe created
@@ -625,65 +564,6 @@
/*******************************************************************************
**
-** Function NFA_HciSendResponse
-**
-** Description This function is called to send a response on a pipe created
-** by the application.
-** The app will be notified by NFA_HCI_RSP_SENT_EVT if an error
-** occurs.
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_HciSendResponse(tNFA_HANDLE hci_handle, uint8_t pipe,
- uint8_t response, uint8_t data_size,
- uint8_t* p_data) {
- tNFA_HCI_API_SEND_RSP_EVT* p_msg;
-
- if ((NFA_HANDLE_GROUP_MASK & hci_handle) != NFA_HANDLE_GROUP_HCI) {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("Invalid hci_handle:0x%04x", hci_handle);
- return (NFA_STATUS_FAILED);
- }
-
- if (pipe < NFA_HCI_FIRST_DYNAMIC_PIPE) {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("Invalid Pipe:0x%02x", pipe);
- return (NFA_STATUS_FAILED);
- }
-
- if ((data_size && (p_data == NULL)) || (data_size > NFA_MAX_HCI_RSP_LEN)) {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("Invalid data size:0x%02x", data_size);
- return (NFA_STATUS_FAILED);
- }
-
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "hci_handle:0x%04x Pipe: 0x%02x Response: "
- "0x%02x",
- hci_handle, pipe, response);
-
- /* Request HCI to get list of gates supported by the specified host */
- if ((nfa_hci_cb.hci_state != NFA_HCI_STATE_DISABLED) &&
- ((p_msg = (tNFA_HCI_API_SEND_RSP_EVT*)GKI_getbuf(
- sizeof(tNFA_HCI_API_SEND_RSP_EVT))) != NULL)) {
- p_msg->hdr.event = NFA_HCI_API_SEND_RSP_EVT;
- p_msg->hci_handle = hci_handle;
- p_msg->response = response;
- p_msg->size = data_size;
-
- if (data_size) memcpy(p_msg->data, p_data, data_size);
-
- nfa_sys_sendmsg(p_msg);
- return (NFA_STATUS_OK);
- }
-
- return (NFA_STATUS_FAILED);
-}
-
-/*******************************************************************************
-**
** Function NFA_HciSendEvent
**
** Description This function is called to send any event on a pipe created
diff --git a/src/nfa/include/nfa_api.h b/src/nfa/include/nfa_api.h
index f11898a..9791326 100644
--- a/src/nfa/include/nfa_api.h
+++ b/src/nfa/include/nfa_api.h
@@ -41,64 +41,25 @@
#define NFA_MAX_AID_LEN NFC_MAX_AID_LEN
#define NFA_MIN_AID_LEN 5 /* per NCI specification */
-/* NFA API return status codes */
/* Command succeeded */
#define NFA_STATUS_OK NCI_STATUS_OK
/* Command is rejected. */
#define NFA_STATUS_REJECTED NCI_STATUS_REJECTED
-/* Message is corrupted */
-#define NFA_STATUS_MSG_CORRUPTED NCI_STATUS_MESSAGE_CORRUPTED
/* buffer full */
#define NFA_STATUS_BUFFER_FULL NCI_STATUS_BUFFER_FULL
/* failed */
#define NFA_STATUS_FAILED NCI_STATUS_FAILED
-/* not initialized */
-#define NFA_STATUS_NOT_INITIALIZED NCI_STATUS_NOT_INITIALIZED
-/* Syntax error */
-#define NFA_STATUS_SYNTAX_ERROR NCI_STATUS_SYNTAX_ERROR
/* Semantic error */
#define NFA_STATUS_SEMANTIC_ERROR NCI_STATUS_SEMANTIC_ERROR
/* Unknown NCI Group ID */
#define NFA_STATUS_UNKNOWN_GID NCI_STATUS_UNKNOWN_GID
-/* Unknown NCI Opcode */
-#define NFA_STATUS_UNKNOWN_OID NCI_STATUS_UNKNOWN_OID
/* Invalid Parameter */
#define NFA_STATUS_INVALID_PARAM NCI_STATUS_INVALID_PARAM
-/* Message size too big */
-#define NFA_STATUS_MSG_SIZE_TOO_BIG NCI_STATUS_MSG_SIZE_TOO_BIG
/* Already started */
#define NFA_STATUS_ALREADY_STARTED NCI_STATUS_ALREADY_STARTED
-/* Activation Failed */
-#define NFA_STATUS_ACTIVATION_FAILED NCI_STATUS_ACTIVATION_FAILED
-/* Tear Down Error */
-#define NFA_STATUS_TEAR_DOWN NCI_STATUS_TEAR_DOWN
-/* RF transmission error*/
-#define NFA_STATUS_RF_TRANSMISSION_ERR NCI_STATUS_RF_TRANSMISSION_ERR
-/* RF protocol error */
-#define NFA_STATUS_RF_PROTOCOL_ERR NCI_STATUS_RF_PROTOCOL_ERR
/* RF Timeout */
#define NFA_STATUS_TIMEOUT NCI_STATUS_TIMEOUT
-/* EE Intf activate err */
-#define NFA_STATUS_EE_INTF_ACTIVE_FAIL NCI_STATUS_EE_INTF_ACTIVE_FAIL
-/* EE transmission error*/
-#define NFA_STATUS_EE_TRANSMISSION_ERR NCI_STATUS_EE_TRANSMISSION_ERR
-/* EE protocol error */
-#define NFA_STATUS_EE_PROTOCOL_ERR NCI_STATUS_EE_PROTOCOL_ERR
-/* EE Timeout */
-#define NFA_STATUS_EE_TIMEOUT NCI_STATUS_EE_TIMEOUT
-/* Command started successfully */
-#define NFA_STATUS_CMD_STARTED NFC_STATUS_CMD_STARTED
-/* NFCC Timeout in responding to an NCI command */
-#define NFA_STATUS_HW_TIMEOUT NFC_STATUS_HW_TIMEOUT
-/* More NFA_CE_GET_ROUTING_REVT to follow */
-#define NFA_STATUS_CONTINUE NFC_STATUS_CONTINUE
-/* API is called to perform illegal function */
-#define NFA_STATUS_REFUSED NFC_STATUS_REFUSED
-/* Wrong format of R-APDU, CC file or NDEF file */
-#define NFA_STATUS_BAD_RESP NFC_STATUS_BAD_RESP
-/* 7816 Status Word is not command complete(0x9000) */
-#define NFA_STATUS_CMD_NOT_CMPLTD NFC_STATUS_CMD_NOT_CMPLTD
/* Out of GKI buffers */
#define NFA_STATUS_NO_BUFFERS NFC_STATUS_NO_BUFFERS
/* Protocol mismatch between API and activated one */
@@ -128,12 +89,9 @@
#define NFA_HANDLE_GROUP_EE 0x0400
/* P2P handles */
#define NFA_HANDLE_GROUP_P2P 0x0500
-/* SNEP handles */
-#define NFA_HANDLE_GROUP_SNEP 0x0700
/* HCI handles */
#define NFA_HANDLE_GROUP_HCI 0x0800
/* Local NDEF message handle */
-#define NFA_HANDLE_GROUP_LOCAL_NDEF 0x0900
#define NFA_HANDLE_GROUP_MASK 0xFF00
#define NFA_HANDLE_MASK 0x00FF
@@ -155,7 +113,6 @@
/* NFC Technology F active mode */
#define NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80
/* All supported technologies */
-#define NFA_TECHNOLOGY_MASK_ALL 0xFF
typedef uint8_t tNFA_TECHNOLOGY_MASK;
/* Definitions for NFC protocol for RW, CE and P2P APIs */
@@ -171,11 +128,7 @@
#define NFA_PROTOCOL_NFC_DEP NFC_PROTOCOL_NFC_DEP
/* NFC_PROTOCOL_T5T in NCI2.0 and NFC_PROTOCOL_ISO15693 proprietary in NCI1.0*/
#define NFA_PROTOCOL_T5T NFC_PROTOCOL_T5T
-#define NFA_PROTOCOL_B_PRIME NFC_PROTOCOL_B_PRIME
-#define NFA_PROTOCOL_KOVIO NFC_PROTOCOL_KOVIO
-#define NFA_PROTOCOL_MIFARE NFC_PROTOCOL_MIFARE
#define NFA_PROTOCOL_INVALID 0xFF
-#define NFA_MAX_NUM_PROTOCOLS 8
typedef uint8_t tNFA_NFC_PROTOCOL;
/* Definitions for tNFA_PROTOCOL_MASK */
@@ -211,10 +164,7 @@
/* UID len for T1T cmds */
#define NFA_T1T_CMD_UID_LEN T1T_CMD_UID_LEN
/* T2T UID length */
-#define NFA_T2T_UID_LEN T2T_UID_LEN
-/* Tag is read only */
-#define NFA_RW_NDEF_FL_READ_ONLY RW_NDEF_FL_READ_ONLY
/* Tag formated for NDEF */
#define NFA_RW_NDEF_FL_FORMATED RW_NDEF_FL_FORMATED
/* NDEF supported by the tag */
@@ -223,12 +173,6 @@
#define NFA_RW_NDEF_FL_UNKNOWN RW_NDEF_FL_UNKNOWN
/* Tag supports format operation */
#define NFA_RW_NDEF_FL_FORMATABLE RW_NDEF_FL_FORMATABLE
-/* Tag can be soft locked */
-#define NFA_RW_NDEF_FL_SOFT_LOCKABLE RW_NDEF_FL_SOFT_LOCKABLE
-/* Tag can be hard locked */
-#define NFA_RW_NDEF_FL_HARD_LOCKABLE RW_NDEF_FL_HARD_LOCKABLE
-/* Tag is one time programmable */
-#define NFA_RW_NDEF_FL_OTP RW_NDEF_FL_OTP
typedef uint8_t tNFA_RW_NDEF_FLAG;
@@ -265,10 +209,6 @@
#define NFA_SCREEN_STATE_MASK 0x0F
/* CONN_DISCOVER_PARAM */
-#define NFA_LISTEN_DH_NFCEE_ENABLE_MASK NCI_LISTEN_DH_NFCEE_ENABLE_MASK
-#define NFA_LISTEN_DH_NFCEE_DISABLE_MASK NCI_LISTEN_DH_NFCEE_DISABLE_MASK
-#define NFA_POLLING_DH_DISABLE_MASK NCI_POLLING_DH_DISABLE_MASK
-#define NFA_POLLING_DH_ENABLE_MASK NCI_POLLING_DH_ENABLE_MASK
#define NFA_DM_PWR_MODE_FULL 0x04
#define NFA_DM_PWR_MODE_OFF_SLEEP 0x00
@@ -314,13 +254,8 @@
typedef enum {
NFA_DTA_DEFAULT_MODE = 0x00000001,
NFA_DTA_LLCP_MODE = 0x00000002,
- NFA_DTA_SNEP_MODE = 0x00000003,
NFA_DTA_HCEF_MODE = 0x00000004,
NFA_DTA_CR8 = 0x00000080,
- NFA_DTA_CR9 = 0x00000090,
- NFA_DTA_CR10 = 0x000000A0,
- NFA_DTA_CR11 = 0x000000B0,
- NFA_DTA_CR12 = 0x000000C0,
} tNFA_eDtaModes;
/* NFA Connection Callback Events */
@@ -562,21 +497,6 @@
/* Union of all connection callback structures */
typedef union {
tNFA_STATUS status; /* NFA_POLL_ENABLED_EVT */
- /* NFA_POLL_DISABLED_EVT */
- /* NFA_CE_UICC_LISTEN_CONFIGURED_EVT */
- /* NFA_EXCLUSIVE_RF_CONTROL_STARTED_EVT */
- /* NFA_EXCLUSIVE_RF_CONTROL_STOPPED_EVT */
- /* NFA_SELECT_RESULT_EVT */
- /* NFA_DEACTIVATE_FAIL_EVT */
- /* NFA_CE_NDEF_WRITE_START_EVT */
- /* NFA_SELECT_CPLT_EVT */
- /* NFA_READ_CPLT_EVT */
- /* NFA_WRITE_CPLT_EVT */
- /* NFA_PRESENCE_CHECK_EVT */
- /* NFA_FORMAT_CPLT_EVT */
- /* NFA_SET_TAG_RO_EVT */
- /* NFA_UPDATE_RF_PARAM_RESULT_EVT */
- /* NFA_RW_INTF_ERROR_EVT */
tNFA_DISC_RESULT disc_result; /* NFA_DISC_RESULT_EVT */
tNFA_ACTIVATED activated; /* NFA_ACTIVATED_EVT */
tNFA_DEACTIVATED deactivated; /* NFA_DEACTIVATED_EVT */
diff --git a/src/nfa/include/nfa_ce_int.h b/src/nfa/include/nfa_ce_int.h
index ef41242..24025ad 100644
--- a/src/nfa/include/nfa_ce_int.h
+++ b/src/nfa/include/nfa_ce_int.h
@@ -34,9 +34,6 @@
** Constants and data types
*****************************************************************************/
-/* ce status callback */
-typedef void tNFA_CE_STATUS_CBACK(tNFA_STATUS status);
-
/* CE events */
enum {
/* device manager local device API events */
@@ -45,18 +42,12 @@
NFA_CE_API_DEREG_LISTEN_EVT,
NFA_CE_API_CFG_ISODEP_TECH_EVT,
NFA_CE_ACTIVATE_NTF_EVT,
- NFA_CE_DEACTIVATE_NTF_EVT,
+ NFA_CE_DEACTIVATE_NTF_EVT
- NFA_CE_MAX_EVT
};
/* Listen registration types */
-enum {
- NFA_CE_REG_TYPE_NDEF,
- NFA_CE_REG_TYPE_ISO_DEP,
- NFA_CE_REG_TYPE_FELICA,
- NFA_CE_REG_TYPE_UICC
-};
+enum { NFA_CE_REG_TYPE_ISO_DEP, NFA_CE_REG_TYPE_FELICA, NFA_CE_REG_TYPE_UICC };
typedef uint8_t tNFA_CE_REG_TYPE;
/* data type for NFA_CE_API_CFG_LOCAL_TAG_EVT */
diff --git a/src/nfa/include/nfa_dm_int.h b/src/nfa/include/nfa_dm_int.h
index f17f380..a7f61d8 100644
--- a/src/nfa/include/nfa_dm_int.h
+++ b/src/nfa/include/nfa_dm_int.h
@@ -594,7 +594,6 @@
#define nfa_snep_init(is_dta_mode)
#endif
-void nfa_dta_init(void);
#if (NFC_NFCEE_INCLUDED == TRUE)
void nfa_ee_init(void);
void nfa_hci_init(void);
@@ -627,12 +626,12 @@
bool nfa_dm_act_power_off_sleep(tNFA_DM_MSG* p_data);
bool nfa_dm_ndef_reg_hdlr(tNFA_DM_MSG* p_data);
bool nfa_dm_ndef_dereg_hdlr(tNFA_DM_MSG* p_data);
-bool nfa_dm_tout(tNFA_DM_MSG* p_data);
+
bool nfa_dm_act_reg_vsc(tNFA_DM_MSG* p_data);
bool nfa_dm_act_send_vsc(tNFA_DM_MSG* p_data);
uint16_t nfa_dm_act_get_rf_disc_duration();
bool nfa_dm_act_disable_timeout(tNFA_DM_MSG* p_data);
-bool nfa_dm_act_nfc_cback_data(tNFA_DM_MSG* p_data);
+
bool nfa_dm_set_power_sub_state(tNFA_DM_MSG* p_data);
void nfa_dm_proc_nfcc_power_mode(uint8_t nfcc_power_mode);
diff --git a/src/nfa/include/nfa_dta_int.h b/src/nfa/include/nfa_dta_int.h
index c49336b..c844c07 100644
--- a/src/nfa/include/nfa_dta_int.h
+++ b/src/nfa/include/nfa_dta_int.h
@@ -67,12 +67,7 @@
enum {
/* device manager local device API events */
NFA_DTA_API_ENABLE_EVT = NFA_SYS_EVT_START(NFA_ID_DTA),
- NFA_DTA_API_DISABLE_EVT,
- NFA_DTA_API_CONFIG_EVT,
NFA_DTA_API_START_EVT,
- NFA_DTA_API_STOP_EVT,
- NFA_DTA_ACTIVATE_EVT,
- NFA_DTA_DEACTIVATE_EVT,
NFA_DTA_DATA_CBACK_EVT,
NFA_DTA_MAX_EVT
@@ -116,16 +111,8 @@
tNFC_CONN data;
} tNFA_DTA_NFCDEP_DATA;
-enum { NFA_DTA_LLCP_CONNECT_CO_ECHO_OUT, NFA_DTA_LLCP_DISCONNECT_CO_ECHO_OUT };
typedef uint8_t tNFA_DTA_LLCP_EVT;
-enum {
- NFA_DTA_RW_DATA,
- NFA_DTA_CE_DATA,
- NFA_DTA_NFCDEP_DATA,
- NFA_DTA_LLCP_DATA
-};
-
typedef uint8_t tNFA_DTA_DATA_TYPE;
typedef struct {
@@ -148,36 +135,16 @@
tNFA_DTA_DATA_CBACK data_cback;
} tNFA_DTA_MSG;
-/* DTA states */
-enum {
- NFA_DTA_ST_IDLE,
- NFA_DTA_ST_DISCOVER, /* Polling/Listening */
- NFA_DTA_ST_ACTIVATED /* Activated, listen mode */
-};
typedef uint8_t tNFA_DTA_STATE;
typedef uint8_t tNFA_DTA_SUBSTATE;
-/* DTA discovery states */
-enum {
- NFA_DTA_DISC_STATE_IDLE,
- NFA_DTA_DISC_STATE_DISCOVERY,
- NFA_DTA_DISC_STATE_POLL_ACTIVE,
- NFA_DTA_DISC_STATE_W4_ALL_DISCOVERIES,
- NFA_DTA_DISC_STATE_W4_HOST_SELECT,
- NFA_DTA_DISC_STATE_LISTEN_ACTIVE,
- NFA_DTA_DISC_STATE_LISTEN_SLEEP,
- NFA_DTA_DISC_STATE_MAX
-};
-
/*****************************************************************************
* DTA control block definitions
*****************************************************************************/
/* NDEF buffer definitions */
enum {
- NFA_DTA_BUF_READ, /* Buffer for RW Read requests */
- NFA_DTA_BUF_WRITE, /* Buffer for RW Write requests */
NFA_DTA_BUF_MAX
};
@@ -188,13 +155,6 @@
uint32_t offset; /* current read/write offset */
} tNFA_DTA_BUF_CB;
-/* T4T listen mode test application */
-enum {
- NFA_DTA_T4T_CE_APP_NONE, /* Not selected */
- NFA_DTA_T4T_CE_APP_LOOPBACK, /* loopback test applicaiton */
- NFA_DTA_T4T_CE_APP_PROP /* propretary test application */
-};
-
/* DTA test step command */
typedef tNFC_STATUS (*tNFA_DTA_CMD_FCN)(void*);
@@ -306,75 +266,6 @@
/*****************************************************************************
* DTA internal funciton protoytpes
*****************************************************************************/
-/* Internal function prototypes */
-void nfa_dta_deactivate(uint8_t deactivate_type);
-void nfa_dta_shutdown(void);
-void nfa_dta_discover_start(void);
-
-/* nfa_sys handler for DTA */
-bool nfa_dta_evt_hdlr(NFC_HDR* p_msg);
-void nfa_dta_sys_disable(void);
-
-/* State machine action functions */
-bool nfa_dta_enable(tNFA_DTA_MSG* p_data);
-bool nfa_dta_disable(tNFA_DTA_MSG* p_data);
-bool nfa_dta_config(tNFA_DTA_MSG* p_data);
-bool nfa_dta_start(tNFA_DTA_MSG* p_data);
-bool nfa_dta_handle_deact(tNFA_DTA_MSG* p_data);
-bool nfa_dta_stop(tNFA_DTA_MSG* p_data);
-bool nfa_dta_run_test(tNFA_DTA_MSG* p_data);
-bool nfa_dta_proc_data(tNFA_DTA_MSG* p_msg_data);
-
-/* Utility functions */
-void nfa_dta_test_set_state(tNFA_DTA_STATE state);
-void nfa_dta_test_set_substate(tNFA_DTA_SUBSTATE substate);
-void nfa_dta_free_ndef_buf(uint8_t ndef_idx);
-uint8_t* nfa_dta_realloc_buf(uint8_t ndef_idx, uint32_t size);
-void nfa_dta_t3t_nfcid_rand(uint8_t nfcid2[NCI_RF_F_UID_LEN]);
-
-/* Test function entry points (in nfa_dta_XXX.c) */
-void nfa_dta_nfcdep_poll_test_start(void);
-void nfa_dta_nfcdep_proc_data(tNFC_CONN_EVT event, tNFC_CONN* p_data);
-void nfa_dta_t1t_poll_test_start(void);
-void nfa_dta_t2t_poll_test_start(void);
-void nfa_dta_t3t_poll_test_start(void);
-void nfa_dta_t4t_poll_test_start(void);
-
-void nfa_dta_nfcdep_listen_test_start(void);
-void nfa_dta_t3t_listen_test_start(void);
-void nfa_dta_t4t_listen_test_start(void);
-
-void nfa_dta_t1t_rw_cback(uint8_t event, tRW_DATA* p_data);
-void nfa_dta_t2t_rw_cback(uint8_t event, tRW_DATA* p_data);
-void nfa_dta_t3t_rw_cback(uint8_t event, tRW_DATA* p_data);
-void nfa_dta_t4t_rw_cback(uint8_t event, tRW_DATA* p_data);
-
-void nfa_dta_t3t_ce_cback(uint8_t event, tCE_DATA* p_data);
-void nfa_dta_t4t_ce_cback(uint8_t event, tCE_DATA* p_data);
-
-void nfa_dta_ce_cback(uint8_t event, tCE_DATA* p_ce_data);
-
-void nfa_dta_t4t_register_apps(void);
-void nfa_dta_t4t_deregister_apps(void);
-
-void nfa_dta_llcp_init(void);
-void nfa_dta_llcp_set_gen_bytes(void);
-void nfa_dta_llcp_clear_gen_bytes(void);
-void nfa_dta_llcp_register_pattern_number_service(void);
-void nfa_dta_llcp_deregister_pattern_number_service(void);
-void nfa_dta_llcp_register_echo(void);
-void nfa_dta_llcp_deregister_echo(void);
-void nfa_dta_llcp_activate_link(void);
-void nfa_dta_llcp_connect_co_echo_out(void);
-void nfa_dta_llcp_disconnect_co_echo_out(void);
-
-void nfa_dta_snep_init(void);
-void nfa_dta_snep_register(void);
-void nfa_dta_snep_deregister(void);
-
-void nfa_dta_emvco_pcd_config_nfcc(bool enable);
-void nfa_dta_emvco_pcd_start(void);
-void nfa_dta_emvco_pcd_cback(uint8_t event, tRW_DATA* p_data);
extern uint8_t* p_nfa_dta_brcm_start_up_cfg;
extern uint8_t nfa_dta_brcm_start_up_cfg_len;
diff --git a/src/nfa/include/nfa_ee_api.h b/src/nfa/include/nfa_ee_api.h
index 6b344f9..342fe29 100644
--- a/src/nfa/include/nfa_ee_api.h
+++ b/src/nfa/include/nfa_ee_api.h
@@ -57,7 +57,6 @@
NFA_EE_NEW_EE_EVT, /* A new NFCEE is discovered */
NFA_EE_ACTION_EVT, /* An action happened in NFCEE */
NFA_EE_DISCOVER_REQ_EVT, /* NFCEE Discover Request Notification */
- NFA_EE_ROUT_ERR_EVT, /* Error - exceed NFCC CE Routing size */
NFA_EE_NO_MEM_ERR_EVT, /* Error - out of GKI buffers */
NFA_EE_NO_CB_ERR_EVT /* Error - Can not find control block or wrong state */
};
diff --git a/src/nfa/include/nfa_ee_int.h b/src/nfa/include/nfa_ee_int.h
index 7f7fb5b..5730ad7 100644
--- a/src/nfa/include/nfa_ee_int.h
+++ b/src/nfa/include/nfa_ee_int.h
@@ -97,8 +97,7 @@
NFA_EE_CONN_ST_NONE, /* not connected */
NFA_EE_CONN_ST_WAIT, /* connection is initiated; waiting for ack */
NFA_EE_CONN_ST_CONN, /* connected; can send/receive data */
- NFA_EE_CONN_ST_DISC, /* disconnecting; waiting for ack */
- NFA_EE_CONN_ST_MAX
+ NFA_EE_CONN_ST_DISC /* disconnecting; waiting for ack */
};
typedef uint8_t tNFA_EE_CONN_ST;
@@ -276,11 +275,6 @@
uint8_t nfcee_id;
} tNFA_EE_API_DISCONNECT;
-typedef struct {
- NFC_HDR hdr;
- tNFC_STATUS status; /* The event status. */
-} tNFA_EE_MSG_STATUS;
-
/* common data type for internal events with nfa_ee_use_cfg_cb[] as TRUE */
typedef struct {
NFC_HDR hdr;
@@ -288,12 +282,6 @@
uint8_t nfcee_id;
} tNFA_EE_CFG_HDR;
-/* data type for tNFC_RESPONSE_EVT */
-typedef struct {
- NFC_HDR hdr;
- void* p_data;
-} tNFA_EE_NCI_RESPONSE;
-
/* data type for NFA_EE_NCI_DISC_RSP_EVT */
typedef struct {
NFC_HDR hdr;
@@ -492,7 +480,7 @@
tNFA_EE_CBACK_DATA* p_data);
tNFA_EE_ECB* nfa_ee_find_aid_offset(uint8_t aid_len, uint8_t* p_aid,
int* p_offset, int* p_entry);
-void nfa_ee_remove_labels(void);
+
int nfa_ee_find_total_aid_len(tNFA_EE_ECB* p_cb, int start_entry);
void nfa_ee_start_timer(void);
void nfa_ee_reg_cback_enable_done(tNFA_EE_ENABLE_DONE_CBACK* p_cback);
diff --git a/src/nfa/include/nfa_hci_api.h b/src/nfa/include/nfa_hci_api.h
index d432e40..b7bfbfb 100644
--- a/src/nfa/include/nfa_hci_api.h
+++ b/src/nfa/include/nfa_hci_api.h
@@ -465,26 +465,6 @@
/*******************************************************************************
**
-** Function NFA_HciSetRegistry
-**
-** Description This function requests a peer host to set the desired
-** registry field value for the gate that the pipe is on.
-**
-** When the peer host responds,the app is notified with
-** NFA_HCI_SET_REG_RSP_EVT or
-** if an error occurs in sending the command the app will be
-** notified by NFA_HCI_CMD_SENT_EVT
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_HciSetRegistry(tNFA_HANDLE hci_handle, uint8_t pipe,
- uint8_t reg_inx, uint8_t data_size,
- uint8_t* p_data);
-
-/*******************************************************************************
-**
** Function NFA_HciSendCommand
**
** Description This function is called to send a command on a pipe created
@@ -504,23 +484,6 @@
/*******************************************************************************
**
-** Function NFA_HciSendResponse
-**
-** Description This function is called to send a response on a pipe created
-** by the application.
-** The app will be notified by NFA_HCI_RSP_SENT_EVT if an error
-** occurs.
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_HciSendResponse(tNFA_HANDLE hci_handle, uint8_t pipe,
- uint8_t response, uint8_t data_size,
- uint8_t* p_data);
-
-/*******************************************************************************
-**
** Function NFA_HciSendEvent
**
** Description This function is called to send any event on a pipe created
diff --git a/src/nfa/include/nfa_hci_int.h b/src/nfa/include/nfa_hci_int.h
index bfd4c7c..c1733d5 100644
--- a/src/nfa/include/nfa_hci_int.h
+++ b/src/nfa/include/nfa_hci_int.h
@@ -113,8 +113,6 @@
#define NFA_HCI_FIRST_API_EVENT NFA_HCI_API_REGISTER_APP_EVT
#define NFA_HCI_LAST_API_EVENT NFA_HCI_API_SEND_EVENT_EVT
-typedef uint16_t tNFA_HCI_INT_EVT;
-
/* Internal event structures.
**
** Note, every internal structure starts with a NFC_HDR and an app handle
@@ -478,8 +476,6 @@
extern tNFA_HANDLE nfa_hciu_get_pipe_owner(uint8_t pipe_id);
extern uint8_t nfa_hciu_count_open_pipes_on_gate(tNFA_HCI_DYN_GATE* p_gate);
extern uint8_t nfa_hciu_count_pipes_on_gate(tNFA_HCI_DYN_GATE* p_gate);
-extern tNFA_STATUS nfa_hciu_asmbl_dyn_pipe_pkt(uint8_t* p_data,
- uint8_t data_len);
extern tNFA_HCI_RESPONSE nfa_hciu_add_pipe_to_gate(uint8_t pipe,
uint8_t local_gate,
diff --git a/src/nfa/include/nfa_nv_ci.h b/src/nfa/include/nfa_nv_ci.h
index 59ff8e6..adcf085 100644
--- a/src/nfa/include/nfa_nv_ci.h
+++ b/src/nfa/include/nfa_nv_ci.h
@@ -30,21 +30,6 @@
** Constants and data types
*****************************************************************************/
-/* Read Ready Event */
-typedef struct {
- NFC_HDR hdr;
- tNFA_NV_CO_STATUS status;
- int fd;
- uint16_t num_read;
-} tNFA_NV_CI_READ_EVT;
-
-/* Write Ready Event */
-typedef struct {
- NFC_HDR hdr;
- tNFA_NV_CO_STATUS status;
- int fd;
-} tNFA_NV_CI_WRITE_EVT;
-
/*****************************************************************************
** Function Declarations
*****************************************************************************/
diff --git a/src/nfa/include/nfa_p2p_int.h b/src/nfa/include/nfa_p2p_int.h
index 9ed9e4b..0221f36 100644
--- a/src/nfa/include/nfa_p2p_int.h
+++ b/src/nfa/include/nfa_p2p_int.h
@@ -36,9 +36,8 @@
enum {
NFA_P2P_LLCP_STATE_IDLE,
NFA_P2P_LLCP_STATE_LISTENING,
- NFA_P2P_LLCP_STATE_ACTIVATED,
+ NFA_P2P_LLCP_STATE_ACTIVATED
- NFA_P2P_LLCP_STATE_MAX
};
typedef uint8_t tNFA_P2P_LLCP_STATE;
diff --git a/src/nfa/include/nfa_snep_api.h b/src/nfa/include/nfa_snep_api.h
index bb711c1..c723824 100644
--- a/src/nfa/include/nfa_snep_api.h
+++ b/src/nfa/include/nfa_snep_api.h
@@ -171,272 +171,4 @@
/* NFA SNEP callback */
typedef void(tNFA_SNEP_CBACK)(tNFA_SNEP_EVT event, tNFA_SNEP_EVT_DATA* p_data);
-/*****************************************************************************
-** External Function Declarations
-*****************************************************************************/
-
-/*******************************************************************************
-**
-** Function NFA_SnepStartDefaultServer
-**
-** Description This function is called to listen to SAP, 0x04 as SNEP
-** default server ("urn:nfc:sn:snep") on LLCP.
-**
-** NFA_SNEP_DEFAULT_SERVER_STARTED_EVT without data will be
-** returned.
-**
-** Note: If RF discovery is started,
-** NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
-** happen before calling this function
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepStartDefaultServer(tNFA_SNEP_CBACK* p_cback);
-
-/*******************************************************************************
-**
-** Function NFA_SnepStopDefaultServer
-**
-** Description This function is called to stop SNEP default server on LLCP.
-**
-** NFA_SNEP_DEFAULT_SERVER_STOPPED_EVT without data will be
-** returned.
-**
-** Note: If RF discovery is started,
-** NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
-** happen before calling this function
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepStopDefaultServer(tNFA_SNEP_CBACK* p_cback);
-
-/*******************************************************************************
-**
-** Function NFA_SnepRegisterServer
-**
-** Description This function is called to listen to a SAP as SNEP server.
-**
-** If server_sap is set to NFA_SNEP_ANY_SAP, then NFA will
-** allocate a SAP between LLCP_LOWER_BOUND_SDP_SAP and
-** LLCP_UPPER_BOUND_SDP_SAP
-**
-** NFC Forum default SNEP server ("urn:nfc:sn:snep") may be
-** launched by NFA_SnepStartDefaultServer ().
-**
-** NFA_SNEP_REG_EVT will be returned with status, handle and
-** service name.
-**
-** Note: If RF discovery is started,
-** NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
-** happen before calling this function
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_INVALID_PARAM if p_service_name or p_cback is
-** NULL
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepRegisterServer(uint8_t server_sap,
- char* p_service_name,
- tNFA_SNEP_CBACK* p_cback);
-
-/*******************************************************************************
-**
-** Function NFA_SnepRegisterClient
-**
-** Description This function is called to register SNEP client.
-** NFA_SNEP_REG_EVT will be returned with status, handle
-** and zero-length service name.
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_INVALID_PARAM if p_cback is NULL
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepRegisterClient(tNFA_SNEP_CBACK* p_cback);
-
-/*******************************************************************************
-**
-** Function NFA_SnepDeregister
-**
-** Description This function is called to stop listening as SNEP server
-** or SNEP client. Application shall use reg_handle returned in
-** NFA_SNEP_REG_EVT.
-**
-** Note: If this function is called to de-register a SNEP server and
-** RF discovery is started,
-** NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
-** happen before calling this function
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_BAD_HANDLE if handle is not valid
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepDeregister(tNFA_HANDLE reg_handle);
-
-/*******************************************************************************
-**
-** Function NFA_SnepConnect
-**
-** Description This function is called by client to create data link
-** connection to SNEP server on peer device.
-**
-** Client handle and service name of server to connect shall be
-** provided. A conn_handle will be returned in
-** NFA_SNEP_CONNECTED_EVT, if successfully connected. Otherwise
-** NFA_SNEP_DISC_EVT will be returned.
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_BAD_HANDLE if handle is not valid
-** NFA_STATUS_INVALID_PARAM if p_service_name or p_cback is
-** NULL
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepConnect(tNFA_HANDLE client_handle,
- char* p_service_name);
-
-/*******************************************************************************
-**
-** Function NFA_SnepGet
-**
-** Description This function is called by client to send GET request.
-**
-** Application shall allocate a buffer and put NDEF message
-** with desired record type to get from server. NDEF message
-** from server will be returned in the same buffer with
-** NFA_SNEP_GET_RESP_EVT. The size of buffer will be used as
-** "Acceptable Length".
-**
-** NFA_SNEP_GET_RESP_EVT or NFA_SNEP_DISC_EVT will be returned
-** through registered p_cback. Application may free the buffer
-** after receiving these events.
-**
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_BAD_HANDLE if handle is not valid
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepGet(tNFA_HANDLE conn_handle, uint32_t buff_length,
- uint32_t ndef_length, uint8_t* p_ndef_buff);
-
-/*******************************************************************************
-**
-** Function NFA_SnepPut
-**
-** Description This function is called by client to send PUT request.
-**
-** Application shall allocate a buffer and put desired NDEF
-** message to send to server.
-**
-** NFA_SNEP_PUT_RESP_EVT or NFA_SNEP_DISC_EVT will be returned
-** through p_cback. Application may free the buffer after
-** receiving these events.
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_BAD_HANDLE if handle is not valid
-** NFA_STATUS_INVALID_PARAM if p_service_name or p_cback is
-** NULL
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepPut(tNFA_HANDLE conn_handle, uint32_t ndef_length,
- uint8_t* p_ndef_buff);
-
-/*******************************************************************************
-**
-** Function NFA_SnepGetResponse
-**
-** Description This function is called by server to send response of GET
-** request.
-**
-** When server application receives NFA_SNEP_ALLOC_BUFF_EVT,
-** it shall allocate a buffer for incoming NDEF message and
-** pass the pointer within callback context. This buffer will
-** be returned with NFA_SNEP_GET_REQ_EVT after receiving
-** complete NDEF message. If buffer is not allocated,
-** NFA_SNEP_RESP_CODE_NOT_FOUND (Note:There is no proper
-** response code for this case) or NFA_SNEP_RESP_CODE_REJECT
-** will be sent to client.
-**
-** Server application shall provide conn_handle which is
-** received in NFA_SNEP_GET_REQ_EVT.
-**
-** Server application shall allocate a buffer and put NDEF
-** message if response code is NFA_SNEP_RESP_CODE_SUCCESS.
-** Otherwise, ndef_length shall be set to zero.
-**
-** NFA_SNEP_GET_RESP_CMPL_EVT or NFA_SNEP_DISC_EVT will be
-** returned through registered callback function. Application
-** may free the buffer after receiving these events.
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_BAD_HANDLE if handle is not valid
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepGetResponse(tNFA_HANDLE conn_handle,
- tNFA_SNEP_RESP_CODE resp_code,
- uint32_t ndef_length,
- uint8_t* p_ndef_buff);
-
-/*******************************************************************************
-**
-** Function NFA_SnepPutResponse
-**
-** Description This function is called by server to send response of PUT
-** request.
-**
-** When server application receives NFA_SNEP_ALLOC_BUFF_EVT,
-** it shall allocate a buffer for incoming NDEF message and
-** pass the pointer within callback context. This buffer will
-** be returned with NFA_SNEP_PUT_REQ_EVT after receiving
-** complete NDEF message. If buffer is not allocated,
-** NFA_SNEP_RESP_CODE_REJECT will be sent to client or NFA will
-** discard request and send NFA_SNEP_RESP_CODE_SUCCESS
-** (Note:There is no proper response code for this case).
-**
-** Server application shall provide conn_handle which is
-** received in NFA_SNEP_PUT_REQ_EVT.
-**
-** NFA_SNEP_DISC_EVT will be returned through registered
-** callback function when client disconnects data link
-** connection.
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_BAD_HANDLE if handle is not valid
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepPutResponse(tNFA_HANDLE conn_handle,
- tNFA_SNEP_RESP_CODE resp_code);
-
-/*******************************************************************************
-**
-** Function NFA_SnepDisconnect
-**
-** Description This function is called to disconnect data link connection.
-** discard any pending data if flush is set to TRUE
-**
-** Client application shall provide conn_handle in
-** NFA_SNEP_GET_RESP_EVT or NFA_SNEP_PUT_RESP_EVT.
-**
-** Server application shall provide conn_handle in
-** NFA_SNEP_GET_REQ_EVT or NFA_SNEP_PUT_REQ_EVT.
-**
-** NFA_SNEP_DISC_EVT will be returned
-**
-** Returns NFA_STATUS_OK if successfully initiated
-** NFA_STATUS_BAD_HANDLE if handle is not valid
-** NFA_STATUS_FAILED otherwise
-**
-*******************************************************************************/
-extern tNFA_STATUS NFA_SnepDisconnect(tNFA_HANDLE conn_handle, bool flush);
-
#endif /* NFA_P2P_API_H */
diff --git a/src/nfa/include/nfa_snep_int.h b/src/nfa/include/nfa_snep_int.h
index bc2b3d9..83f6cb5 100644
--- a/src/nfa/include/nfa_snep_int.h
+++ b/src/nfa/include/nfa_snep_int.h
@@ -45,9 +45,8 @@
NFA_SNEP_API_PUT_REQ_EVT,
NFA_SNEP_API_GET_RESP_EVT,
NFA_SNEP_API_PUT_RESP_EVT,
- NFA_SNEP_API_DISCONNECT_EVT,
+ NFA_SNEP_API_DISCONNECT_EVT
- NFA_SNEP_LAST_EVT
};
/* data type for NFA_SNEP_API_START_DEFAULT_SERVER_EVT */
@@ -224,38 +223,6 @@
** nfa_snep_main.c
*/
void nfa_snep_init(bool is_dta_mode);
-/*
-** nfa_snep_default.c
-*/
-void nfa_snep_default_init(void);
-bool nfa_snep_start_default_server(tNFA_SNEP_MSG* p_msg);
-bool nfa_snep_stop_default_server(tNFA_SNEP_MSG* p_msg);
-/*
-** nfa_snep_srv.c
-*/
-uint8_t nfa_snep_allocate_cb(void);
-void nfa_snep_deallocate_cb(uint8_t xx);
-void nfa_snep_send_msg(uint8_t opcode, uint8_t dlink);
-
-void nfa_snep_llcp_cback(tLLCP_SAP_CBACK_DATA* p_data);
-void nfa_snep_proc_llcp_data_ind(tLLCP_SAP_CBACK_DATA* p_data);
-void nfa_snep_proc_llcp_connect_ind(tLLCP_SAP_CBACK_DATA* p_data);
-void nfa_snep_proc_llcp_connect_resp(tLLCP_SAP_CBACK_DATA* p_data);
-void nfa_snep_proc_llcp_disconnect_ind(tLLCP_SAP_CBACK_DATA* p_data);
-void nfa_snep_proc_llcp_disconnect_resp(tLLCP_SAP_CBACK_DATA* p_data);
-void nfa_snep_proc_llcp_congest(tLLCP_SAP_CBACK_DATA* p_data);
-void nfa_snep_proc_llcp_link_status(tLLCP_SAP_CBACK_DATA* p_data);
-void nfa_snep_proc_llcp_tx_complete(tLLCP_SAP_CBACK_DATA* p_data);
-
-bool nfa_snep_reg_server(tNFA_SNEP_MSG* p_msg);
-bool nfa_snep_reg_client(tNFA_SNEP_MSG* p_msg);
-bool nfa_snep_dereg(tNFA_SNEP_MSG* p_msg);
-bool nfa_snep_connect(tNFA_SNEP_MSG* p_msg);
-bool nfa_snep_put_resp(tNFA_SNEP_MSG* p_msg);
-bool nfa_snep_get_resp(tNFA_SNEP_MSG* p_msg);
-bool nfa_snep_put_req(tNFA_SNEP_MSG* p_msg);
-bool nfa_snep_get_req(tNFA_SNEP_MSG* p_msg);
-bool nfa_snep_disconnect(tNFA_SNEP_MSG* p_msg);
#endif /* (NFA_SNEP_INCLUDED == TRUE) */
#endif /* NFA_SNEP_INT_H */
diff --git a/src/nfa/include/nfa_sys.h b/src/nfa/include/nfa_sys.h
index 636d0b4..42d8464 100644
--- a/src/nfa/include/nfa_sys.h
+++ b/src/nfa/include/nfa_sys.h
@@ -61,7 +61,6 @@
/* function type for processing the change of NFCC power mode */
typedef void(tNFA_SYS_PROC_NFCC_PWR_MODE)(uint8_t nfcc_power_mode);
-typedef void(tNFA_SYS_CBACK)(void);
typedef void(tNFA_SYS_ENABLE_CBACK)(void);
typedef void(tNFA_SYS_PROC_NFCC_PWR_MODE_CMPL)(void);
diff --git a/src/nfa/include/nfa_sys_int.h b/src/nfa/include/nfa_sys_int.h
index d4fc053..e040b1b 100644
--- a/src/nfa/include/nfa_sys_int.h
+++ b/src/nfa/include/nfa_sys_int.h
@@ -65,6 +65,4 @@
/* system manager configuration structure */
extern tNFA_SYS_CFG* p_nfa_sys_cfg;
-bool nfa_sys_sm_execute(NFC_HDR* p_msg);
-
#endif /* NFA_SYS_INT_H */
diff --git a/src/nfc/include/ce_api.h b/src/nfc/include/ce_api.h
index b4ff029..1ed0f91 100644
--- a/src/nfc/include/ce_api.h
+++ b/src/nfc/include/ce_api.h
@@ -38,26 +38,18 @@
CE_T3T_NDEF_UPDATE_START_EVT = CE_T3T_FIRST_EVT,
CE_T3T_NDEF_UPDATE_CPLT_EVT,
CE_T3T_UPDATE_EVT,
- CE_T3T_CHECK_EVT,
CE_T3T_RAW_FRAME_EVT,
- CE_T3T_MAX_EVT,
CE_T4T_NDEF_UPDATE_START_EVT = CE_T4T_FIRST_EVT,
CE_T4T_NDEF_UPDATE_CPLT_EVT,
CE_T4T_NDEF_UPDATE_ABORT_EVT,
- CE_T4T_RAW_FRAME_EVT,
- CE_T4T_MAX_EVT
+ CE_T4T_RAW_FRAME_EVT
};
typedef uint8_t tCE_EVENT;
typedef struct {
tNFC_STATUS status;
- NFC_HDR* p_data;
-} tCE_T2T_DATA;
-
-typedef struct {
- tNFC_STATUS status;
uint8_t* p_data;
bool b_updated;
uint32_t length;
@@ -192,33 +184,6 @@
/*******************************************************************************
**
-** Function CE_T4TTestSetCC
-**
-** Description Set fields in Capability Container File for testing
-**
-** Returns NFC_STATUS_OK if success
-**
-*******************************************************************************/
-extern tNFC_STATUS CE_T4TTestSetCC(uint16_t cc_len, uint8_t version,
- uint16_t max_le, uint16_t max_lc);
-
-/*******************************************************************************
-**
-** Function CE_T4TTestSetNDEFCtrlTLV
-**
-** Description Set fields in NDEF File Control TLV for testing
-**
-** Returns NFC_STATUS_OK if success
-**
-*******************************************************************************/
-extern tNFC_STATUS CE_T4TTestSetNDEFCtrlTLV(uint8_t type, uint8_t length,
- uint16_t file_id,
- uint16_t max_file_size,
- uint8_t read_access,
- uint8_t write_access);
-
-/*******************************************************************************
-**
** Function CE_SendRawFrame
**
** Description This function sends a raw frame to the peer device.
diff --git a/src/nfc/include/llcp_int.h b/src/nfc/include/llcp_int.h
index 19eacdb..6051ca0 100644
--- a/src/nfc/include/llcp_int.h
+++ b/src/nfc/include/llcp_int.h
@@ -126,8 +126,7 @@
LLCP_DLC_STATE_W4_LOCAL_RESP, /* waiting for connection confirm from upper
layer */
LLCP_DLC_STATE_CONNECTED, /* data link connection has been established */
- LLCP_DLC_STATE_W4_REMOTE_DM, /* waiting for disconnection confirm from peer */
- LLCP_DLC_STATE_MAX
+ LLCP_DLC_STATE_W4_REMOTE_DM /* waiting for disconnection confirm from peer */
};
typedef uint8_t tLLCP_DLC_STATE;
diff --git a/src/nfc/include/ndef_utils.h b/src/nfc/include/ndef_utils.h
index 00150cf..a30d40f 100644
--- a/src/nfc/include/ndef_utils.h
+++ b/src/nfc/include/ndef_utils.h
@@ -267,39 +267,6 @@
/*******************************************************************************
**
-** Function NDEF_MsgInsertRec
-**
-** Description This function inserts a record at a specific index into the
-** given NDEF message
-**
-** Returns OK, or error if the record did not fit
-** *p_cur_size is updated
-**
-*******************************************************************************/
-extern tNDEF_STATUS NDEF_MsgInsertRec(uint8_t* p_msg, uint32_t max_size,
- uint32_t* p_cur_size, int32_t index,
- uint8_t tnf, uint8_t* p_type,
- uint8_t type_len, uint8_t* p_id,
- uint8_t id_len, uint8_t* p_payload,
- uint32_t payload_len);
-
-/*******************************************************************************
-**
-** Function NDEF_MsgAppendRec
-**
-** Description This function adds NDEF records to the end of an NDEF
-** message.
-**
-** Returns OK, or error if the record did not fit
-** *p_cur_size is updated
-**
-*******************************************************************************/
-extern tNDEF_STATUS NDEF_MsgAppendRec(uint8_t* p_msg, uint32_t max_size,
- uint32_t* p_cur_size, uint8_t* p_new_rec,
- uint32_t new_rec_len);
-
-/*******************************************************************************
-**
** Function NDEF_MsgAppendPayload
**
** Description This function appends extra payload to a specific record in
diff --git a/src/nfc/include/nfc_api.h b/src/nfc/include/nfc_api.h
index 2014e43..b43a97f 100644
--- a/src/nfc/include/nfc_api.h
+++ b/src/nfc/include/nfc_api.h
@@ -150,7 +150,6 @@
/* use a proprietary range */
#define NFC_TEST_ID NCI_TEST_ID
-typedef uint8_t tNFC_PMID;
#define NFC_TL_SIZE 2
#define NFC_SAVED_CMD_SIZE 2
@@ -191,8 +190,8 @@
NFC_NFCC_POWER_OFF_REVT, /* 17 NFCC turned off */
NFC_SET_POWER_SUB_STATE_REVT, /* 18 Set power sub state response */
NFC_NFCEE_PL_CONTROL_REVT, /* NFCEE Power/Link Ctrl response*/
- NFC_NFCEE_STATUS_REVT, /* NFCEE Status Notification */
- NFC_FIRST_VS_REVT /* First vendor-specific rsp event */
+ NFC_NFCEE_STATUS_REVT /* NFCEE Status Notification */
+ /* First vendor-specific rsp event */
};
typedef uint16_t tNFC_RESPONSE_EVT;
@@ -253,7 +252,6 @@
#define NFC_NFCEE_INTERFACE_T3T NCI_NFCEE_INTERFACE_T3T
#define NFC_NFCEE_INTERFACE_TRANSPARENT NCI_NFCEE_INTERFACE_TRANSPARENT
#define NFC_NFCEE_INTERFACE_PROPRIETARY NCI_NFCEE_INTERFACE_PROPRIETARY
-typedef uint8_t tNFC_NFCEE_INTERFACE;
#define NFC_NFCEE_TAG_HW_ID NCI_NFCEE_TAG_HW_ID
#define NFC_NFCEE_TAG_ATR_BYTES NCI_NFCEE_TAG_ATR_BYTES
@@ -755,12 +753,6 @@
typedef void(tNFC_DISCOVER_CBACK)(tNFC_DISCOVER_EVT event,
tNFC_DISCOVER* p_data);
-/* the events reported on tNFC_TEST_CBACK */
-enum {
- NFC_LOOPBACK_TEVT = NFC_FIRST_TEVT, /* 0 Loopback test */
- NFC_RF_CONTROL_TEVT, /* 1 RF control Test response */
- NFC_RF_FIELD_DONE_TEVT /* 1 RF control Test notificatn*/
-};
typedef uint16_t tNFC_TEST_EVT;
/* the data type associated with NFC_LOOPBACK_TEVT */
@@ -804,11 +796,6 @@
/* the static connection ID for HCI transport */
#define NFC_HCI_CONN_ID 1
-/*************************************
-** Status callback function
-**************************************/
-typedef void(tNFC_STATUS_CBACK)(tNFC_STATUS status);
-
/*****************************************************************************
** EXTERNAL FUNCTION DECLARATIONS
*****************************************************************************/
diff --git a/src/nfc/include/nfc_int.h b/src/nfc/include/nfc_int.h
index ab1003b..ea70715 100644
--- a/src/nfc/include/nfc_int.h
+++ b/src/nfc/include/nfc_int.h
@@ -149,8 +149,6 @@
/* callback function pointer(8; use 8 to be safe + NFC_SAVED_CMD_SIZE(2) */
#define NFC_RECEIVE_MSGS_OFFSET (10)
-/* NFCC power state change pending callback */
-typedef void(tNFC_PWR_ST_CBACK)(void);
#define NFC_SAVED_HDR_SIZE (2)
/* data Reassembly error (in NFC_HDR.layer_specific) */
#define NFC_RAS_TOO_BIG 0x08
@@ -244,8 +242,6 @@
{ (a) &= ((1 << (v)) - 1); }
#define MAX_NUM_VALID_BITS_FOR_ACK 0x07
-extern void nfc_init(void);
-
/* from nfc_utils.c */
extern tNFC_CONN_CB* nfc_alloc_conn_cb(tNFC_CONN_CBACK* p_cback);
extern tNFC_CONN_CB* nfc_find_conn_cb_by_conn_id(uint8_t conn_id);
@@ -255,7 +251,6 @@
extern void nfc_reset_all_conn_cbs(void);
extern void nfc_data_event(tNFC_CONN_CB* p_cb);
-void nfc_ncif_send(NFC_HDR* p_buf, bool is_cmd);
extern uint8_t nfc_ncif_send_data(tNFC_CONN_CB* p_cb, NFC_HDR* p_data);
extern void nfc_ncif_cmd_timeout(void);
extern void nfc_wait_2_deactivate_timeout(void);
diff --git a/src/nfc/include/rw_api.h b/src/nfc/include/rw_api.h
index 75970e8..e634aca 100644
--- a/src/nfc/include/rw_api.h
+++ b/src/nfc/include/rw_api.h
@@ -153,11 +153,6 @@
#define RW_T4T_CHK_READ_BINARY_CH3 3
#define RW_T4T_CHK_EMPTY_I_BLOCK 4
#define RW_T4T_CHK_ISO_DEP_NAK_PRES_CHK 5
-typedef struct {
- tNFC_STATUS status;
- uint8_t hr[T1T_HR_LEN];
- uint8_t uid[T1T_CMD_UID_LEN];
-} tRW_T1T_RID_EVT;
typedef struct {
tNFC_STATUS status;
diff --git a/src/nfc/ndef/ndef_utils.cc b/src/nfc/ndef/ndef_utils.cc
index 01663f0..7bb44de 100644
--- a/src/nfc/ndef/ndef_utils.cc
+++ b/src/nfc/ndef/ndef_utils.cc
@@ -883,143 +883,6 @@
/*******************************************************************************
**
-** Function NDEF_MsgInsertRec
-**
-** Description This function inserts a record at a specific index into the
-** given NDEF message
-**
-** Returns OK, or error if the record did not fit
-** *p_cur_size is updated
-**
-*******************************************************************************/
-extern tNDEF_STATUS NDEF_MsgInsertRec(uint8_t* p_msg, uint32_t max_size,
- uint32_t* p_cur_size, int32_t index,
- uint8_t tnf, uint8_t* p_type,
- uint8_t type_len, uint8_t* p_id,
- uint8_t id_len, uint8_t* p_payload,
- uint32_t payload_len) {
- uint8_t* p_rec;
- uint32_t recSize;
- int32_t plen = (payload_len < 256) ? 1 : 4;
- int32_t ilen = (id_len == 0) ? 0 : 1;
-
- /* First, make sure the record will fit. we need at least 2 bytes for header
- * and type length */
- recSize = payload_len + 2 + type_len + plen + ilen + id_len;
-
- if ((*p_cur_size + recSize) > max_size) return (NDEF_MSG_INSUFFICIENT_MEM);
-
- /* See where the new record goes. If at the end, call the 'AddRec' function */
- if ((index >= NDEF_MsgGetNumRecs(p_msg)) ||
- ((p_rec = NDEF_MsgGetRecByIndex(p_msg, index)) == NULL)) {
- return NDEF_MsgAddRec(p_msg, max_size, p_cur_size, tnf, p_type, type_len,
- p_id, id_len, p_payload, payload_len);
- }
-
- /* If we are inserting at the beginning, remove the MB bit from the current
- * first */
- if (index == 0) *p_msg &= ~NDEF_MB_MASK;
-
- /* Make space for the new record */
- shiftdown(p_rec, (uint32_t)(*p_cur_size - (p_rec - p_msg)), recSize);
-
- /* If adding at the beginning, set begin bit */
- if (index == 0)
- *p_rec = tnf | NDEF_MB_MASK;
- else
- *p_rec = tnf;
-
- if (plen == 1) *p_rec |= NDEF_SR_MASK;
-
- if (ilen != 0) *p_rec |= NDEF_IL_MASK;
-
- p_rec++;
-
- /* The next byte is the type field length */
- *p_rec++ = type_len;
-
- /* Payload length - can be 1 or 4 bytes */
- if (plen == 1)
- *p_rec++ = (uint8_t)payload_len;
- else
- UINT32_TO_BE_STREAM(p_rec, payload_len);
-
- /* ID field Length (optional) */
- if (ilen != 0) *p_rec++ = id_len;
-
- /* Next comes the type */
- if (type_len) {
- if (p_type) memcpy(p_rec, p_type, type_len);
-
- p_rec += type_len;
- }
-
- /* Next comes the ID */
- if (ilen != 0) {
- if (p_id) memcpy(p_rec, p_id, id_len);
-
- p_rec += id_len;
- }
-
- /* And lastly the payload. If NULL, the app just wants to reserve memory */
- if (p_payload) memcpy(p_rec, p_payload, payload_len);
-
- *p_cur_size += recSize;
-
- return (NDEF_OK);
-}
-
-/*******************************************************************************
-**
-** Function NDEF_MsgAppendRec
-**
-** Description This function adds NDEF records to the end of an NDEF
-** message.
-**
-** Returns OK, or error if the record did not fit
-** *p_cur_size is updated
-**
-*******************************************************************************/
-extern tNDEF_STATUS NDEF_MsgAppendRec(uint8_t* p_msg, uint32_t max_size,
- uint32_t* p_cur_size, uint8_t* p_new_rec,
- uint32_t new_rec_len) {
- uint8_t* p_rec;
- tNDEF_STATUS status;
-
- /* First, validate new records */
- status = NDEF_MsgValidate(p_new_rec, new_rec_len, false);
- if (status != NDEF_OK) return (status);
-
- /* First, make sure the record will fit */
- if ((*p_cur_size + new_rec_len) > max_size)
- return (NDEF_MSG_INSUFFICIENT_MEM);
-
- /* Find where to copy new record */
- if (*p_cur_size == 0)
- p_rec = p_msg;
- else {
- /* Find the previous last and clear his 'Message End' bit */
- uint8_t* pLast = NDEF_MsgGetLastRecInMsg(p_msg);
-
- if (!pLast) return (NDEF_MSG_NO_MSG_END);
-
- *pLast &= ~NDEF_ME_MASK;
- p_rec = p_msg + *p_cur_size;
-
- /* clear 'Message Begin' bit of new record */
- *p_new_rec &= ~NDEF_MB_MASK;
- }
-
- /* append new records */
- memcpy(p_rec, p_new_rec, new_rec_len);
-
- *p_cur_size += new_rec_len;
-
- return (NDEF_OK);
-}
-
-/*******************************************************************************
-**
** Function NDEF_MsgAppendPayload
**
** Description This function appends extra payload to a specific record in
diff --git a/src/nfc/tags/ce_t4t.cc b/src/nfc/tags/ce_t4t.cc
index 21d8ad8..60b314d 100644
--- a/src/nfc/tags/ce_t4t.cc
+++ b/src/nfc/tags/ce_t4t.cc
@@ -935,123 +935,3 @@
p_t4t->reg_aid[aid_handle].p_cback = NULL;
}
}
-
-/*******************************************************************************
-**
-** Function CE_T4TTestSetCC
-**
-** Description Set fields in Capability Container File for testing
-**
-** Returns NFC_STATUS_OK if success
-**
-*******************************************************************************/
-tNFC_STATUS CE_T4TTestSetCC(uint16_t cc_len, uint8_t version, uint16_t max_le,
- uint16_t max_lc) {
-#if (CE_TEST_INCLUDED == TRUE)
- tCE_T4T_MEM* p_t4t = &ce_cb.mem.t4t;
- uint8_t* p;
-
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "CCLen:0x%04X, Ver:0x%02X, MaxLe:0x%04X, "
- "MaxLc:0x%04X",
- cc_len, version, max_le, max_lc);
-
- /* CC file */
- p = p_t4t->cc_file;
-
- if (cc_len != 0xFFFF) {
- UINT16_TO_BE_STREAM(p, cc_len);
- } else
- p += 2;
-
- if (version != 0xFF) {
- mapping_aid_test_enabled = true;
- if (version == T4T_VERSION_1_0)
- ce_test_tag_app_id[T4T_V20_NDEF_TAG_AID_LEN - 1] = 0x00;
- else if (version == T4T_VERSION_2_0)
- ce_test_tag_app_id[T4T_V20_NDEF_TAG_AID_LEN - 1] = 0x01;
- else /* Undefined version */
- ce_test_tag_app_id[T4T_V20_NDEF_TAG_AID_LEN - 1] = 0xFF;
-
- UINT8_TO_BE_STREAM(p, version);
- } else {
- mapping_aid_test_enabled = false;
- p += 1;
- }
-
- if (max_le != 0xFFFF) {
- UINT16_TO_BE_STREAM(p, max_le);
- } else
- p += 2;
-
- if (max_lc != 0xFFFF) {
- UINT16_TO_BE_STREAM(p, max_lc);
- } else
- p += 2;
-
- return NFC_STATUS_OK;
-#else
- return NFC_STATUS_FAILED;
-#endif
-}
-
-/*******************************************************************************
-**
-** Function CE_T4TTestSetNDEFCtrlTLV
-**
-** Description Set fields in NDEF File Control TLV for testing
-**
-** Returns NFC_STATUS_OK if success
-**
-*******************************************************************************/
-tNFC_STATUS CE_T4TTestSetNDEFCtrlTLV(uint8_t type, uint8_t length,
- uint16_t file_id, uint16_t max_file_size,
- uint8_t read_access,
- uint8_t write_access) {
-#if (CE_TEST_INCLUDED == TRUE)
- tCE_T4T_MEM* p_t4t = &ce_cb.mem.t4t;
- uint8_t* p;
-
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "type:0x%02X, len:0x%02X, FileID:0x%04X, "
- "MaxFile:0x%04X, RdAcc:0x%02X, WrAcc:0x%02X",
- type, length, file_id, max_file_size, read_access, write_access);
-
- /* NDEF File control TLV */
- p = p_t4t->cc_file + T4T_FC_TLV_OFFSET_IN_CC;
-
- if (type != 0xFF) {
- UINT8_TO_BE_STREAM(p, type);
- } else
- p += 1;
-
- if (length != 0xFF) {
- UINT8_TO_BE_STREAM(p, length);
- } else
- p += 1;
-
- if (file_id != 0xFFFF) {
- UINT16_TO_BE_STREAM(p, file_id);
- } else
- p += 2;
-
- if (max_file_size != 0xFFFF) {
- UINT16_TO_BE_STREAM(p, max_file_size);
- } else
- p += 2;
-
- if (read_access != 0xFF) {
- UINT8_TO_BE_STREAM(p, read_access);
- } else
- p += 1;
-
- if (write_access != 0xFF) {
- UINT8_TO_BE_STREAM(p, write_access);
- } else
- p += 1;
-
- return NFC_STATUS_OK;
-#else
- return NFC_STATUS_FAILED;
-#endif
-}
diff --git a/src/nfc/tags/rw_t1t.cc b/src/nfc/tags/rw_t1t.cc
index f3706bd..130ba7c 100644
--- a/src/nfc/tags/rw_t1t.cc
+++ b/src/nfc/tags/rw_t1t.cc
@@ -41,8 +41,6 @@
static void rw_t1t_process_error(void);
static void rw_t1t_handle_presence_check_rsp(tNFC_STATUS status);
static std::string rw_t1t_get_state_name(uint8_t state);
-static char* rw_t1t_get_sub_state_name(uint8_t sub_state);
-static char* rw_t1t_get_event_name(uint8_t event);
/*******************************************************************************
**
diff --git a/src/nfc/tags/rw_t1t_ndef.cc b/src/nfc/tags/rw_t1t_ndef.cc
index 4934021..69e0c8a 100644
--- a/src/nfc/tags/rw_t1t_ndef.cc
+++ b/src/nfc/tags/rw_t1t_ndef.cc
@@ -2553,44 +2553,4 @@
return status;
}
-/*******************************************************************************
-**
-** Function rw_t1t_get_sub_state_name
-**
-** Description This function returns the sub_state name.
-**
-** NOTE conditionally compiled to save memory.
-**
-** Returns pointer to the name
-**
-*******************************************************************************/
-static std::string rw_t1t_get_sub_state_name(uint8_t sub_state) {
- switch (sub_state) {
- case RW_T1T_SUBSTATE_NONE:
- return "NONE";
- case RW_T1T_SUBSTATE_WAIT_READ_TLV_VALUE:
- return "EXTRACT_TLV_VALUE";
- case RW_T1T_SUBSTATE_WAIT_READ_LOCKS:
- return "READING_LOCKS";
- case RW_T1T_SUBSTATE_WAIT_READ_NDEF_BLOCK:
- return "READ_NDEF_FINAL_BLOCK";
- case RW_T1T_SUBSTATE_WAIT_INVALIDATE_NDEF:
- return "INVALIDATING_NDEF";
- case RW_T1T_SUBSTATE_WAIT_NDEF_WRITE:
- return "WRITE_NDEF_TLV_MESSAGE";
- case RW_T1T_SUBSTATE_WAIT_NDEF_UPDATED:
- return "WAITING_RSP_FOR_LAST_NDEF_WRITE";
- case RW_T1T_SUBSTATE_WAIT_VALIDATE_NDEF:
- return "VALIDATING_NDEF";
- case RW_T1T_SUBSTATE_WAIT_SET_CC_RWA_RO:
- return "SET_RWA_RO";
- case RW_T1T_SUBSTATE_WAIT_SET_ST_LOCK_BITS:
- return "SET_STATIC_LOCK_BITS";
- case RW_T1T_SUBSTATE_WAIT_SET_DYN_LOCK_BITS:
- return "SET_DYNAMIC_LOCK_BITS";
- default:
- return "???? UNKNOWN SUBSTATE";
- }
-}
-
#endif /* (RW_NDEF_INCLUDED == TRUE) */