diff options
| author | Harald Welte <laforge@osmocom.org> | 2019-12-14 21:48:45 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2019-12-15 17:51:47 +0100 |
| commit | e92cb50a6e8db469dcd4b9f6194655e61634b182 (patch) | |
| tree | 32a1208df4400f59118433805bb26c7bf4449e14 | |
| parent | 17146791064365d29b925ea128685f8c63ce57e3 (diff) | |
card_emu: Factor out card_handle_reset() from card_emu_init()
Let's move all initialization of state that may change at runtime
to a separate function: card_handle_reset().
This has the advantage that the related function may also be called
at later/other instances, not just during initialization of card_emu.
Change-Id: I0954d192d001a3af5592010cc84a3a22aaf4b030
Related: OS#4251
| -rw-r--r-- | firmware/libcommon/source/card_emu.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index f95f5d1..7ce10a8 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -1,6 +1,6 @@ /* ISO7816-3 state machine for the card side * - * (C) 2010-2017 by Harald Welte <laforge@gnumonks.org> + * (C) 2010-2019 by Harald Welte <laforge@gnumonks.org> * (C) 2018 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de> * * This program is free software; you can redistribute it and/or modify @@ -233,6 +233,13 @@ struct card_handle { } stats; }; +/* reset all the 'dynamic' state of the card handle to the initial/default values */ +static void card_handle_reset(struct card_handle *ch) +{ + ch->pts.state = PTS_S_WAIT_REQ_PTSS; + ch->tpdu.state = TPDU_S_WAIT_CLA; +} + struct llist_head *card_emu_get_uart_tx_queue(struct card_handle *ch) { return &ch->uart_tx_queue; @@ -1189,8 +1196,7 @@ struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uar ch->atr.len = sizeof(default_atr); memcpy(ch->atr.atr, default_atr, ch->atr.len); - ch->pts.state = PTS_S_WAIT_REQ_PTSS; - ch->tpdu.state = TPDU_S_WAIT_CLA; + card_handle_reset(ch); tc_etu_init(ch->tc_chan, ch); |