Moved global Usart state into usart struct
diff --git a/firmware/src_simtrace/ccid.c b/firmware/src_simtrace/ccid.c
index 2a16bd1..2d1959f 100644
--- a/firmware/src_simtrace/ccid.c
+++ b/firmware/src_simtrace/ccid.c
@@ -59,7 +59,7 @@
static const Pin pinIso7816RstMC = PIN_ISO7816_RSTMC;
static uint8_t sim_inserted = 0;
-static struct Usart_info usart_info = {.base = USART_SIM, .id = ID_USART_SIM};
+static struct Usart_info usart_info = {.base = USART_SIM, .id = ID_USART_SIM, .state = USART_RCV};
/*------------------------------------------------------------------------------
* Optional smartcard detection
diff --git a/firmware/src_simtrace/phone.c b/firmware/src_simtrace/phone.c
index f4f7660..82ba612 100644
--- a/firmware/src_simtrace/phone.c
+++ b/firmware/src_simtrace/phone.c
@@ -108,7 +108,7 @@
static const Pin pinPhoneRST = PIN_ISO7816_RST_PHONE;
-static struct Usart_info usart_info = {.base = USART_PHONE, .id = ID_USART_PHONE};
+static struct Usart_info usart_info = {.base = USART_PHONE, .id = ID_USART_PHONE, .state = USART_RCV};
#define PR TRACE_INFO
@@ -123,9 +123,6 @@
/*-----------------------------------------------------------------------------
* Internal variables
*-----------------------------------------------------------------------------*/
-/** Variable for state of send and receive froom USART */
-static uint8_t StateUsartGlobal = USART_RCV;
-
static uint8_t host_to_sim_buf[BUFLEN];
/*-----------------------------------------------------------------------------
diff --git a/firmware/src_simtrace/simtrace.h b/firmware/src_simtrace/simtrace.h
index 32c9fc3..83fc8b1 100644
--- a/firmware/src_simtrace/simtrace.h
+++ b/firmware/src_simtrace/simtrace.h
@@ -14,8 +14,16 @@
#define PHONE_DATAIN 5
#define PHONE_INT 6
-#define CLK_MASTER 1
-#define CLK_SLAVE 0
+#define CLK_MASTER true
+#define CLK_SLAVE false
+
+/* ===================================================*/
+/* Taken from iso7816_4.c */
+/* ===================================================*/
+/** Flip flop for send and receive char */
+#define USART_SEND 0
+#define USART_RCV 1
+
extern volatile ringbuf sim_rcv_buf;
diff --git a/firmware/src_simtrace/sniffer.c b/firmware/src_simtrace/sniffer.c
index 194d2e8..e0fb520 100644
--- a/firmware/src_simtrace/sniffer.c
+++ b/firmware/src_simtrace/sniffer.c
@@ -60,7 +60,7 @@
{VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
};
-static struct Usart_info usart_info = {.base = USART_PHONE, .id = ID_USART_PHONE};
+static struct Usart_info usart_info = {.base = USART_PHONE, .id = ID_USART_PHONE, .state = USART_RCV};
/*-----------------------------------------------------------------------------
* Initialization routine