card_emu: Avoid recursive calls to card_set_state()
A function that is called to set the state should not in itself
contain logic to issue further state changes.
Let's shift the related block out to the end of card_emu_io_statechg(),
which is the only source of card_set_state() calls for the
WAIT_{POWER,CLK,RST} states anyway.
As an added benefit, the block of statements is now also executed if
there's no state change - something that was prevented by the
"if old == new" state guard at the top of card_set_state(). I believe
this may help us to cover more (non-standard) card activation sequences.
Change-Id: Ieefa1807099eb234cfd994bca83caaa0dcc919b6
diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c
index c3299de..34fac1b 100644
--- a/firmware/libcommon/source/card_emu.c
+++ b/firmware/libcommon/source/card_emu.c
@@ -426,13 +426,6 @@
case ISO_S_WAIT_RST:
/* disable Rx and Tx of UART */
card_emu_uart_enable(ch->uart_chan, 0);
- /* check end activation state (only necessary if the reader to not respect the activation sequence) */
- if (ch->vcc_active && ch->clocked && !ch->in_reset) {
- /* enable the TC/ETU counter once reset has been released */
- tc_etu_enable(ch->tc_chan);
- /* prepare to send the ATR */
- card_set_state(ch, ISO_S_WAIT_ATR);
- }
break;
case ISO_S_WAIT_ATR:
/* Reset to initial Fi / Di ratio */
@@ -1111,6 +1104,23 @@
ch->in_reset = active;
break;
}
+
+ switch (ch->state) {
+ case ISO_S_WAIT_POWER:
+ case ISO_S_WAIT_CLK:
+ case ISO_S_WAIT_RST:
+ /* check end activation state (even if the reader does
+ * not respect the activation sequence) */
+ if (ch->vcc_active && ch->clocked && !ch->in_reset) {
+ /* enable the TC/ETU counter once reset has been released */
+ tc_etu_enable(ch->tc_chan);
+ /* prepare to send the ATR */
+ card_set_state(ch, ISO_S_WAIT_ATR);
+ }
+ break;
+ default:
+ break;
+ }
}
/* User sets a new ATR to be returned during next card reset */