From b50a757940f727b87763b98cab862f912daf0cd0 Mon Sep 17 00:00:00 2001
From: Eric Betts <bettse@fastmail.fm>
Date: Fri, 17 Nov 2023 22:22:06 -0800
Subject: [PATCH] switch queue message to simple struct

---
 ccid.c            |  2 +-
 seader_worker.c   | 27 ++++++++++++---------------
 seader_worker.h   |  1 +
 seader_worker_i.h |  7 ++++++-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ccid.c b/ccid.c
index e6c5c17..3b2b0c4 100644
--- a/ccid.c
+++ b/ccid.c
@@ -125,7 +125,7 @@ void seader_ccid_XfrBlockToSlot(
 
     memcpy(seader_uart->tx_buf + 2 + 10, data, len);
     seader_uart->tx_len = seader_ccid_add_lrc(seader_uart->tx_buf, 2 + 10 + len);
-    FURI_LOG_I(TAG, "seader_ccid_XfrBlock %d bytes", seader_uart->tx_len);
+    // FURI_LOG_I(TAG, "seader_ccid_XfrBlock %d bytes", seader_uart->tx_len);
 
     furi_thread_flags_set(furi_thread_get_id(seader_uart->tx_thread), WorkerEvtSamRx);
 }
diff --git a/seader_worker.c b/seader_worker.c
index 25689df..0703c2a 100644
--- a/seader_worker.c
+++ b/seader_worker.c
@@ -35,7 +35,7 @@ SeaderWorker* seader_worker_alloc() {
     // Worker thread attributes
     seader_worker->thread =
         furi_thread_alloc_ex("SeaderWorker", 8192, seader_worker_task, seader_worker);
-    seader_worker->messages = furi_message_queue_alloc(2, SEADER_UART_RX_BUF_SIZE);
+    seader_worker->messages = furi_message_queue_alloc(2, sizeof(SeaderAPDU));
     seader_worker->mq_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
 
     seader_worker->callback = NULL;
@@ -739,14 +739,14 @@ bool seader_process_success_response(Seader* seader, uint8_t* apdu, size_t len)
         FURI_LOG_I(TAG, "Queue New SAM Message, %d bytes", len);
         uint32_t space = furi_message_queue_get_space(seader_worker->messages);
         if(space > 0) {
-            BitBuffer* buffer = bit_buffer_alloc(SEADER_POLLER_MAX_BUFFER_SIZE);
-            bit_buffer_append_bytes(buffer, apdu, len);
+            SeaderAPDU seaderApdu = {};
+            seaderApdu.len = len;
+            memcpy(seaderApdu.buf, apdu, len);
 
             if(furi_mutex_acquire(seader_worker->mq_mutex, FuriWaitForever) == FuriStatusOk) {
-                furi_message_queue_put(seader_worker->messages, buffer, FuriWaitForever);
+                furi_message_queue_put(seader_worker->messages, &seaderApdu, FuriWaitForever);
                 furi_mutex_release(seader_worker->mq_mutex);
             }
-            //bit_buffer_free(buffer);
         }
     }
     return true;
@@ -762,14 +762,14 @@ bool seader_process_apdu(Seader* seader, uint8_t* apdu, size_t len) {
     for(uint8_t i = 0; i < len; i++) {
         snprintf(display + (i * 2), sizeof(display), "%02x", apdu[i]);
     }
-    FURI_LOG_I(TAG, "APDU: %s", display);
+    // FURI_LOG_I(TAG, "APDU: %s", display);
 
     uint8_t SW1 = apdu[len - 2];
     uint8_t SW2 = apdu[len - 1];
 
     switch(SW1) {
     case 0x61:
-        FURI_LOG_I(TAG, "Request %d bytes", SW2);
+        // FURI_LOG_I(TAG, "Request %d bytes", SW2);
         GET_RESPONSE[4] = SW2;
         seader_ccid_XfrBlock(seader_uart, GET_RESPONSE, sizeof(GET_RESPONSE));
         return true;
@@ -858,10 +858,9 @@ SeaderPollerEventType
         if(count > 0) {
             FURI_LOG_D(TAG, "Conversation: %ld messages", count);
 
-            BitBuffer* message =
-                bit_buffer_alloc(furi_message_queue_get_message_size(seader_worker->messages));
+            SeaderAPDU seaderApdu = {};
             FuriStatus status =
-                furi_message_queue_get(seader_worker->messages, message, FuriWaitForever);
+                furi_message_queue_get(seader_worker->messages, &seaderApdu, FuriWaitForever);
             if(status != FuriStatusOk) {
                 FURI_LOG_W(TAG, "furi_message_queue_get fail %d", status);
                 if(seader_worker->callback) {
@@ -869,16 +868,14 @@ SeaderPollerEventType
                 }
                 return SeaderPollerEventTypeComplete;
             }
-            size_t len = bit_buffer_get_size_bytes(message);
-            uint8_t* payload = (uint8_t*)bit_buffer_get_data(message);
-            FURI_LOG_D(TAG, "Conversation: message length %d", len);
+            FURI_LOG_D(TAG, "Conversation: message length %d", seaderApdu.len);
 
-            if(seader_process_success_response_i(seader, payload, len, true, iso14443_4a_poller)) {
+            if(seader_process_success_response_i(
+                   seader, seaderApdu.buf, seaderApdu.len, true, iso14443_4a_poller)) {
             } else {
                 FURI_LOG_I(TAG, "Response false");
                 stage = SeaderPollerEventTypeComplete;
             }
-            //bit_buffer_free(message);
         }
         furi_mutex_release(seader_worker->mq_mutex);
     } else {
diff --git a/seader_worker.h b/seader_worker.h
index 180ff22..bdfc41e 100644
--- a/seader_worker.h
+++ b/seader_worker.h
@@ -7,6 +7,7 @@
 
 typedef struct SeaderWorker SeaderWorker;
 typedef struct CCID_Message CCID_Message;
+typedef struct SeaderAPDU SeaderAPDU;
 
 typedef enum {
     // Init states
diff --git a/seader_worker_i.h b/seader_worker_i.h
index 62d58fb..2ac6422 100644
--- a/seader_worker_i.h
+++ b/seader_worker_i.h
@@ -14,7 +14,7 @@
 #include <SamVersion.h>
 
 #define SEADER_POLLER_MAX_FWT (200000U)
-#define SEADER_POLLER_MAX_BUFFER_SIZE (64U)
+#define SEADER_POLLER_MAX_BUFFER_SIZE (255U)
 
 struct SeaderWorker {
     FuriThread* thread;
@@ -31,6 +31,11 @@ struct SeaderWorker {
     SeaderWorkerState state;
 };
 
+struct SeaderAPDU {
+    size_t len;
+    uint8_t buf[SEADER_POLLER_MAX_BUFFER_SIZE];
+};
+
 void seader_worker_change_state(SeaderWorker* seader_worker, SeaderWorkerState state);
 
 int32_t seader_worker_task(void* context);