catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-26 10:18:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

card_emu: Alwasys update state before enabling UART Rx/Tx

Browse Source 
The UART Rx/Tx irq might hit us before we actually reach the line that
changes the state.  So always update the state before enabling UART
Rx/Tx.
This commit is contained in:
Harald Welte
2016-03-20 13:38:39 +01:00
parent 52d554657c
commit 903d63a1e0
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/src_simtrace/card_emu.c
View File

@@ -261,6 +261,12 @@ static void emu_update_fidi(struct card_handle *ch)
static void card_set_state(struct card_handle *ch, static void card_set_state(struct card_handle *ch,
enum iso7816_3_card_state new_state) enum iso7816_3_card_state new_state)
{ {
if (ch->state == new_state)
return;
TRACE_DEBUG("7816 card state %u -> %u\r\n", ch->state, new_state);
ch->state = new_state;
switch (new_state) { switch (new_state) {
case ISO_S_WAIT_POWER: case ISO_S_WAIT_POWER:
case ISO_S_WAIT_CLK: case ISO_S_WAIT_CLK:
@@ -300,12 +306,6 @@ static void card_set_state(struct card_handle *ch,
/* do nothing */ /* do nothing */
break; break;
} }
if (ch->state == new_state)
return;
TRACE_DEBUG("7816 card state %u -> %u\r\n", ch->state, new_state);
ch->state = new_state;
} }
@@ -532,6 +532,8 @@ static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts)
TRACE_DEBUG("7816 TPDU state %u -> %u\r\n", ch->tpdu.state, new_ts); TRACE_DEBUG("7816 TPDU state %u -> %u\r\n", ch->tpdu.state, new_ts);
ch->tpdu.state = new_ts;
switch (new_ts) { switch (new_ts) {
case TPDU_S_WAIT_CLA: case TPDU_S_WAIT_CLA:
case TPDU_S_WAIT_RX: case TPDU_S_WAIT_RX:
@@ -546,8 +548,6 @@ static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts)
default: default:
break; break;
} }
ch->tpdu.state = new_ts;
} }
static enum tpdu_state next_tpdu_state(struct card_handle *ch) static enum tpdu_state next_tpdu_state(struct card_handle *ch)