cleanup by prefixing methods with project name

ccid.c

@@ -27,7 +27,7 @@ size_t seader_ccid_add_lrc(uint8_t* data, size_t len) {
     return len + 1;
 }
 
-void PC_to_RDR_IccPowerOn(SeaderUartBridge* seader_uart) {
+void seader_ccid_IccPowerOn(SeaderUartBridge* seader_uart) {
     if(powered) {
         return;
     }
@@ -49,11 +49,11 @@ void PC_to_RDR_IccPowerOn(SeaderUartBridge* seader_uart) {
 void seader_ccid_check_for_sam(SeaderUartBridge* seader_uart) {
     hasSAM = false; // If someone is calling this, reset sam state
     powered = false;
-    PC_to_RDR_GetSlotStatus(seader_uart);
+    seader_ccid_GetSlotStatus(seader_uart);
 }
 
-void PC_to_RDR_GetSlotStatus(SeaderUartBridge* seader_uart) {
-    FURI_LOG_D(TAG, "PC_to_RDR_GetSlotStatus");
+void seader_ccid_GetSlotStatus(SeaderUartBridge* seader_uart) {
+    FURI_LOG_D(TAG, "seader_ccid_GetSlotStatus");
     memset(seader_uart->tx_buf, 0, SEADER_UART_RX_BUF_SIZE);
     seader_uart->tx_buf[0] = SYNC;
     seader_uart->tx_buf[1] = CTRL;
@@ -65,7 +65,7 @@ void PC_to_RDR_GetSlotStatus(SeaderUartBridge* seader_uart) {
     furi_thread_flags_set(furi_thread_get_id(seader_uart->tx_thread), WorkerEvtSamRx);
 }
 
-void PC_to_RDR_SetParameters(SeaderUartBridge* seader_uart) {
+void seader_ccid_SetParameters(SeaderUartBridge* seader_uart) {
     uint8_t T1 = 1;
     memset(seader_uart->tx_buf, 0, SEADER_UART_RX_BUF_SIZE);
     seader_uart->tx_buf[0] = SYNC;
@@ -83,7 +83,7 @@ void PC_to_RDR_SetParameters(SeaderUartBridge* seader_uart) {
     furi_thread_flags_set(furi_thread_get_id(seader_uart->tx_thread), WorkerEvtSamRx);
 }
 
-void PC_to_RDR_GetParameters(SeaderUartBridge* seader_uart) {
+void seader_ccid_GetParameters(SeaderUartBridge* seader_uart) {
     memset(seader_uart->tx_buf, 0, SEADER_UART_RX_BUF_SIZE);
     seader_uart->tx_buf[0] = SYNC;
     seader_uart->tx_buf[1] = CTRL;
@@ -100,7 +100,7 @@ void PC_to_RDR_GetParameters(SeaderUartBridge* seader_uart) {
     furi_thread_flags_set(furi_thread_get_id(seader_uart->tx_thread), WorkerEvtSamRx);
 }
 
-void PC_to_RDR_XfrBlock(SeaderUartBridge* seader_uart, uint8_t* data, size_t len) {
+void seader_ccid_XfrBlock(SeaderUartBridge* seader_uart, uint8_t* data, size_t len) {
     memset(seader_uart->tx_buf, 0, SEADER_UART_RX_BUF_SIZE);
     seader_uart->tx_buf[0] = SYNC;
     seader_uart->tx_buf[1] = CTRL;
@@ -114,7 +114,7 @@ void PC_to_RDR_XfrBlock(SeaderUartBridge* seader_uart, uint8_t* data, size_t len
 
     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, "PC_to_RDR_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);
 }
@@ -144,14 +144,14 @@ size_t seader_ccid_process(SeaderWorker* seader_worker, uint8_t* cmd, size_t cmd
                 retries = 0;
                 slot = 0;
                 sequence = 0;
-                PC_to_RDR_IccPowerOn(seader_uart);
+                seader_ccid_IccPowerOn(seader_uart);
                 break;
             case CARD_IN_2:
                 FURI_LOG_D(TAG, "Card Inserted (2)");
                 retries = 0;
                 slot = 1;
                 sequence = 0;
-                PC_to_RDR_IccPowerOn(seader_uart);
+                seader_ccid_IccPowerOn(seader_uart);
                 break;
             case CARD_IN_BOTH:
                 FURI_LOG_W(TAG, "Loading 2 cards not supported");
@@ -194,13 +194,13 @@ size_t seader_ccid_process(SeaderWorker* seader_worker, uint8_t* cmd, size_t cmd
         if(message.bMessageType == CCID_MESSAGE_TYPE_RDR_to_PC_SlotStatus) {
             uint8_t status = (message.bStatus & BMICCSTATUS_MASK);
             if(status == 0 || status == 1) {
-                PC_to_RDR_IccPowerOn(seader_uart);
+                seader_ccid_IccPowerOn(seader_uart);
                 return message.consumed;
             } else if(status == 2) {
                 FURI_LOG_W(TAG, "No ICC is present [retries %d]", retries);
                 if(retries-- > 1 && hasSAM == false) {
                     furi_delay_ms(100);
-                    PC_to_RDR_GetSlotStatus(seader_uart);
+                    seader_ccid_GetSlotStatus(seader_uart);
                 } else {
                     if(seader_worker->callback) {
                         seader_worker->callback(

ccid.h

@@ -83,9 +83,9 @@ struct CCID_Message {
 };
 
 void seader_ccid_check_for_sam(SeaderUartBridge* seader_uart);
-void PC_to_RDR_IccPowerOn(SeaderUartBridge* seader_uart);
-void PC_to_RDR_GetSlotStatus(SeaderUartBridge* seader_uart);
-void PC_to_RDR_SetParameters(SeaderUartBridge* seader_uart);
-void PC_to_RDR_GetParameters(SeaderUartBridge* seader_uart);
-void PC_to_RDR_XfrBlock(SeaderUartBridge* seader_uart, uint8_t* data, size_t len);
+void seader_ccid_IccPowerOn(SeaderUartBridge* seader_uart);
+void seader_ccid_GetSlotStatus(SeaderUartBridge* seader_uart);
+void seader_ccid_SetParameters(SeaderUartBridge* seader_uart);
+void seader_ccid_GetParameters(SeaderUartBridge* seader_uart);
+void seader_ccid_XfrBlock(SeaderUartBridge* seader_uart, uint8_t* data, size_t len);
 size_t seader_ccid_process(SeaderWorker* seader_worker, uint8_t* cmd, size_t cmd_len);

seader_worker.c

@@ -140,7 +140,7 @@ bool seader_send_apdu(
     apdu[4] = length;
     memcpy(apdu + APDU_HEADER_LEN, payload, length);
 
-    PC_to_RDR_XfrBlock(seader_uart, apdu, APDU_HEADER_LEN + length);
+    seader_ccid_XfrBlock(seader_uart, apdu, APDU_HEADER_LEN + length);
     free(apdu);
     return true;
 }
@@ -757,7 +757,7 @@ bool seader_process_apdu(SeaderWorker* seader_worker, uint8_t* apdu, size_t len)
     case 0x61:
         // FURI_LOG_I(TAG, "Request %d bytes", SW2);
         GET_RESPONSE[4] = SW2;
-        PC_to_RDR_XfrBlock(seader_uart, GET_RESPONSE, sizeof(GET_RESPONSE));
+        seader_ccid_XfrBlock(seader_uart, GET_RESPONSE, sizeof(GET_RESPONSE));
         return true;
         break;