From 193e4352db6ec9e6a97f7b1da016950f59d46faa Mon Sep 17 00:00:00 2001 From: Eric Betts Date: Mon, 22 Jul 2024 18:02:59 -0700 Subject: [PATCH] Change seader_worker_process_sam_message sig --- ccid.c | 2 +- seader_worker.c | 4 +--- seader_worker.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ccid.c b/ccid.c index 0b925c3..ce60a16 100644 --- a/ccid.c +++ b/ccid.c @@ -329,7 +329,7 @@ size_t seader_ccid_process(Seader* seader, uint8_t* cmd, size_t cmd_len) { if(message.bMessageType == CCID_MESSAGE_TYPE_RDR_to_PC_DataBlock) { if(hasSAM) { if(message.bSlot == sam_slot) { - seader_worker_process_sam_message(seader, &message); + seader_worker_process_sam_message(seader, message.payload, message.dwLength); } else { FURI_LOG_D(TAG, "Discarding message on non-sam slot"); } diff --git a/seader_worker.c b/seader_worker.c index 28abb72..8ec74de 100644 --- a/seader_worker.c +++ b/seader_worker.c @@ -114,9 +114,7 @@ bool seader_process_success_response(Seader* seader, uint8_t* apdu, size_t len) return true; } -bool seader_worker_process_sam_message(Seader* seader, CCID_Message* message) { - size_t len = message->dwLength; - uint8_t* apdu = message->payload; +bool seader_worker_process_sam_message(Seader* seader, uint8_t* apdu, uint32_t len) { SeaderWorker* seader_worker = seader->worker; SeaderUartBridge* seader_uart = seader_worker->uart; if(len < 2) { diff --git a/seader_worker.h b/seader_worker.h index 2bc3e97..6df18c5 100644 --- a/seader_worker.h +++ b/seader_worker.h @@ -62,7 +62,7 @@ void seader_worker_start( void* context); void seader_worker_stop(SeaderWorker* seader_worker); -bool seader_worker_process_sam_message(Seader* seader, CCID_Message* message); +bool seader_worker_process_sam_message(Seader* seader, uint8_t* apdu, uint32_t len); void seader_worker_send_version(Seader* seader); NfcCommand seader_worker_poller_callback_iso14443_4a(NfcGenericEvent event, void* context);