<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16617">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cardem: Add SIMTRACE_MSGT_BD_CEMU_CONFIG<br><br>The new SIMTRACE_MSGT_BD_CEMU_CONFIG command can be used to set/change<br>a bitmask of optional features that can be enabled in the simtrace<br>by the host software. This is useful for enabling features in the<br>firmware which are not supported by older host utilities.<br><br>The firmware will return the actually set/configured features in<br>response.<br><br>The feature bitmask is not yet used anywhere; it will be by subequent<br>patches.<br><br>Change-Id: I7cdd3f9171dbed45de0089defe29d2b59044bd84<br>---<br>M firmware/libcommon/include/card_emu.h<br>M firmware/libcommon/include/simtrace_prot.h<br>M firmware/libcommon/source/card_emu.c<br>M firmware/libcommon/source/mode_cardemu.c<br>4 files changed, 54 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/include/card_emu.h b/firmware/libcommon/include/card_emu.h</span><br><span>index aaa07c5..8a73d5c 100644</span><br><span>--- a/firmware/libcommon/include/card_emu.h</span><br><span>+++ b/firmware/libcommon/include/card_emu.h</span><br><span>@@ -66,3 +66,7 @@</span><br><span> void card_emu_uart_enable(uint8_t uart_chan, uint8_t rxtx);</span><br><span> void card_emu_uart_wait_tx_idle(uint8_t uart_chan);</span><br><span> void card_emu_uart_interrupt(uint8_t uart_chan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct cardemu_usb_msg_config;</span><br><span style="color: hsl(120, 100%, 40%);">+int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int scfg_len);</span><br><span>diff --git a/firmware/libcommon/include/simtrace_prot.h b/firmware/libcommon/include/simtrace_prot.h</span><br><span>index 878bc34..eca844a 100644</span><br><span>--- a/firmware/libcommon/include/simtrace_prot.h</span><br><span>+++ b/firmware/libcommon/include/simtrace_prot.h</span><br><span>@@ -62,6 +62,8 @@</span><br><span> SIMTRACE_MSGT_DO_CEMU_RX_DATA,</span><br><span> /* Indicate PTS request from phone */</span><br><span> SIMTRACE_MSGT_DO_CEMU_PTS,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set configurable parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ SIMTRACE_MSGT_BD_CEMU_CONFIG,</span><br><span> };</span><br><span> </span><br><span> /* SIMTRACE_MSGC_MODEM */</span><br><span>@@ -254,6 +256,15 @@</span><br><span> uint8_t msg[0];</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* enable/disable the generation of DO_STATUS on IRQ endpoint */</span><br><span style="color: hsl(120, 100%, 40%);">+#define CEMU_FEAT_F_STATUS_IRQ 0x00000001</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* SIMTRACE_MSGT_BD_CEMU_CONFIG */</span><br><span style="color: hsl(120, 100%, 40%);">+struct cardemu_usb_msg_config {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bit-mask of CEMU_FEAT_F flags */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t features;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span> * MODEM CONTROL</span><br><span> ***********************************************************************/</span><br><span>diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c</span><br><span>index 352284f..8da844f 100644</span><br><span>--- a/firmware/libcommon/source/card_emu.c</span><br><span>+++ b/firmware/libcommon/source/card_emu.c</span><br><span>@@ -37,6 +37,9 @@</span><br><span> </span><br><span> #define NUM_SLOTS 2</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* bit-mask of supported CEMU_FEAT_F_ flags */</span><br><span style="color: hsl(120, 100%, 40%);">+#define SUPPORTED_FEATURES 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define ISO7816_3_INIT_WTIME 9600</span><br><span> #define ISO7816_3_DEFAULT_WI 10</span><br><span> #define ISO7816_3_ATR_LEN_MAX (1+32) /* TS plus 32 chars */</span><br><span>@@ -195,6 +198,9 @@</span><br><span> struct card_handle {</span><br><span> unsigned int num;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* bit-mask of enabled optional features (CEMU_FEAT_F_*) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t features;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum iso7816_3_card_state state;</span><br><span> </span><br><span> /* signal levels */</span><br><span>@@ -1081,6 +1087,22 @@</span><br><span> usb_buf_upd_len_and_submit(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void card_emu_report_config(struct card_handle *ch)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cardemu_usb_msg_config *cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ep = ch->in_ep;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = usb_buf_alloc_st(ch->in_ep, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg));</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->features = ch->features;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_buf_upd_len_and_submit(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* hardware driver informs us that a card I/O signal has changed */</span><br><span> void card_emu_io_statechg(struct card_handle *ch, enum card_io io, int active)</span><br><span> {</span><br><span>@@ -1204,6 +1226,18 @@</span><br><span> </span><br><span> static struct card_handle card_handles[NUM_SLOTS];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int card_emu_set_config(struct card_handle *ch, const struct cardemu_usb_msg_config *scfg,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int scfg_len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (scfg_len >= sizeof(uint32_t))</span><br><span style="color: hsl(120, 100%, 40%);">+ ch->features = (scfg->features & SUPPORTED_FEATURES);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* send back a report of our current configuration */</span><br><span style="color: hsl(120, 100%, 40%);">+ card_emu_report_config(ch);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct card_handle *card_emu_init(uint8_t slot_num, uint8_t tc_chan, uint8_t uart_chan, uint8_t in_ep, uint8_t irq_ep, bool vcc_active, bool in_reset, bool clocked)</span><br><span> {</span><br><span> struct card_handle *ch;</span><br><span>diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c</span><br><span>index fbc042f..c5c173f 100644</span><br><span>--- a/firmware/libcommon/source/mode_cardemu.c</span><br><span>+++ b/firmware/libcommon/source/mode_cardemu.c</span><br><span>@@ -507,6 +507,7 @@</span><br><span> struct simtrace_msg_hdr *hdr;</span><br><span> struct cardemu_usb_msg_set_atr *atr;</span><br><span> struct cardemu_usb_msg_cardinsert *cardins;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cardemu_usb_msg_config *cfg;</span><br><span> struct llist_head *queue;</span><br><span> </span><br><span> hdr = (struct simtrace_msg_hdr *) msg->l1h;</span><br><span>@@ -541,6 +542,10 @@</span><br><span> card_emu_report_status(ci->ch, false);</span><br><span> usb_buf_free(msg);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SIMTRACE_MSGT_BD_CEMU_CONFIG:</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg = (struct cardemu_usb_msg_config *) msg->l2h;</span><br><span style="color: hsl(120, 100%, 40%);">+ card_emu_set_config(ci->ch, cfg, msgb_l2len(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case SIMTRACE_MSGT_BD_CEMU_STATS:</span><br><span> default:</span><br><span> /* FIXME: Send Error */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16617">change 16617</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/simtrace2/+/16617"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7cdd3f9171dbed45de0089defe29d2b59044bd84 </div>
<div style="display:none"> Gerrit-Change-Number: 16617 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>