catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-23 16:58:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

card_emu: Ensure TX happens synchronously before state changes

Browse Source 
we cannot first chage the state and then transmit the byte
asynchronously later, this introduces race conditions.  Do it
in-line by explicit calls to the UART Tx function.
This commit is contained in:
Harald Welte
2016-02-24 21:00:46 +01:00
parent 849269f4cc
commit 855ba9e168
2 changed files with 67 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
firmware/src_simtrace/card_emu.c
View File

@@ -324,46 +324,61 @@ process_byte_pts(struct card_handle *ch, uint8_t byte)
} }
/* return a single byte to be transmitted to the reader */ /* return a single byte to be transmitted to the reader */
static int get_byte_pts(struct card_handle *ch, uint8_t *byte) static int tx_byte_pts(struct card_handle *ch)
{ {
uint8_t byte;
/* 1: Determine the next transmit byte */
switch (ch->pts.state) { switch (ch->pts.state) {
case PTS_S_WAIT_RESP_PTSS: case PTS_S_WAIT_RESP_PTSS:
*byte = ch->pts.resp[_PTSS]; byte = ch->pts.resp[_PTSS];
break; break;
case PTS_S_WAIT_RESP_PTS0: case PTS_S_WAIT_RESP_PTS0:
*byte = ch->pts.resp[_PTS0]; byte = ch->pts.resp[_PTS0];
break; break;
case PTS_S_WAIT_RESP_PTS1: case PTS_S_WAIT_RESP_PTS1:
*byte = ch->pts.resp[_PTS1]; byte = ch->pts.resp[_PTS1];
/* This must be TA1 */ /* This must be TA1 */
ch->fi = *byte >> 4; ch->fi = byte >> 4;
ch->di = *byte & 0xf; ch->di = byte & 0xf;
TRACE_DEBUG("found Fi=%u Di=%u\n", ch->fi, ch->di); TRACE_DEBUG("found Fi=%u Di=%u\n", ch->fi, ch->di);
//ch->sh.flags |= SIMTRACE_FLAG_PPS_FIDI;
break; break;
case PTS_S_WAIT_RESP_PTS2: case PTS_S_WAIT_RESP_PTS2:
*byte = ch->pts.resp[_PTS2]; byte = ch->pts.resp[_PTS2];
break; break;
case PTS_S_WAIT_RESP_PTS3: case PTS_S_WAIT_RESP_PTS3:
*byte = ch->pts.resp[_PTS3]; byte = ch->pts.resp[_PTS3];
break; break;
case PTS_S_WAIT_RESP_PCK: case PTS_S_WAIT_RESP_PCK:
*byte = ch->pts.resp[_PCK]; byte = ch->pts.resp[_PCK];
set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
/* update baud rate generator with Fi/Di */ /* update baud rate generator with Fi/Di */
update_fidi(ch); update_fidi(ch);
/* Wait for the next TPDU */ break;
card_set_state(ch, ISO_S_WAIT_TPDU);
default: default:
TRACE_DEBUG("get_byte_pts() in invalid state %u\n", TRACE_DEBUG("get_byte_pts() in invalid state %u\n",
ch->pts.state); ch->pts.state);
return 0;
}
/* 2: Transmit the byte */
card_emu_uart_tx(ch->uart_chan, byte);
/* 3: Update the state */
switch (ch->pts.state) {
case PTS_S_WAIT_RESP_PCK:
/* 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 */
set_pts_state(ch, next_pts_state(ch));
break; break;
} }
/* calculate the next state and set it */ /* return number of bytes transmitted */
set_pts_state(ch, next_pts_state(ch)); return 1;
return 0;
} }
@@ -540,11 +555,12 @@ process_byte_tpdu(struct card_handle *ch, uint8_t byte)
return ISO_S_IN_TPDU; return ISO_S_IN_TPDU;
} }
/* return a single byte to be transmitted to the reader */ /* tx a single byte to be transmitted to the reader */
static int get_byte_tpdu(struct card_handle *ch, uint8_t *byte) static int tx_byte_tpdu(struct card_handle *ch)
{ {
struct req_ctx *rctx; struct req_ctx *rctx;
struct cardemu_usb_msg_tx_data *td; struct cardemu_usb_msg_tx_data *td;
uint8_t byte;
/* ensure we are aware of any data that might be pending for /* ensure we are aware of any data that might be pending for
* transmit */ * transmit */
@@ -561,20 +577,10 @@ static int get_byte_tpdu(struct card_handle *ch, uint8_t *byte)
rctx = ch->uart_tx_ctx; rctx = ch->uart_tx_ctx;
td = (struct cardemu_usb_msg_tx_data *) rctx->data; td = (struct cardemu_usb_msg_tx_data *) rctx->data;
#if 0
/* FIXME: this must happen _after_ the byte has been transmittd */
switch (ch->tpdu.state) {
case TPDU_S_WAIT_PB:
if (td->flags & CEMU_DATA_F_PB_AND_TX)
set_tpdu_state(ch, TPDU_S_WAIT_TX);
else if (td->flags & CEMU_DATA_F_PB_AND_RX)
set_tpdu_state(ch, TPDU_S_WAIT_RX);
break;
}
#endif
/* take the next pending byte out of the rctx */ /* take the next pending byte out of the rctx */
*byte = td->data[rctx->idx++]; byte = td->data[rctx->idx++];
card_emu_uart_tx(ch->uart_chan, byte);
/* check if the buffer has now been fully transmitted */ /* check if the buffer has now been fully transmitted */
if ((rctx->idx >= td->hdr.data_len) || if ((rctx->idx >= td->hdr.data_len) ||
@@ -599,6 +605,16 @@ static int get_byte_tpdu(struct card_handle *ch, uint8_t *byte)
ch->uart_tx_ctx = NULL; ch->uart_tx_ctx = NULL;
} }
/* this must happen _after_ the byte has been transmittd */
switch (ch->tpdu.state) {
case TPDU_S_WAIT_PB:
if (td->flags & CEMU_DATA_F_PB_AND_TX)
set_tpdu_state(ch, TPDU_S_WAIT_TX);
else if (td->flags & CEMU_DATA_F_PB_AND_RX)
set_tpdu_state(ch, TPDU_S_WAIT_RX);
break;
}
return 1; return 1;
} }
@@ -642,26 +658,30 @@ out_silent:
card_set_state(ch, new_state); card_set_state(ch, new_state);
} }
/* return a single byte to be transmitted to the reader */ /* transmit a single byte to the reader */
int card_emu_get_tx_byte(struct card_handle *ch, uint8_t *byte) int card_emu_tx_byte(struct card_handle *ch)
{ {
int rc = 0; int rc = 0;
switch (ch->state) { switch (ch->state) {
case ISO_S_IN_ATR: case ISO_S_IN_ATR:
if (ch->atr.idx < ch->atr.len) { if (ch->atr.idx < ch->atr.len) {
*byte = ch->atr.atr[ch->atr.idx++]; uint8_t byte;
byte = ch->atr.atr[ch->atr.idx++];
rc = 1; rc = 1;
card_emu_uart_tx(ch->uart_chan, byte);
/* detect end of ATR */ /* detect end of ATR */
if (ch->atr.idx >= ch->atr.len) if (ch->atr.idx >= ch->atr.len)
card_set_state(ch, ISO_S_WAIT_TPDU); card_set_state(ch, ISO_S_WAIT_TPDU);
} }
break; break;
case ISO_S_IN_PTS: case ISO_S_IN_PTS:
rc = get_byte_pts(ch, byte); rc = tx_byte_pts(ch);
break; break;
case ISO_S_IN_TPDU: case ISO_S_IN_TPDU:
rc = get_byte_tpdu(ch, byte); rc = tx_byte_tpdu(ch);
break; break;
} }
@@ -678,9 +698,10 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)
{ {
switch (io) { switch (io) {
case CARD_IO_VCC: case CARD_IO_VCC:
if (active == 0) if (active == 0) {
tc_etu_disable(ch);
card_set_state(ch, ISO_S_WAIT_POWER); card_set_state(ch, ISO_S_WAIT_POWER);
else if (active == 1 && ch->vcc_active == 0) } else if (active == 1 && ch->vcc_active == 0)
card_set_state(ch, ISO_S_WAIT_CLK); card_set_state(ch, ISO_S_WAIT_CLK);
ch->vcc_active = active; ch->vcc_active = active;
break; break;
@@ -692,9 +713,13 @@ void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)
case CARD_IO_RST: case CARD_IO_RST:
if (active == 0 && ch->in_reset && if (active == 0 && ch->in_reset &&
ch->vcc_active && ch->clocked) { ch->vcc_active && ch->clocked) {
/* enable the TC/ETU counter once reset has been released */
tc_etu_enable(ch);
card_set_state(ch, ISO_S_WAIT_ATR); card_set_state(ch, ISO_S_WAIT_ATR);
/* FIXME: wait 400 clocks */ /* FIXME: wait 400 to 40k clock cycles before sending ATR */
card_set_state(ch, ISO_S_IN_ATR); card_set_state(ch, ISO_S_IN_ATR);
} else if (active) {
tc_etu_disable(ch);
} }
ch->in_reset = active; ch->in_reset = active;
break; break;

4
firmware/src_simtrace/card_emu.h
View File

@@ -15,8 +15,8 @@ struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uar
/* process a single byte received from the reader */ /* process a single byte received from the reader */
void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte); void card_emu_process_rx_byte(struct card_handle *ch, uint8_t byte);
/* return a single byte to be transmitted to the reader */ /* transmit a single byte to the reader */
int card_emu_get_tx_byte(struct card_handle *ch, uint8_t *byte); int card_emu_tx_byte(struct card_handle *ch);
/* hardware driver informs us that a card I/O signal has changed */ /* 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); void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active);