From 226f0495996228fd386f38991803993d41ed2cfb Mon Sep 17 00:00:00 2001
From: kormax <3392860+kormax@users.noreply.github.com>
Date: Sat, 25 Apr 2026 20:26:44 +0300
Subject: [PATCH] Make clearing the trace an explicit flag in FeliCa module

---
 armsrc/felica.c          |  2 +-
 client/src/cmdhffelica.c | 18 ++++++++++--------
 include/iso18.h          |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/armsrc/felica.c b/armsrc/felica.c
index e254d7cf8..60287e8f3 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -644,7 +644,7 @@ void felica_sendraw(const PacketCommandNG *c) {
     bool do_connect = ((param & FELICA_CONNECT) == FELICA_CONNECT);
     bool no_disconnect = ((param & FELICA_NO_DISCONNECT) == FELICA_NO_DISCONNECT);
 
-    if (do_connect) {
+    if ((param & FELICA_CLEARTRACE) == FELICA_CLEARTRACE) {
         clear_trace();
     }
 
diff --git a/client/src/cmdhffelica.c b/client/src/cmdhffelica.c
index b70cff3ac..d0e0d3010 100644
--- a/client/src/cmdhffelica.c
+++ b/client/src/cmdhffelica.c
@@ -1603,7 +1603,7 @@ static int info_seac(void) {
         // {0x05, FELICA_POLL_REQ, 0x01, 0x01, 0x0F},
         {0x05, FELICA_POLL_REQ, 0x01, 0x01, 0x01},
     };
-    const uint8_t seac_flags = FELICA_CONNECT | FELICA_RAW | FELICA_APPEND_CRC | FELICA_NO_SELECT;
+    const uint8_t seac_flags = FELICA_CONNECT | FELICA_CLEARTRACE | FELICA_RAW | FELICA_APPEND_CRC | FELICA_NO_SELECT;
 
     for (size_t i = 0; i < ARRAYLEN(seac_poll_frames); i++) {
         PacketResponseNG resp;
@@ -1643,7 +1643,7 @@ int read_felica_uid(bool loop, bool verbose) {
     int res = PM3_ETIMEOUT;
 
     do {
-        clear_and_send_command(FELICA_CONNECT, 0, NULL, false);
+        clear_and_send_command(FELICA_CONNECT | FELICA_CLEARTRACE, 0, NULL, false);
         PacketResponseNG resp;
         if (WaitForResponseTimeout(CMD_HF_FELICA_COMMAND, &resp, 2500)) {
 
@@ -1913,7 +1913,7 @@ static int send_request_specification_version(uint8_t flags, uint16_t datalen, u
 
 static int info_felica(bool verbose) {
 
-    clear_and_send_command(FELICA_CONNECT | FELICA_NO_DISCONNECT, 0, NULL, false);
+    clear_and_send_command(FELICA_CONNECT | FELICA_CLEARTRACE | FELICA_NO_DISCONNECT, 0, NULL, false);
     PacketResponseNG resp;
     if (WaitForResponseTimeout(CMD_HF_FELICA_COMMAND, &resp, 2500) == false) {
         DropField();
@@ -2368,7 +2368,7 @@ static int felica_discover_target(felica_card_select_t *card) {
 
     int last_status = PM3_ETIMEOUT;
     for (uint32_t attempt = 0; attempt < FELICA_TARGET_PRESENCE_ATTEMPTS; attempt++) {
-        clear_and_send_command(FELICA_CONNECT, 0, NULL, false);
+        clear_and_send_command(FELICA_CONNECT | FELICA_CLEARTRACE, 0, NULL, false);
 
         PacketResponseNG resp;
         if (WaitForResponseTimeout(CMD_HF_FELICA_COMMAND, &resp, 2500) == false) {
@@ -2417,7 +2417,7 @@ static int felica_presence_check_idm(const uint8_t *idm) {
     data[15] = 0x00;
 
     PacketResponseNG resp;
-    const uint8_t flags = FELICA_CONNECT | FELICA_NO_SELECT | FELICA_APPEND_CRC | FELICA_RAW;
+    const uint8_t flags = FELICA_CONNECT | FELICA_CLEARTRACE | FELICA_NO_SELECT | FELICA_APPEND_CRC | FELICA_RAW;
     const int ret = send_felica_payload_with_retries(flags, sizeof(data), data, false,
                                                      FELICA_RDBLK_ACK,
                                                      FELICA_DEFAULT_TIMEOUT_MS, FELICA_TARGET_PRESENCE_ATTEMPTS - 1U,
@@ -4418,7 +4418,7 @@ static int CmdHFFelicaDump(const char *Cmd) {
 
     PrintAndLogEx(INFO, "Press " _GREEN_("<Enter>") " to abort discovery or dumping");
 
-    uint8_t flags = FELICA_CONNECT | FELICA_NO_SELECT | FELICA_NO_DISCONNECT | FELICA_APPEND_CRC | FELICA_RAW;
+    uint8_t flags = FELICA_CONNECT | FELICA_CLEARTRACE | FELICA_NO_SELECT | FELICA_NO_DISCONNECT | FELICA_APPEND_CRC | FELICA_RAW;
 
     felica_dump_context_t dump_ctx;
     memset(&dump_ctx, 0, sizeof(dump_ctx));
@@ -4610,6 +4610,8 @@ static int CmdHFFelicaDiscoverNodes(const char *Cmd) {
     PrintAndLogEx(HINT, "Area and service codes are printed in network order.");
     PrintAndLogEx(INFO, "Press " _GREEN_("<Enter>") " to abort discovery");
 
+    // Do not set FELICA_CLEARTRACE here; auto discovery may try several methods
+    // before finding the supported one, and the trace should include all probes.
     uint8_t flags = FELICA_CONNECT | FELICA_NO_SELECT | FELICA_NO_DISCONNECT | FELICA_APPEND_CRC | FELICA_RAW;
     felica_scsvcode_context_t scsv_ctx;
     memset(&scsv_ctx, 0, sizeof(scsv_ctx));
@@ -4686,7 +4688,7 @@ static int CmdHFFelicaDumpServiceArea(const char *Cmd) {
     PrintAndLogEx(HINT, "Area and service codes are printed in network order.");
     PrintAndLogEx(INFO, "Press " _GREEN_("<Enter>") " to abort discovery");
 
-    uint8_t flags = FELICA_CONNECT | FELICA_NO_SELECT | FELICA_NO_DISCONNECT | FELICA_APPEND_CRC | FELICA_RAW;
+    uint8_t flags = FELICA_CONNECT | FELICA_CLEARTRACE | FELICA_NO_SELECT | FELICA_NO_DISCONNECT | FELICA_APPEND_CRC | FELICA_RAW;
     felica_scsvcode_context_t scsv_ctx;
     memset(&scsv_ctx, 0, sizeof(scsv_ctx));
     scsv_ctx.area_end_stack[0] = 0xFFFF;
@@ -5765,7 +5767,7 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
     }
 
     if (active || active_select) {
-        flags |= FELICA_CONNECT;
+        flags |= FELICA_CONNECT | FELICA_CLEARTRACE;
         if (active) {
             flags |= FELICA_NO_SELECT;
         }
diff --git a/include/iso18.h b/include/iso18.h
index e649d4729..082b35d9f 100644
--- a/include/iso18.h
+++ b/include/iso18.h
@@ -28,6 +28,7 @@ typedef enum FELICA_COMMAND {
     FELICA_RAW = (1 << 3),
     FELICA_APPEND_CRC = (1 << 5),
     FELICA_NO_SELECT = (1 << 6),
+    FELICA_CLEARTRACE = (1 << 7),
 } felica_command_t;
 
 typedef struct {