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

card_emu: Introduce new flush_rx_buffer() function and use it

Browse Source
This commit is contained in:
Harald Welte
2015-11-14 21:15:52 +01:00
parent e7194abb9e
commit b5288e8ac4
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
firmware/src_simtrace/card_emu.c
View File

@@ -145,6 +145,26 @@ struct card_handle {
static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts); static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts);
static void set_pts_state(struct card_handle *ch, enum pts_state new_ptss); static void set_pts_state(struct card_handle *ch, enum pts_state new_ptss);
static void flush_rx_buffer(struct card_handle *ch)
{
struct req_ctx *rctx;
struct cardemu_usb_msg_rx_data *rd;
rctx = ch->uart_rx_ctx;
if (!rctx)
return;
rd = (struct cardemu_usb_msg_rx_data *) ch->uart_rx_ctx->data;
/* store length of data payload fild in header */
rd->hdr.data_len = rctx->idx;
req_ctx_set_state(rctx, RCTX_S_USB_TX_PENDING);
ch->uart_rx_ctx = NULL;
/* FIXME: call into USB code to see if this buffer can
* be transmitted now */
}
static void update_fidi(struct card_handle *ch) static void update_fidi(struct card_handle *ch)
{ {
int rc; int rc;
@@ -359,7 +379,7 @@ static void add_tpdu_byte(struct card_handle *ch, uint8_t byte)
/* ensure we have a buffer */ /* ensure we have a buffer */
if (!ch->uart_rx_ctx) { if (!ch->uart_rx_ctx) {
ch->uart_rx_ctx = req_ctx_find_get(1, RCTX_S_FREE, RCTX_S_UART_RX_BUSY); rctx = ch->uart_rx_ctx = req_ctx_find_get(1, RCTX_S_FREE, RCTX_S_UART_RX_BUSY);
if (!ch->uart_rx_ctx) if (!ch->uart_rx_ctx)
return; return;
rd = (struct cardemu_usb_msg_rx_data *) ch->uart_rx_ctx->data; rd = (struct cardemu_usb_msg_rx_data *) ch->uart_rx_ctx->data;
@@ -375,14 +395,8 @@ static void add_tpdu_byte(struct card_handle *ch, uint8_t byte)
rctx->tot_len++; rctx->tot_len++;
/* check if the buffer is full. If so, send it */ /* check if the buffer is full. If so, send it */
if (rctx->tot_len >= rctx->size) { if (rctx->tot_len >= rctx->size)
/* store length of data payload fild in header */ flush_rx_buffer(ch);
rd->hdr.data_len = rctx->idx;
req_ctx_set_state(rctx, RCTX_S_USB_TX_PENDING);
ch->uart_rx_ctx = NULL;
/* FIXME: call into USB code to see if this buffer can
* be transmitted now */
}
} }
static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts) static void set_tpdu_state(struct card_handle *ch, enum tpdu_state new_ts)
@@ -441,10 +455,7 @@ static void send_tpdu_header(struct card_handle *ch)
/* if we already/still have a context, send it off */ /* if we already/still have a context, send it off */
if (ch->uart_rx_ctx && ch->uart_rx_ctx->idx) { if (ch->uart_rx_ctx && ch->uart_rx_ctx->idx) {
/* FIXME: do we need to initialize the USB protocol flush_rx_buffer(ch);
* header? .... */
req_ctx_set_state(ch->uart_rx_ctx, RCTX_S_USB_TX_PENDING);
ch->uart_rx_ctx = NULL;
} }
/* ensure we have a new buffer */ /* ensure we have a new buffer */
@@ -462,9 +473,9 @@ static void send_tpdu_header(struct card_handle *ch)
/* copy TPDU header to data field */ /* copy TPDU header to data field */
memcpy(rd->data, ch->tpdu.hdr, sizeof(ch->tpdu.hdr)); memcpy(rd->data, ch->tpdu.hdr, sizeof(ch->tpdu.hdr));
rd->hdr.data_len = sizeof(ch->tpdu.hdr); /* rd->data_len is set in flush_rx_buffer() */
req_ctx_set_state(rctx, RCTX_S_USB_TX_PENDING); flush_rx_buffer(ch);
} }
static enum iso7816_3_card_state static enum iso7816_3_card_state