diff options
| author | Harald Welte <laforge@osmocom.org> | 2019-12-16 10:53:22 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2019-12-16 14:51:49 +0100 |
| commit | e213cc4f598a76e1ede7bfffc44a029173217af0 (patch) | |
| tree | 95f668a0e2ae6e7ced1dbefb956b0657a8c0b10b | |
| parent | a5bbe78d2d2b58477845a658f29fa9c8577d49f9 (diff) | |
cardem: Implement support for CEMU_FEAT_F_STATUS_IRQ
If this feature flag is set by the host application, we will start
generating SIMTRACE_MSGT_BD_CEMU_STATUS towards the interrupt endpoint
on any changes to the SIM card status, such as change of VCC/CLK/RST
Change-Id: I832b4ac4aeb6152195d985067ffdd64fa5a7d4cc
Related: OS#4330
| -rw-r--r-- | firmware/libcommon/source/card_emu.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 8da844f..7a541e5 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -38,7 +38,7 @@ #define NUM_SLOTS 2 /* bit-mask of supported CEMU_FEAT_F_ flags */ -#define SUPPORTED_FEATURES 0 +#define SUPPORTED_FEATURES (CEMU_FEAT_F_STATUS_IRQ) #define ISO7816_3_INIT_WTIME 9600 #define ISO7816_3_DEFAULT_WI 10 @@ -1106,15 +1106,19 @@ static void card_emu_report_config(struct card_handle *ch) /* hardware driver informs us that a card I/O signal has changed */ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active) { + uint32_t chg_mask = 0; + switch (io) { case CARD_IO_VCC: if (active == 0 && ch->vcc_active == 1) { TRACE_INFO("%u: VCC deactivated\r\n", ch->num); card_handle_reset(ch); card_set_state(ch, ISO_S_WAIT_POWER); + chg_mask |= CEMU_STATUS_F_VCC_PRESENT; } else if (active == 1 && ch->vcc_active == 0) { TRACE_INFO("%u: VCC activated\r\n", ch->num); card_set_state(ch, ISO_S_WAIT_CLK); + chg_mask |= CEMU_STATUS_F_VCC_PRESENT; } ch->vcc_active = active; break; @@ -1123,8 +1127,10 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active) TRACE_INFO("%u: CLK activated\r\n", ch->num); if (ch->state == ISO_S_WAIT_CLK) card_set_state(ch, ISO_S_WAIT_RST); + chg_mask |= CEMU_STATUS_F_CLK_ACTIVE; } else if (active == 0 && ch->clocked == 1) { TRACE_INFO("%u: CLK deactivated\r\n", ch->num); + chg_mask |= CEMU_STATUS_F_CLK_ACTIVE; } ch->clocked = active; break; @@ -1137,9 +1143,11 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active) /* prepare to send the ATR */ card_set_state(ch, ISO_S_WAIT_ATR); } + chg_mask |= CEMU_STATUS_F_RESET_ACTIVE; } else if (active && !ch->in_reset) { TRACE_INFO("%u: RST asserted\r\n", ch->num); card_handle_reset(ch); + chg_mask |= CEMU_STATUS_F_RESET_ACTIVE; } ch->in_reset = active; break; @@ -1159,6 +1167,10 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active) default: break; } + + /* notify the host about the state change */ + if ((ch->features & CEMU_FEAT_F_STATUS_IRQ) && chg_mask) + card_emu_report_status(ch, true); } /* User sets a new ATR to be returned during next card reset */ |