<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16613">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;">client: generate clientSlotStatusInd to bankd<br><br>* enable generation of CEMU_USB_MSGT_DO_STATUS on IRQ endpoint<br>* translate that to clientSlotStatusInd towards bankd<br><br>This will allow bankd to understand when to reset the card as<br>requested by the modem.<br><br>Change-Id: Ibe2266ffa473823e925d4e3afcf168353b11cdd8<br>Related: OS#4330<br>---<br>M src/simtrace2-remsim_client.c<br>1 file changed, 68 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c</span><br><span>index fa6b102..1798df9 100644</span><br><span>--- a/src/simtrace2-remsim_client.c</span><br><span>+++ b/src/simtrace2-remsim_client.c</span><br><span>@@ -298,6 +298,22 @@</span><br><span> return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Request the SIMtrace2 to send a Status Word */</span><br><span style="color: hsl(120, 100%, 40%);">+static int cardem_request_config(struct cardem_inst *ci, uint32_t features)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = st_msgb_alloc();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cardemu_usb_msg_config *cfg;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("SIMtrace <= %s(%08x)\n", __func__, features);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(cfg, 0, sizeof(*cfg));</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->features = features;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> // FIXME check if the ATR actually includes a checksum</span><br><span> __attribute__((unused)) static void atr_update_csum(uint8_t *atr, unsigned int atr_len)</span><br><span> {</span><br><span>@@ -493,6 +509,53 @@</span><br><span> case SIMTRACE_MSGT_DO_CEMU_RX_DATA:</span><br><span> rc = process_do_rx_da(ci, buf, len);</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%);">+ /* firmware confirms configuration change; ignore */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("unknown simtrace msg type 0x%02x\n", sh->msg_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Process a STATUS message on IRQ endpoint from the SIMtrace2 */</span><br><span style="color: hsl(120, 100%, 40%);">+static int process_irq_status(struct cardem_inst *ci, const uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cardemu_usb_msg_status *status = (struct cardemu_usb_msg_status *) buf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("SIMtrace IRQ STATUS: flags=0x%x, fi=%u, di=%u, wi=%u wtime=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ status->flags, status->fi, status->di, status->wi,</span><br><span style="color: hsl(120, 100%, 40%);">+ status->waiting_time);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ BankSlot_t bslot;</span><br><span style="color: hsl(120, 100%, 40%);">+ bank_slot2rspro(&bslot, &g_client->bankd_slot);</span><br><span style="color: hsl(120, 100%, 40%);">+ RsproPDU_t *pdu = rspro_gen_ClientSlotStatusInd(g_client->srv_conn.clslot, &bslot,</span><br><span style="color: hsl(120, 100%, 40%);">+ status->flags & CEMU_STATUS_F_RESET_ACTIVE,</span><br><span style="color: hsl(120, 100%, 40%);">+ status->flags & CEMU_STATUS_F_VCC_PRESENT,</span><br><span style="color: hsl(120, 100%, 40%);">+ status->flags & CEMU_STATUS_F_CLK_ACTIVE,</span><br><span style="color: hsl(120, 100%, 40%);">+ -1 /* FIXME: make this dependent on board */);</span><br><span style="color: hsl(120, 100%, 40%);">+ server_conn_send_rspro(&g_client->bankd_conn, pdu);</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 style="color: hsl(120, 100%, 40%);">+static int process_usb_msg_irq(struct cardem_inst *ci, const uint8_t *buf, unsigned int len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("SIMtrace IRQ %s\n", osmo_hexdump(buf, len));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += sizeof(*sh);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (sh->msg_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SIMTRACE_MSGT_BD_CEMU_STATUS:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = process_irq_status(ci, buf, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> printf("unknown simtrace msg type 0x%02x\n", sh->msg_type);</span><br><span> rc = -1;</span><br><span>@@ -555,11 +618,12 @@</span><br><span> </span><br><span> static void usb_irq_xfer_cb(struct libusb_transfer *xfer)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cardem_inst *ci = xfer->user_data;</span><br><span> int rc;</span><br><span> </span><br><span> switch (xfer->status) {</span><br><span> case LIBUSB_TRANSFER_COMPLETED:</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: do something with the received data */</span><br><span style="color: hsl(120, 100%, 40%);">+ process_usb_msg_irq(ci, xfer->buffer, xfer->actual_length);</span><br><span> break;</span><br><span> case LIBUSB_TRANSFER_NO_DEVICE:</span><br><span> fprintf(stderr, "USB device disappeared\n");</span><br><span>@@ -1026,6 +1090,9 @@</span><br><span> printf("modem %d reset\n", modem);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* request firmware to generate STATUS on IRQ endpoint */</span><br><span style="color: hsl(120, 100%, 40%);">+ cardem_request_config(ci, CEMU_FEAT_F_STATUS_IRQ);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* simulate card-insert to modem (owhw, not qmod) */</span><br><span> cardem_request_card_insert(ci, true);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16613">change 16613</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/osmo-remsim/+/16613"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ibe2266ffa473823e925d4e3afcf168353b11cdd8 </div>
<div style="display:none"> Gerrit-Change-Number: 16613 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>