laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16601 )
Change subject: card_emu: Initialize PTSS state every time we start PTS ...................................................................... card_emu: Initialize PTSS state every time we start PTS Let's shift the responsibility from the caller side to the calee side. Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 --- M firmware/libcommon/source/card_emu.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 63bf0d3..c3299de 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -240,7 +240,6 @@ tc_etu_disable(ch->tc_chan); - ch->pts.state = PTS_S_WAIT_REQ_PTSS; ch->tpdu.state = TPDU_S_WAIT_CLA; /* release any buffers we may still own */ @@ -534,8 +533,6 @@ /* update waiting time (see ISO 7816-3 10.2) */ ch->waiting_time = ch->wi * 960 * ch->fi; tc_etu_set_wtime(ch->tc_chan, ch->waiting_time); - /* reset PTS to initial state */ - set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); /* go to next state */ card_set_state(ch, ISO_S_WAIT_TPDU); return 0; @@ -701,7 +698,6 @@ emu_update_fidi(ch); /* Wait for the next TPDU */ card_set_state(ch, ISO_S_WAIT_TPDU); - set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); break; default: /* calculate the next state and set it */ @@ -979,6 +975,8 @@ switch (ch->state) { case ISO_S_WAIT_TPDU: if (byte == 0xff) { + /* reset PTS to initial state */ + set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); new_state = process_byte_pts(ch, byte); ch->stats.pps++; goto out_silent; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I39661ca93c87b2e2071765f69578eec5aaf90ce4 Gerrit-Change-Number: 16601 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <lafo...@osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <lafo...@osmocom.org> Gerrit-MessageType: merged