<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/24512">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">don't printf() directly from library code, go via libosmocore logging<br><br>This allows us to use different log levels, and permits the user to use<br>other log targets.<br><br>Change-Id: I08ef7cfa5d8734882746a11ccd5f059d757401ae<br>---<br>M host/lib/simtrace2_api.c<br>1 file changed, 16 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/12/24512/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/host/lib/simtrace2_api.c b/host/lib/simtrace2_api.c</span><br><span>index 4e16fd1..a61b2cf 100644</span><br><span>--- a/host/lib/simtrace2_api.c</span><br><span>+++ b/host/lib/simtrace2_api.c</span><br><span>@@ -44,9 +44,13 @@</span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/socket.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/logging.h></span><br><span> #include <osmocom/sim/class_tables.h></span><br><span> #include <osmocom/sim/sim.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGSLOT(slot, lvl, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, lvl, "[%u] " fmt, (slot)->slot_nr, ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span> * SIMTRACE core protocol</span><br><span> ***********************************************************************/</span><br><span>@@ -141,7 +145,6 @@</span><br><span> OSMO_ASSERT(transp);</span><br><span> </span><br><span> st_push_hdr(msg, msg_class, msg_type, slot->slot_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("SIMtrace <- %s\n", msgb_hexdump(msg));</span><br><span> </span><br><span> if (transp->udp_fd < 0) {</span><br><span> if (transp->usb_async)</span><br><span>@@ -166,6 +169,8 @@</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct cardemu_usb_msg_cardinsert *cins;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s(inserted=%d)\n", __func__, inserted);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> cins = (struct cardemu_usb_msg_cardinsert *) msgb_put(msg, sizeof(*cins));</span><br><span> memset(cins, 0, sizeof(*cins));</span><br><span> if (inserted)</span><br><span>@@ -181,7 +186,7 @@</span><br><span> struct cardemu_usb_msg_tx_data *txd;</span><br><span> txd = (struct cardemu_usb_msg_tx_data *) msgb_put(msg, sizeof(*txd));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("<= %s(%02x, %d)\n", __func__, pb, le);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSLOT(ci->slot, LOGL_DEBUG, "<= %s(pb=%02x, le=%u)\n", __func__, pb, le);</span><br><span> </span><br><span> memset(txd, 0, sizeof(*txd));</span><br><span> txd->data_len = 1;</span><br><span>@@ -202,7 +207,7 @@</span><br><span> </span><br><span> txd = (struct cardemu_usb_msg_tx_data *) msgb_put(msg, sizeof(*txd));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("<= %s(%02x, %s, %d)\n", __func__, pb,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSLOT(ci->slot, LOGL_DEBUG, "<= %s(pb=%02x, tx=%s, len=%d)\n", __func__, pb,</span><br><span> osmo_hexdump(data, data_len_in), data_len_in);</span><br><span> </span><br><span> memset(txd, 0, sizeof(*txd));</span><br><span>@@ -226,7 +231,7 @@</span><br><span> </span><br><span> txd = (struct cardemu_usb_msg_tx_data *) msgb_put(msg, sizeof(*txd));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("<= %s(%02x %02x)\n", __func__, sw[0], sw[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSLOT(ci->slot, LOGL_DEBUG, "<= %s(sw=%02x%02x)\n", __func__, sw[0], sw[1]);</span><br><span> </span><br><span> memset(txd, 0, sizeof(*txd));</span><br><span> txd->data_len = 2;</span><br><span>@@ -246,7 +251,7 @@</span><br><span> </span><br><span> satr = (struct cardemu_usb_msg_set_atr *) msgb_put(msg, sizeof(*satr));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("<= %s(%s)\n", __func__, osmo_hexdump(atr, atr_len));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s(%s)\n", __func__, osmo_hexdump(atr, atr_len));</span><br><span> </span><br><span> memset(satr, 0, sizeof(*satr));</span><br><span> satr->atr_len = atr_len;</span><br><span>@@ -263,7 +268,7 @@</span><br><span> </span><br><span> cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*cfg));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("<= %s(%08x)\n", __func__, features);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s(features=%08x)\n", __func__, features);</span><br><span> </span><br><span> memset(cfg, 0, sizeof(*cfg));</span><br><span> cfg->features = features;</span><br><span>@@ -280,6 +285,9 @@</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct st_modem_reset *sr ;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSLOT(slot, LOGL_NOTICE, "<= %s(asserted=%u, pulse_ms=%u)\n", __func__,</span><br><span style="color: hsl(120, 100%, 40%);">+ asserted, pulse_ms);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> sr = (struct st_modem_reset *) msgb_put(msg, sizeof(*sr));</span><br><span> sr->asserted = asserted;</span><br><span> sr->pulse_duration_msec = pulse_ms;</span><br><span>@@ -310,6 +318,8 @@</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct st_modem_sim_select *ss;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSLOT(slot, LOGL_NOTICE, "<= %s(remote_sim=%u)\n", __func__, remote_sim);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ss = (struct st_modem_sim_select *) msgb_put(msg, sizeof(*ss));</span><br><span> ss->remote_sim = remote_sim;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/24512">change 24512</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/+/24512"/><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: I08ef7cfa5d8734882746a11ccd5f059d757401ae </div>
<div style="display:none"> Gerrit-Change-Number: 24512 </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-MessageType: newchange </div>