nfc/dnfc/nfc bbio modes refactoring cleanup

hydrabus · Jul 4, 2021 · b2bb3a3 · b2bb3a3
1 parent 77ea467
commit b2bb3a3
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 128 deletions.
diff --git a/src/hydranfc_v2/ce.c b/src/hydranfc_v2/ce.c
@@ -28,8 +28,9 @@
 #include "st25r3916.h"
 
 #include "bsp_print_dbg.h"
+
+#include "hydranfc_v2.h"
 #include "hydranfc_v2_ce.h"
-#include "hydranfc_v2_nfc_mode.h"
 
 void ceNfcaCardemu4A(uint8_t mode, rfalIsoDepTxRxParam *isoDepTxRxParam);
 void ceNfcfCardemu3(uint8_t mode, rfalTransceiveContext *ctx);

diff --git a/src/hydranfc_v2/hydranfc_v2_common.c → src/hydranfc_v2/hydranfc_v2.c b/src/hydranfc_v2/hydranfc_v2_common.c → src/hydranfc_v2/hydranfc_v2.c
@@ -26,8 +26,7 @@
 #include "st25r3916_irq.h"
 #include "st25r3916_aat.h"
 
-#include "hydranfc_v2_common.h"
-#include "hydranfc_v2_nfc_mode.h"
+#include "hydranfc_v2.h"
 
 /*
 static volatile int irq_count;

diff --git a/src/hydranfc_v2/hydranfc_v2_common.h → src/hydranfc_v2/hydranfc_v2.h b/src/hydranfc_v2/hydranfc_v2_common.h → src/hydranfc_v2/hydranfc_v2.h
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#ifndef _HYDRANFC_V2_COMMON_H_
-#define _HYDRANFC_V2_COMMON_H_
+#ifndef _HYDRANFC_V2_H_
+#define _HYDRANFC_V2_H_
 
 #include "common.h"
 
@@ -54,5 +54,5 @@ void hydranfc_v2_set_irq(irq_callback_t st25r3916_irq_callback);
 
 void hydranfc_v2_cleanup(t_hydra_console *con);
 
-#endif /* _HYDRANFC_V2_NFC_MODE_H_ */
+#endif /* _HYDRANFC_V2_H_ */
 
diff --git a/src/hydranfc_v2/hydranfc_v2.mk b/src/hydranfc_v2/hydranfc_v2.mk
@@ -1,5 +1,5 @@
 # List of all the hydranfc related files.
-HYDRANFC_V2_SRC = hydranfc_v2/hydranfc_v2_common.c \
+HYDRANFC_V2_SRC = hydranfc_v2/hydranfc_v2.c \
                   hydranfc_v2/hydranfc_v2_nfc_mode.c \
                   hydranfc_v2/hydranfc_v2_dnfc_mode.c \
                   hydranfc_v2/hydranfc_v2_ce.c \

diff --git a/src/hydranfc_v2/hydranfc_v2_bbio_card_emulator.c b/src/hydranfc_v2/hydranfc_v2_bbio_card_emulator.c
@@ -40,8 +40,7 @@
 #include "bsp_print_dbg.h"
 #include <string.h>
 
-#include "hydranfc_v2_common.h"
-#include "hydranfc_v2_nfc_mode.h"
+#include "hydranfc_v2.h"
 #include "hydranfc_v2_bbio_card_emulator.h"
 
 enum cardEmulationCommand {

diff --git a/src/hydranfc_v2/hydranfc_v2_bbio_reader.c b/src/hydranfc_v2/hydranfc_v2_bbio_reader.c
@@ -31,8 +31,7 @@
 #include "rfal_nfcb.h"
 #include "rfal_nfcv.h"
 
-#include "hydranfc_v2_common.h"
-#include "hydranfc_v2_nfc_mode.h"
+#include "hydranfc_v2.h"
 
 extern t_mode_config mode_con1;
 

diff --git a/src/hydranfc_v2/hydranfc_v2_ce.c b/src/hydranfc_v2/hydranfc_v2_ce.c
@@ -1,7 +1,7 @@
 /*
  * HydraBus/HydraNFC v2
  *
- * Copyright (C) 2020 Benjamin VERNOUX
+ * Copyright (C) 2020/2021 Benjamin VERNOUX
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,12 +34,12 @@
 #include "st25r3916_irq.h"
 
 #include "bsp_print_dbg.h"
-#include "hydranfc_v2_ce.h"
-#include "hydranfc_v2_nfc_mode.h"
 
 #include "ff.h"
 #include "microsd.h"
 
+#include "hydranfc_v2.h"
+#include "hydranfc_v2_ce.h"
 
 static uint8_t rxtxFrameBuf[512] __attribute__ ((section(".cmm")));
 

diff --git a/src/hydranfc_v2/hydranfc_v2_dnfc_mode.c b/src/hydranfc_v2/hydranfc_v2_dnfc_mode.c
@@ -44,9 +44,8 @@
 #include "rfal_poller.h"
 #include "rfal_nfca.h"
 
-#include "hydranfc_v2_common.h"
-#include "hydranfc_v2_nfc_mode.h"
-#include "hydranfc_v2_dnfc_mode.h"
+#include "hydrabus_mode.h"
+#include "hydranfc_v2.h"
 
 static int exec(t_hydra_console *con, t_tokenline_parsed *p, int token_pos);
 static int show(t_hydra_console *con, t_tokenline_parsed *p);

diff --git a/src/hydranfc_v2/hydranfc_v2_dnfc_mode.h b/src/hydranfc_v2/hydranfc_v2_dnfc_mode.h
diff --git a/src/hydranfc_v2/hydranfc_v2_nfc_mode.c b/src/hydranfc_v2/hydranfc_v2_nfc_mode.c
@@ -21,7 +21,6 @@
 #include "common.h"
 #include "tokenline.h"
 #include "hydrabus_mode.h"
-#include "hydranfc_v2_nfc_mode.h"
 #include "bsp_spi.h"
 #include "bsp_gpio.h"
 #include "ff.h"
@@ -51,10 +50,65 @@
 
 #include "rfal_poller.h"
 
-#include "hydranfc_v2_common.h"
+#include "hydranfc_v2.h"
 #include "hydranfc_v2_ce.h"
 #include "hydranfc_v2_reader.h"
 
+#define MIFARE_DATA_MAX     20
+/* Does not managed UID > 4+BCC to be done later ... */
+#define MIFARE_UID_MAX      11
+#define VICINITY_UID_MAX    16
+
+#define MIFARE_ATQA_MAX (4)
+#define MIFARE_SAK_MAX (4)
+#define MIFARE_HALT_MAX (4)
+#define MIFARE_UL_DATA_MAX (64)
+
+#define NFC_TX_RAWDATA_BUF_SIZE (64)
+extern unsigned char nfc_tx_rawdata_buf[NFC_TX_RAWDATA_BUF_SIZE+1];
+
+/* Structure used & filled by hydranfc_scan_iso14443A() */
+typedef struct {
+	uint8_t atqa_buf_nb_rx_data;
+	uint8_t atqa_buf[MIFARE_ATQA_MAX];
+
+	uint8_t uid_buf_nb_rx_data;
+	uint8_t uid_buf[MIFARE_UID_MAX];
+
+	uint8_t sak1_buf_nb_rx_data;
+	uint8_t sak1_buf[MIFARE_SAK_MAX];
+
+	uint8_t sak2_buf_nb_rx_data;
+	uint8_t sak2_buf[MIFARE_SAK_MAX];
+
+	uint8_t halt_buf_nb_rx_data;
+	uint8_t halt_buf[MIFARE_HALT_MAX];
+
+	uint8_t mf_ul_data_nb_rx_data;
+	uint8_t mf_ul_data[MIFARE_UL_DATA_MAX];
+} t_hydranfc_scan_iso14443A;
+
+bool hydranfc_init(t_hydra_console *con);
+void hydranfc_cleanup(t_hydra_console *con);
+
+void hydranfc_show_registers(t_hydra_console *con);
+
+void hydranfc_scan_iso14443A(t_hydranfc_scan_iso14443A *data);
+
+void hydranfc_scan_mifare(t_hydra_console *con);
+void hydranfc_scan_vicinity(t_hydra_console *con);
+
+void hydranfc_sniff_14443A(t_hydra_console *con, bool start_of_frame, bool end_of_frame, bool sniff_trace_uart1);
+void hydranfc_sniff_14443A_bin(t_hydra_console *con, bool start_of_frame, bool end_of_frame, bool parity);
+void hydranfc_sniff_14443AB_bin_raw(t_hydra_console *con, bool start_of_frame, bool end_of_frame);
+
+void hydranfc_emul_mifare(t_hydra_console *con, uint32_t mifare_uid);
+
+void hydranfc_emul_iso14443a(t_hydra_console *con);
+
+void hydranfc_emul_mf_ultralight(t_hydra_console *con);
+int hydranfc_emul_mf_ultralight_file(t_hydra_console *con, char* filename);
+
 extern void hydranfc_ce_common(t_hydra_console *con, bool quiet);
 extern uint32_t user_uid_len;
 extern uint8_t user_uid[8];

diff --git a/src/hydranfc_v2/hydranfc_v2_nfc_mode.h b/src/hydranfc_v2/hydranfc_v2_nfc_mode.h
diff --git a/src/hydranfc_v2/hydranfc_v2_reader.c b/src/hydranfc_v2/hydranfc_v2_reader.c
@@ -2,7 +2,7 @@
  * HydraBus/HydraNFC
  *
  * Copyright (C) 2020 Guillaume VINET
- * Copyright (C) 2014-2020 Benjamin VERNOUX
+ * Copyright (C) 2014-2021 Benjamin VERNOUX
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 
 #include "common.h"
 #include "tokenline.h"
-#include "hydranfc_v2_nfc_mode.h"
 #include "rfal_rf.h"
 #include "hydrabus_bbio.h"
 #include "hydranfc_v2_bbio_reader.h"
@@ -31,9 +30,11 @@
 #include "rfal_nfca.h"
 #include "rfal_nfcb.h"
 #include "rfal_nfcv.h"
-#include "hydranfc_v2_reader.h"
 #include <string.h>
 
+#include "hydranfc_v2.h"
+#include "hydranfc_v2_reader.h"
+
 static uint8_t tx_buffer[260];
 static uint8_t rx_buffer[260];
 static uint16_t tx_buffer_len, rx_buffer_len;