From 2a7604d8cc07f7422ae8fc9d80760f707f3ec1d5 Mon Sep 17 00:00:00 2001 From: ca1e Date: Fri, 9 Jun 2023 16:01:29 +0800 Subject: [PATCH 1/2] ntag21x implement --- firmware/application/Makefile | 1 + .../application/src/rfid/nfctag/hf/nfc_mf1.c | 2 +- .../application/src/rfid/nfctag/hf/nfc_ntag.c | 227 ++++++++++++++++++ .../application/src/rfid/nfctag/hf/nfc_ntag.h | 28 +++ .../src/rfid/nfctag/tag_emulation.c | 7 +- 5 files changed, 261 insertions(+), 4 deletions(-) create mode 100644 firmware/application/src/rfid/nfctag/hf/nfc_ntag.c create mode 100644 firmware/application/src/rfid/nfctag/hf/nfc_ntag.h diff --git a/firmware/application/Makefile b/firmware/application/Makefile index 62821629..c495ab3e 100644 --- a/firmware/application/Makefile +++ b/firmware/application/Makefile @@ -25,6 +25,7 @@ SRC_FILES += \ $(PROJ_DIR)/rfid/nfctag/hf/crypto1_helper.c \ $(PROJ_DIR)/rfid/nfctag/hf/nfc_14a.c \ $(PROJ_DIR)/rfid/nfctag/hf/nfc_mf1.c \ + $(PROJ_DIR)/rfid/nfctag/hf/nfc_ntag.c \ $(PROJ_DIR)/rfid/nfctag/lf/lf_tag_em.c \ $(PROJ_DIR)/utils/dataframe.c \ $(PROJ_DIR)/utils/fds_util.c \ diff --git a/firmware/application/src/rfid/nfctag/hf/nfc_mf1.c b/firmware/application/src/rfid/nfctag/hf/nfc_mf1.c index 806fa64e..e3e032bb 100644 --- a/firmware/application/src/rfid/nfctag/hf/nfc_mf1.c +++ b/firmware/application/src/rfid/nfctag/hf/nfc_mf1.c @@ -954,7 +954,7 @@ void nfc_tag_mf1_reset_handler() { * 那么信息的长度应当是防冲撞信息加上配置信息再加上扇区大小的长度 */ int get_information_size_by_tag_type(tag_specific_type_t type, bool auth_align) { - int size_raw = sizeof(nfc_tag_14a_coll_res_entity_t) + sizeof(nfc_tag_mf1_configure_t) + (get_block_max_by_tag_type(type) * 16); + int size_raw = sizeof(nfc_tag_14a_coll_res_entity_t) + sizeof(nfc_tag_mf1_configure_t) + (get_block_max_by_tag_type(type) * NFC_TAG_MF1_DATA_SIZE); int size_align = size_raw + (size_raw % 4); return auth_align ? size_align : size_raw; } diff --git a/firmware/application/src/rfid/nfctag/hf/nfc_ntag.c b/firmware/application/src/rfid/nfctag/hf/nfc_ntag.c new file mode 100644 index 00000000..72271049 --- /dev/null +++ b/firmware/application/src/rfid/nfctag/hf/nfc_ntag.c @@ -0,0 +1,227 @@ +#include + +#include "nfc_ntag.h" +#include "nfc_14a.h" +#include "fds_util.h" +#include "tag_persistence.h" + +#define NRF_LOG_MODULE_NAME tag_ntag +#include "nrf_log.h" +#include "nrf_log_ctrl.h" +#include "nrf_log_default_backends.h" +NRF_LOG_MODULE_REGISTER(); + +#define NTAG213_PAGES 45 //45 pages total for ntag213, from 0 to 44 +#define NTAG215_PAGES 135 //135 pages total for ntag215, from 0 to 134 +#define NTAG216_PAGES 231 //231 pages total for ntag216, from 0 to 230 + +#define NTAG213_VERSION 0x0F +#define NTAG215_VERSION 0x11 +#define NTAG216_VERSION 0x13 + +// NTAG COMMANDS +#define CMD_GET_VERSION 0x60 +#define CMD_READ 0x30 +#define CMD_FAST_READ 0x3A +#define CMD_WRITE 0xA2 +#define CMD_COMPAT_WRITE 0xA0 +#define CMD_READ_CNT 0x39 +#define CMD_PWD_AUTH 0x1B +#define CMD_READ_SIG 0x3C + +// SIGNATURE Lenght +#define SIGNATURE_LENGTH 32 + +/* pwd auth for amiibo */ +static uint8_t NTAG215_PwdOK[2] = {0x80, 0x80}; + +// 指向标签信息的数据结构指针 +static nfc_tag_ntag_information_t* m_tag_information = NULL; +// 定义并且使用影子防冲撞资源 +static nfc_tag_14a_coll_res_referen_t m_shadow_coll_res; +// 保存当前正在模拟的MF1的具体类型 +static tag_specific_type_t m_tag_type; + +static int get_block_max_by_tag_type(tag_specific_type_t tag_type) { + int block_max; + switch(tag_type) { + case TAG_TYPE_NTAG_213: + block_max = NTAG213_PAGES; + break; + default: + case TAG_TYPE_NTAG_215: + block_max = NTAG215_PAGES; + break; + case TAG_TYPE_NTAG_216: + block_max = NTAG216_PAGES; + break; + } + return block_max; +} + +void nfc_tag_ntag_state_handler(uint8_t* p_data, uint16_t szDataBits) { + uint8_t command = p_data[0]; + uint8_t block_num = p_data[1]; + + switch(command) { + case CMD_GET_VERSION: + p_data[0] = 0x00; + p_data[1] = 0x04; + p_data[2] = 0x04; + p_data[3] = 0x02; + p_data[4] = 0x01; + p_data[5] = 0x00; + switch (m_tag_type) { + case TAG_TYPE_NTAG_213: + p_data[6] = NTAG213_VERSION; + break; + case TAG_TYPE_NTAG_215: + p_data[6] = NTAG215_VERSION; + break; + case TAG_TYPE_NTAG_216: + p_data[6] = NTAG216_VERSION; + break; + } + p_data[7] = 0x03; + nfc_tag_14a_tx_bytes(p_data, 8, true); + break; + case CMD_READ: + if (block_num < 135) { + for (int block = 0; block < 4; block++) { + memcpy(p_data + block*4, m_tag_information->memory[block_num+block], NFC_TAG_NTAG_DATA_SIZE); + } + nfc_tag_14a_tx_bytes(p_data, NFC_TAG_NTAG_DATA_SIZE * 4, true); + } else { + nfc_tag_14a_tx_nbit_delay_window(NAK_INVALID_OPERATION_TBIV, 4); + } + break; + case CMD_FAST_READ: + // TODO + break; + case CMD_WRITE: + nfc_tag_14a_tx_nbit_delay_window(ACK_VALUE, 4); + break; + case CMD_COMPAT_WRITE: + break; + case CMD_PWD_AUTH: + if (m_tag_information->config.mode_uid_magic) { + nfc_tag_14a_tx_bytes(NTAG215_PwdOK, 2, true); + } + break; + case CMD_READ_SIG: + // TODO + break; + } + return; +} + +nfc_tag_14a_coll_res_referen_t* get_miafre_coll_res() { + // 使用单独的防冲突信息，而不是使用扇区中的信息 + m_shadow_coll_res.sak = m_tag_information->res_coll.sak; + m_shadow_coll_res.atqa = m_tag_information->res_coll.atqa; + m_shadow_coll_res.uid = m_tag_information->res_coll.uid; + m_shadow_coll_res.size = &(m_tag_information->res_coll.size); + m_shadow_coll_res.ats = &(m_tag_information->res_coll.ats); + // 最终返回一个只带引用，不带实体的影子数据结构指针 + return &m_shadow_coll_res; +} + +void nfc_tag_ntag_reset_handler() { + // TODO +} + +int get_information_size_by_tag_type(tag_specific_type_t type) { + return sizeof(nfc_tag_14a_coll_res_entity_t) + sizeof(nfc_tag_ntag_configure_t) + (get_block_max_by_tag_type(type) * NFC_TAG_NTAG_DATA_SIZE); +} + +/** @brief mf1保存数据之前的回调 + * @param type 细化的标签类型 + * @param buffer 数据缓冲区 + * @return 需要保存的数据的长度，为0时表示不保存 + */ +int nfc_tag_ntag_data_savecb(tag_specific_type_t type, tag_data_buffer_t* buffer) { + if (m_tag_type != TAG_TYPE_UNKNOWN) { + // 根据当前标签类型保存对应大小的数据 + return get_information_size_by_tag_type(type); + } else { + return 0; + } +} + +int nfc_tag_ntag_data_loadcb(tag_specific_type_t type, tag_data_buffer_t* buffer) { + int info_size = get_information_size_by_tag_type(type); + if (buffer->length >= info_size) { + // 将数据缓冲区强转为ntag结构类型 + m_tag_information = (nfc_tag_ntag_information_t *)buffer->buffer; + // 缓存正在模拟的Ntag的具体类型 + m_tag_type = type; + // 注册14a通信管理接口 + nfc_tag_14a_handler_t handler_for_14a = { + .get_coll_res = get_miafre_coll_res, + .cb_state = nfc_tag_ntag_state_handler, + .cb_reset = nfc_tag_ntag_reset_handler, + }; + nfc_tag_14a_set_handler(&handler_for_14a); + NRF_LOG_INFO("HF ntag data load finish."); + } else { + NRF_LOG_ERROR("nfc_tag_ntag_information_t too big."); + } + return info_size; +} + +// 初始化ntag的工厂数据 +bool nfc_tag_ntag_data_factory(uint8_t slot, tag_specific_type_t tag_type) { + // default ntag data + uint8_t default_p0[] = { 0x04, 0x68, 0x95, 0x71 }; + uint8_t default_p1[] = { 0xFA, 0x5C, 0x64, 0x80 }; + uint8_t default_p2[] = { 0x42, 0x48, 0x0F, 0xE0 }; + + // default ntag info + nfc_tag_ntag_information_t ntag_tmp_information; + nfc_tag_ntag_information_t *p_ntag_information; + p_ntag_information = &ntag_tmp_information; + int block_max = get_block_max_by_tag_type(tag_type); + for (int block = 0; block < block_max; block++) { + if (block == 0) { + memcpy(p_ntag_information->memory[block], default_p0, NFC_TAG_NTAG_DATA_SIZE); + } + if (block == 1) { + memcpy(p_ntag_information->memory[block], default_p1, NFC_TAG_NTAG_DATA_SIZE); + } + if (block == 2) { + memcpy(p_ntag_information->memory[block], default_p2, NFC_TAG_NTAG_DATA_SIZE); + } + } + + // default ntag auto ant-collision res + p_ntag_information->res_coll.atqa[0] = 0x44; + p_ntag_information->res_coll.atqa[1] = 0x00; + p_ntag_information->res_coll.sak[0] = 0x00; + p_ntag_information->res_coll.uid[0] = 0x04; + p_ntag_information->res_coll.uid[1] = 0x68; + p_ntag_information->res_coll.uid[2] = 0x95; + p_ntag_information->res_coll.uid[3] = 0x71; + p_ntag_information->res_coll.uid[4] = 0xFA; + p_ntag_information->res_coll.uid[5] = 0x5C; + p_ntag_information->res_coll.uid[6] = 0x64; + p_ntag_information->res_coll.size = NFC_TAG_14A_UID_DOUBLE_SIZE; + p_ntag_information->res_coll.ats.length = 0; + + // default ntag config + p_ntag_information->config.mode_uid_magic = true; + p_ntag_information->config.detection_enable = false; + + // save data to flash + tag_sense_type_t sense_type = get_sense_type_from_tag_type(tag_type); + fds_slot_record_map_t map_info; + get_fds_map_by_slot_sense_type_for_dump(slot, sense_type, &map_info); + int info_size = get_information_size_by_tag_type(tag_type); // auto 4 byte align. + NRF_LOG_INFO("NTAG info size: %d", info_size); + bool ret = fds_write_sync(map_info.id, map_info.key, info_size / 4, p_ntag_information); + if (ret) { + NRF_LOG_INFO("Factory slot data success."); + } else { + NRF_LOG_ERROR("Factory slot data error."); + } + return ret; +} \ No newline at end of file diff --git a/firmware/application/src/rfid/nfctag/hf/nfc_ntag.h b/firmware/application/src/rfid/nfctag/hf/nfc_ntag.h new file mode 100644 index 00000000..060db703 --- /dev/null +++ b/firmware/application/src/rfid/nfctag/hf/nfc_ntag.h @@ -0,0 +1,28 @@ +#ifndef NFC_NTAG_H +#define NFC_NTAG_H + +#include "nfc_14a.h" + +#define NFC_TAG_NTAG_DATA_SIZE 4 +#define NFC_TAG_NTAG_BLOCK_MAX 231 + +typedef struct { + uint8_t mode_uid_magic: 1; + uint8_t detection_enable: 1; + // 保留 + uint8_t reserved1: 5; + uint8_t reserved2; + uint8_t reserved3; +} nfc_tag_ntag_configure_t; + +typedef struct __attribute__((aligned(4))) { + nfc_tag_14a_coll_res_entity_t res_coll; + nfc_tag_ntag_configure_t config; + uint8_t memory[NFC_TAG_NTAG_BLOCK_MAX][NFC_TAG_NTAG_DATA_SIZE]; +} nfc_tag_ntag_information_t; + +int nfc_tag_ntag_data_loadcb(tag_specific_type_t type, tag_data_buffer_t* buffer); +int nfc_tag_ntag_data_savecb(tag_specific_type_t type, tag_data_buffer_t* buffer); +bool nfc_tag_ntag_data_factory(uint8_t slot, tag_specific_type_t tag_type); + +#endif diff --git a/firmware/application/src/rfid/nfctag/tag_emulation.c b/firmware/application/src/rfid/nfctag/tag_emulation.c index f66ec5d2..dfa1ff10 100644 --- a/firmware/application/src/rfid/nfctag/tag_emulation.c +++ b/firmware/application/src/rfid/nfctag/tag_emulation.c @@ -2,6 +2,7 @@ #include "nfc_14a.h" #include "lf_tag_em.h" #include "nfc_mf1.h" +#include "nfc_ntag.h" #include "fds_util.h" #include "tag_emulation.h" #include "tag_persistence.h" @@ -81,9 +82,9 @@ static tag_base_handler_map_t tag_base_map[] = { { TAG_SENSE_HF, TAG_TYPE_MIFARE_2048, nfc_tag_mf1_data_loadcb, nfc_tag_mf1_data_savecb, nfc_tag_mf1_data_factory, &m_tag_data_hf }, { TAG_SENSE_HF, TAG_TYPE_MIFARE_4096, nfc_tag_mf1_data_loadcb, nfc_tag_mf1_data_savecb, nfc_tag_mf1_data_factory, &m_tag_data_hf }, // NTAG标签模拟 - { TAG_SENSE_HF, TAG_TYPE_NTAG_213, NULL, NULL, NULL, &m_tag_data_hf }, - { TAG_SENSE_HF, TAG_TYPE_NTAG_215, NULL, NULL, NULL, &m_tag_data_hf }, - { TAG_SENSE_HF, TAG_TYPE_NTAG_216, NULL, NULL, NULL, &m_tag_data_hf }, + { TAG_SENSE_HF, TAG_TYPE_NTAG_213, nfc_tag_ntag_data_loadcb, nfc_tag_ntag_data_savecb, nfc_tag_ntag_data_factory, &m_tag_data_hf }, + { TAG_SENSE_HF, TAG_TYPE_NTAG_215, nfc_tag_ntag_data_loadcb, nfc_tag_ntag_data_savecb, nfc_tag_ntag_data_factory, &m_tag_data_hf }, + { TAG_SENSE_HF, TAG_TYPE_NTAG_216, nfc_tag_ntag_data_loadcb, nfc_tag_ntag_data_savecb, nfc_tag_ntag_data_factory, &m_tag_data_hf }, }; From 05b4158aba98822df5f8ca1905ff1a2bdf6d8622 Mon Sep 17 00:00:00 2001 From: ca1e Date: Mon, 12 Jun 2023 16:43:20 +0800 Subject: [PATCH 2/2] fix ntag21x implement --- .../application/src/rfid/nfctag/hf/nfc_mf1.c | 2 +- .../application/src/rfid/nfctag/hf/nfc_ntag.c | 128 ++++++++++++++---- .../application/src/rfid/nfctag/hf/nfc_ntag.h | 10 ++ 3 files changed, 111 insertions(+), 29 deletions(-) diff --git a/firmware/application/src/rfid/nfctag/hf/nfc_mf1.c b/firmware/application/src/rfid/nfctag/hf/nfc_mf1.c index e3e032bb..39a4f317 100644 --- a/firmware/application/src/rfid/nfctag/hf/nfc_mf1.c +++ b/firmware/application/src/rfid/nfctag/hf/nfc_mf1.c @@ -953,7 +953,7 @@ void nfc_tag_mf1_reset_handler() { * @return 假设 type == TAG_TYPE_MIFARE_1024， * 那么信息的长度应当是防冲撞信息加上配置信息再加上扇区大小的长度 */ -int get_information_size_by_tag_type(tag_specific_type_t type, bool auth_align) { +static int get_information_size_by_tag_type(tag_specific_type_t type, bool auth_align) { int size_raw = sizeof(nfc_tag_14a_coll_res_entity_t) + sizeof(nfc_tag_mf1_configure_t) + (get_block_max_by_tag_type(type) * NFC_TAG_MF1_DATA_SIZE); int size_align = size_raw + (size_raw % 4); return auth_align ? size_align : size_raw; diff --git a/firmware/application/src/rfid/nfctag/hf/nfc_ntag.c b/firmware/application/src/rfid/nfctag/hf/nfc_ntag.c index 72271049..419d9a54 100644 --- a/firmware/application/src/rfid/nfctag/hf/nfc_ntag.c +++ b/firmware/application/src/rfid/nfctag/hf/nfc_ntag.c @@ -11,10 +11,6 @@ #include "nrf_log_default_backends.h" NRF_LOG_MODULE_REGISTER(); -#define NTAG213_PAGES 45 //45 pages total for ntag213, from 0 to 44 -#define NTAG215_PAGES 135 //135 pages total for ntag215, from 0 to 134 -#define NTAG216_PAGES 231 //231 pages total for ntag216, from 0 to 230 - #define NTAG213_VERSION 0x0F #define NTAG215_VERSION 0x11 #define NTAG216_VERSION 0x13 @@ -29,17 +25,57 @@ NRF_LOG_MODULE_REGISTER(); #define CMD_PWD_AUTH 0x1B #define CMD_READ_SIG 0x3C +// MEMORY LAYOUT STUFF, addresses and sizes in bytes +// UID stuff +#define UID_CL1_ADDRESS 0x00 +#define UID_CL1_SIZE 3 +#define UID_BCC1_ADDRESS 0x03 +#define UID_CL2_ADDRESS 0x04 +#define UID_CL2_SIZE 4 +#define UID_BCC2_ADDRESS 0x08 +// LockBytes stuff +#define STATIC_LOCKBYTE_0_ADDRESS 0x0A +#define STATIC_LOCKBYTE_1_ADDRESS 0x0B +// CONFIG stuff +#define NTAG213_CONFIG_AREA_START_ADDRESS 0xA4 // 4 * 0x29 +#define NTAG215_CONFIG_AREA_START_ADDRESS 0x20C // 4 * 0x83 +#define NTAG216_CONFIG_AREA_START_ADDRESS 0x38C // 4 * 0xE3 +#define CONFIG_AREA_SIZE 8 +// CONFIG offsets, relative to config start address +#define CONF_AUTH0_OFFSET 0x03 +#define CONF_ACCESS_OFFSET 0x04 +#define CONF_PASSWORD_OFFSET 0x08 +#define CONF_PACK_OFFSET 0x0C + +// WRITE STUFF +#define BYTES_PER_WRITE 4 +#define PAGE_WRITE_MIN 0x02 + +// CONFIG masks to check individual needed bits +#define CONF_ACCESS_PROT 0x80 + +#define VERSION_INFO_LENGTH 8 //8 bytes info lenght + crc + +#define BYTES_PER_READ 16 + // SIGNATURE Lenght #define SIGNATURE_LENGTH 32 +// NTAG215_Version[7] mean: +// 0x0F ntag213 +// 0x11 ntag215 +// 0x13 ntag216 +const uint8_t ntagVersion[8] = {0x00, 0x04, 0x04, 0x02, 0x01, 0x00, 0x11, 0x03}; /* pwd auth for amiibo */ -static uint8_t NTAG215_PwdOK[2] = {0x80, 0x80}; +const uint8_t ntagPwdOK[2] = {0x80, 0x80}; // 指向标签信息的数据结构指针 static nfc_tag_ntag_information_t* m_tag_information = NULL; // 定义并且使用影子防冲撞资源 static nfc_tag_14a_coll_res_referen_t m_shadow_coll_res; -// 保存当前正在模拟的MF1的具体类型 +// 定义并且使用ntag专用通信缓冲区 +static nfc_tag_ntag_tx_buffer_t m_tag_tx_buffer; +// 保存当前正在模拟的NTAG的具体类型 static tag_specific_type_t m_tag_type; static int get_block_max_by_tag_type(tag_specific_type_t tag_type) { @@ -59,63 +95,99 @@ static int get_block_max_by_tag_type(tag_specific_type_t tag_type) { return block_max; } +static int get_block_cfg_by_tag_type(tag_specific_type_t tag_type) { + int block_max; + switch(tag_type) { + case TAG_TYPE_NTAG_213: + block_max = NTAG213_CONFIG_AREA_START_ADDRESS; + break; + default: + case TAG_TYPE_NTAG_215: + block_max = NTAG215_CONFIG_AREA_START_ADDRESS; + break; + case TAG_TYPE_NTAG_216: + block_max = NTAG216_CONFIG_AREA_START_ADDRESS; + break; + } + return block_max; +} + void nfc_tag_ntag_state_handler(uint8_t* p_data, uint16_t szDataBits) { uint8_t command = p_data[0]; uint8_t block_num = p_data[1]; switch(command) { case CMD_GET_VERSION: - p_data[0] = 0x00; - p_data[1] = 0x04; - p_data[2] = 0x04; - p_data[3] = 0x02; - p_data[4] = 0x01; - p_data[5] = 0x00; + memcpy(m_tag_tx_buffer.tx_buffer, ntagVersion, 8); switch (m_tag_type) { case TAG_TYPE_NTAG_213: - p_data[6] = NTAG213_VERSION; + m_tag_tx_buffer.tx_buffer[6] = NTAG213_VERSION; break; + default: case TAG_TYPE_NTAG_215: - p_data[6] = NTAG215_VERSION; + m_tag_tx_buffer.tx_buffer[6] = NTAG215_VERSION; break; case TAG_TYPE_NTAG_216: - p_data[6] = NTAG216_VERSION; + m_tag_tx_buffer.tx_buffer[6] = NTAG216_VERSION; break; } - p_data[7] = 0x03; - nfc_tag_14a_tx_bytes(p_data, 8, true); + nfc_tag_14a_tx_bytes(m_tag_tx_buffer.tx_buffer, 8, true); break; case CMD_READ: - if (block_num < 135) { + if (block_num < get_block_max_by_tag_type(m_tag_type)) { for (int block = 0; block < 4; block++) { - memcpy(p_data + block*4, m_tag_information->memory[block_num+block], NFC_TAG_NTAG_DATA_SIZE); + memcpy(m_tag_tx_buffer.tx_buffer + block*4, m_tag_information->memory[block_num+block], NFC_TAG_NTAG_DATA_SIZE); } - nfc_tag_14a_tx_bytes(p_data, NFC_TAG_NTAG_DATA_SIZE * 4, true); + nfc_tag_14a_tx_bytes(m_tag_tx_buffer.tx_buffer, BYTES_PER_READ, true); } else { nfc_tag_14a_tx_nbit_delay_window(NAK_INVALID_OPERATION_TBIV, 4); } break; case CMD_FAST_READ: - // TODO + uint8_t end_block_num = p_data[2]; + if ((block_num > end_block_num) || (block_num >= get_block_max_by_tag_type(m_tag_type)) || (end_block_num >= get_block_max_by_tag_type(m_tag_type))) { + nfc_tag_14a_tx_nbit_delay_window(NAK_INVALID_OPERATION_TBV, 4); + break; + } + for (int block = block_num; block <= end_block_num; block++) { + memcpy(m_tag_tx_buffer.tx_buffer + (block - block_num)*4, m_tag_information->memory[block], NFC_TAG_NTAG_DATA_SIZE); + } + nfc_tag_14a_tx_bytes(m_tag_tx_buffer.tx_buffer, (end_block_num - block_num + 1) * NFC_TAG_NTAG_DATA_SIZE, true); break; case CMD_WRITE: + // TODO nfc_tag_14a_tx_nbit_delay_window(ACK_VALUE, 4); break; case CMD_COMPAT_WRITE: + // TODO break; case CMD_PWD_AUTH: + /* TODO: IMPLEMENT COUNTER AUTHLIM */ + uint8_t Password[4]; + memcpy(Password, m_tag_information->memory[get_block_cfg_by_tag_type(m_tag_type) + CONF_PASSWORD_OFFSET], 4); + if (Password[0] != p_data[1] || Password[1] != p_data[2] || Password[2] != p_data[3] || Password[3] != p_data[4]) { + nfc_tag_14a_tx_nbit_delay_window(NAK_INVALID_OPERATION_TBIV, 4); + break; + } + /* Authenticate the user */ + //RESET AUTHLIM COUNTER, CURRENTLY NOT IMPLEMENTED + // TODO + /* Send the PACK value back */ if (m_tag_information->config.mode_uid_magic) { - nfc_tag_14a_tx_bytes(NTAG215_PwdOK, 2, true); + nfc_tag_14a_tx_bytes(ntagPwdOK, 2, true); + } else { + nfc_tag_14a_tx_bytes(m_tag_information->memory[get_block_cfg_by_tag_type(m_tag_type) + CONF_PASSWORD_OFFSET], 2, true); } break; case CMD_READ_SIG: - // TODO + memset(m_tag_tx_buffer.tx_buffer, 0xCA, SIGNATURE_LENGTH); + nfc_tag_14a_tx_bytes(m_tag_tx_buffer.tx_buffer, SIGNATURE_LENGTH, true); break; } return; } -nfc_tag_14a_coll_res_referen_t* get_miafre_coll_res() { +nfc_tag_14a_coll_res_referen_t* get_ntag_coll_res() { // 使用单独的防冲突信息，而不是使用扇区中的信息 m_shadow_coll_res.sak = m_tag_information->res_coll.sak; m_shadow_coll_res.atqa = m_tag_information->res_coll.atqa; @@ -130,11 +202,11 @@ void nfc_tag_ntag_reset_handler() { // TODO } -int get_information_size_by_tag_type(tag_specific_type_t type) { +static int get_information_size_by_tag_type(tag_specific_type_t type) { return sizeof(nfc_tag_14a_coll_res_entity_t) + sizeof(nfc_tag_ntag_configure_t) + (get_block_max_by_tag_type(type) * NFC_TAG_NTAG_DATA_SIZE); } -/** @brief mf1保存数据之前的回调 +/** @brief ntag保存数据之前的回调 * @param type 细化的标签类型 * @param buffer 数据缓冲区 * @return 需要保存的数据的长度，为0时表示不保存 @@ -157,7 +229,7 @@ int nfc_tag_ntag_data_loadcb(tag_specific_type_t type, tag_data_buffer_t* buffer m_tag_type = type; // 注册14a通信管理接口 nfc_tag_14a_handler_t handler_for_14a = { - .get_coll_res = get_miafre_coll_res, + .get_coll_res = get_ntag_coll_res, .cb_state = nfc_tag_ntag_state_handler, .cb_reset = nfc_tag_ntag_reset_handler, }; @@ -224,4 +296,4 @@ bool nfc_tag_ntag_data_factory(uint8_t slot, tag_specific_type_t tag_type) { NRF_LOG_ERROR("Factory slot data error."); } return ret; -} \ No newline at end of file +} diff --git a/firmware/application/src/rfid/nfctag/hf/nfc_ntag.h b/firmware/application/src/rfid/nfctag/hf/nfc_ntag.h index 060db703..1fded7b7 100644 --- a/firmware/application/src/rfid/nfctag/hf/nfc_ntag.h +++ b/firmware/application/src/rfid/nfctag/hf/nfc_ntag.h @@ -4,8 +4,14 @@ #include "nfc_14a.h" #define NFC_TAG_NTAG_DATA_SIZE 4 +#define NFC_TAG_NTAG_FRAME_SIZE 64 #define NFC_TAG_NTAG_BLOCK_MAX 231 +#define NTAG213_PAGES 45 //45 pages total for ntag213, from 0 to 44 +#define NTAG215_PAGES 135 //135 pages total for ntag215, from 0 to 134 +#define NTAG216_PAGES 231 //231 pages total for ntag216, from 0 to 230 + + typedef struct { uint8_t mode_uid_magic: 1; uint8_t detection_enable: 1; @@ -21,6 +27,10 @@ typedef struct __attribute__((aligned(4))) { uint8_t memory[NFC_TAG_NTAG_BLOCK_MAX][NFC_TAG_NTAG_DATA_SIZE]; } nfc_tag_ntag_information_t; +typedef struct { + uint8_t tx_buffer[NFC_TAG_NTAG_FRAME_SIZE]; +} nfc_tag_ntag_tx_buffer_t; + int nfc_tag_ntag_data_loadcb(tag_specific_type_t type, tag_data_buffer_t* buffer); int nfc_tag_ntag_data_savecb(tag_specific_type_t type, tag_data_buffer_t* buffer); bool nfc_tag_ntag_data_factory(uint8_t slot, tag_specific_type_t tag_type);