diff options
| author | Harald Welte <laforge@osmocom.org> | 2021-06-01 20:29:40 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2021-06-01 21:09:05 +0200 |
| commit | c1033c86117bca61baa3fc1b507f0414e723fa72 (patch) | |
| tree | b191aa7f96e84dc426f7f30ed05a1c66161534f2 | |
| parent | 644c2131ca7b8711b9f92772ab836030c4da0050 (diff) | |
simtrace2-cardem-pcsc: Reset the real card if reader resets cardem
When the cardem detects a reset from the phone/modem, pass this on
to the actual card via the PC/SC reader. This is important to
reset the card state whenever requested by the stack/driver on the
phone/modem.
Change-Id: I7056476c5f81e8aa8f550afb86bf2380d1497ebb
Depends: libosmocore 20199da02d37a6d284915a27ec12641e79b8781c
| -rw-r--r-- | host/src/simtrace2-cardem-pcsc.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 532c5ba..af34d3f 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -74,6 +74,27 @@ static void cemu_flags2str(char *out, unsigned int out_len, uint32_t flags) flags & CEMU_STATUS_F_RCEMU_ACTIVE ? "RCEMU " : ""); } +static uint32_t last_flags = 0; + +static void update_flags(struct osmo_st2_cardem_inst *ci, uint32_t flags) +{ + struct osim_card_hdl *card = ci->chan->card; + + if ((flags & CEMU_STATUS_F_VCC_PRESENT) && (flags & CEMU_STATUS_F_CLK_ACTIVE) && + !(flags & CEMU_STATUS_F_RESET_ACTIVE)) { + if (last_flags & CEMU_STATUS_F_RESET_ACTIVE) { + /* a reset has just ended, forward it to the real card */ + bool cold_reset = true; + if (last_flags & CEMU_STATUS_F_VCC_PRESENT) + cold_reset = false; + LOGCI(ci, LOGL_NOTICE, "%s Resetting card in reader...\n", + cold_reset ? "Cold" : "Warm"); + osim_card_reset(card, cold_reset); + } + } + last_flags = flags; +} + /*********************************************************************** * Incoming Messages ***********************************************************************/ @@ -89,6 +110,8 @@ static int process_do_status(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); + update_flags(ci, status->flags); + return 0; } @@ -195,6 +218,8 @@ static int process_irq_status(struct osmo_st2_cardem_inst *ci, const uint8_t *bu status->flags, status->fi, status->di, status->wi, status->waiting_time, fbuf); + update_flags(ci, status->flags); + return 0; } |