<p>tsaitgaist <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16195">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
tsaitgaist: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use osmo_st2_ or osmo_ prefix for [shared] library symbols<br><br>Change-Id: Ie2686b30717b9541b1217802ca967cd0a4cbde9b<br>---<br>M host/include/osmocom/simtrace2/apdu_dispatch.h<br>M host/include/osmocom/simtrace2/simtrace2_api.h<br>M host/lib/apdu_dispatch.c<br>M host/lib/gsmtap.c<br>M host/lib/simtrace2_api.c<br>M host/src/simtrace2-remsim.c<br>6 files changed, 87 insertions(+), 75 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/host/include/osmocom/simtrace2/apdu_dispatch.h b/host/include/osmocom/simtrace2/apdu_dispatch.h</span><br><span>index 2c99858..af9c989 100644</span><br><span>--- a/host/include/osmocom/simtrace2/apdu_dispatch.h</span><br><span>+++ b/host/include/osmocom/simtrace2/apdu_dispatch.h</span><br><span>@@ -23,7 +23,7 @@</span><br><span> </span><br><span> #include <osmocom/sim/sim.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct apdu_context {</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_apdu_context {</span><br><span> struct osim_apdu_cmd_hdr hdr;</span><br><span> uint8_t dc[256];</span><br><span> uint8_t de[256];</span><br><span>@@ -39,11 +39,11 @@</span><br><span> } le;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum apdu_action {</span><br><span style="color: hsl(120, 100%, 40%);">+enum osmo_apdu_action {</span><br><span> APDU_ACT_TX_CAPDU_TO_CARD = 0x0001,</span><br><span> APDU_ACT_RX_MORE_CAPDU_FROM_READER = 0x0002,</span><br><span> };</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int apdu_segment_in(struct apdu_context *ac, const uint8_t *apdu_buf,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int apdu_len, bool new_apdu);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int apdu_len, bool new_apdu);</span><br><span>diff --git a/host/include/osmocom/simtrace2/simtrace2_api.h b/host/include/osmocom/simtrace2/simtrace2_api.h</span><br><span>index 5a9f4a3..d31fb85 100644</span><br><span>--- a/host/include/osmocom/simtrace2/simtrace2_api.h</span><br><span>+++ b/host/include/osmocom/simtrace2/simtrace2_api.h</span><br><span>@@ -4,7 +4,7 @@</span><br><span> #include <osmocom/sim/sim.h></span><br><span> </span><br><span> /* transport to a SIMtrace device */</span><br><span style="color: hsl(0, 100%, 40%);">-struct st_transport {</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_st2_transport {</span><br><span> /* USB */</span><br><span> struct libusb_device_handle *usb_devh;</span><br><span> struct {</span><br><span>@@ -18,35 +18,41 @@</span><br><span> };</span><br><span> </span><br><span> /* a SIMtrace slot; communicates over a transport */</span><br><span style="color: hsl(0, 100%, 40%);">-struct st_slot {</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_st2_slot {</span><br><span> /* transport through which the slot can be reached */</span><br><span style="color: hsl(0, 100%, 40%);">- struct st_transport *transp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_st2_transport *transp;</span><br><span> /* number of the slot within the transport */</span><br><span> uint8_t slot_nr;</span><br><span> };</span><br><span> </span><br><span> /* One istance of card emulation */</span><br><span style="color: hsl(0, 100%, 40%);">-struct cardem_inst {</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_st2_cardem_inst {</span><br><span> /* slot on which this card emulation instance runs */</span><br><span style="color: hsl(0, 100%, 40%);">- struct st_slot *slot;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_st2_slot *slot;</span><br><span> /* libosmosim SIM card profile */</span><br><span> const struct osim_cla_ins_card_profile *card_prof;</span><br><span> /* libosmosim SIM card channel */</span><br><span> struct osim_chan_hdl *chan;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_transp_tx_msg(struct osmo_st2_transport *transp, struct msgb *msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int cardem_request_card_insert(struct cardem_inst *ci, bool inserted);</span><br><span style="color: hsl(0, 100%, 40%);">-int cardem_request_pb_and_rx(struct cardem_inst *ci, uint8_t pb, uint8_t le);</span><br><span style="color: hsl(0, 100%, 40%);">-int cardem_request_pb_and_tx(struct cardem_inst *ci, uint8_t pb,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *data, uint16_t data_len_in);</span><br><span style="color: hsl(0, 100%, 40%);">-int cardem_request_sw_tx(struct cardem_inst *ci, const uint8_t *sw);</span><br><span style="color: hsl(0, 100%, 40%);">-int cardem_request_set_atr(struct cardem_inst *ci, const uint8_t *atr, unsigned int atr_len);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t msg_class, uint8_t msg_type);</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_reset_pulse(struct st_slot *slot, uint16_t duration_ms);</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_reset_active(struct st_slot *slot);</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_reset_inactive(struct st_slot *slot);</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_sim_select_local(struct st_slot *slot);</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_sim_select_remote(struct st_slot *slot);</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_get_status(struct st_slot *slot);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_card_insert(struct osmo_st2_cardem_inst *ci, bool inserted);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_pb_and_rx(struct osmo_st2_cardem_inst *ci, uint8_t pb, uint8_t le);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_pb_and_tx(struct osmo_st2_cardem_inst *ci, uint8_t pb,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *data, uint16_t data_len_in);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_sw_tx(struct osmo_st2_cardem_inst *ci, const uint8_t *sw);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_set_atr(struct osmo_st2_cardem_inst *ci, const uint8_t *atr,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int atr_len);</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%);">+int osmo_st2_modem_reset_pulse(struct osmo_st2_slot *slot, uint16_t duration_ms);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_reset_active(struct osmo_st2_slot *slot);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_reset_inactive(struct osmo_st2_slot *slot);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_sim_select_local(struct osmo_st2_slot *slot);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_sim_select_remote(struct osmo_st2_slot *slot);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_get_status(struct osmo_st2_slot *slot);</span><br><span>diff --git a/host/lib/apdu_dispatch.c b/host/lib/apdu_dispatch.c</span><br><span>index ae892eb..62a75aa 100644</span><br><span>--- a/host/lib/apdu_dispatch.c</span><br><span>+++ b/host/lib/apdu_dispatch.c</span><br><span>@@ -30,13 +30,13 @@</span><br><span> #include <osmocom/simtrace2/apdu_dispatch.h></span><br><span> </span><br><span> /*! \brief Has the command-data phase been completed yet? */</span><br><span style="color: hsl(0, 100%, 40%);">-static inline bool is_dc_complete(struct apdu_context *ac)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline bool is_dc_complete(struct osmo_apdu_context *ac)</span><br><span> {</span><br><span> return (ac->lc.tot == ac->lc.cur);</span><br><span> }</span><br><span> </span><br><span> /*! \brief Has the expected-data phase been completed yet? */</span><br><span style="color: hsl(0, 100%, 40%);">-static inline bool is_de_complete(struct apdu_context *ac)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline bool is_de_complete(struct osmo_apdu_context *ac)</span><br><span> {</span><br><span> return (ac->le.tot == ac->le.cur);</span><br><span> }</span><br><span>@@ -50,7 +50,7 @@</span><br><span> return buf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_apdu_ctx(const struct apdu_context *ac)</span><br><span style="color: hsl(120, 100%, 40%);">+static void dump_apdu_ctx(const struct osmo_apdu_context *ac)</span><br><span> {</span><br><span> printf("%s; case=%d, lc=%d(%d), le=%d(%d)\n",</span><br><span> dump_apdu_hdr(&ac->hdr), ac->apdu_case,</span><br><span>@@ -71,8 +71,8 @@</span><br><span> * The function retunrs APDU_ACT_RX_MORE_CAPDU_FROM_READER when there</span><br><span> * is more data to be received from the card reader (GSM Phone).</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int apdu_segment_in(struct apdu_context *ac, const uint8_t *apdu_buf,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int apdu_len, bool new_apdu)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_apdu_segment_in(struct osmo_apdu_context *ac, const uint8_t *apdu_buf,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int apdu_len, bool new_apdu)</span><br><span> {</span><br><span> int rc = 0;</span><br><span> </span><br><span>diff --git a/host/lib/gsmtap.c b/host/lib/gsmtap.c</span><br><span>index d5575e0..103f2fc 100644</span><br><span>--- a/host/lib/gsmtap.c</span><br><span>+++ b/host/lib/gsmtap.c</span><br><span>@@ -8,9 +8,10 @@</span><br><span> #include <unistd.h></span><br><span> #include <stdio.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* global GSMTAP instance */</span><br><span style="color: hsl(120, 100%, 40%);">+/*! global GSMTAP instance */</span><br><span> static struct gsmtap_inst *g_gti;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! initialize the global GSMTAP instance for SIM traces */</span><br><span> int osmo_st2_gsmtap_init(const char *gsmtap_host)</span><br><span> {</span><br><span> if (g_gti)</span><br><span>@@ -26,6 +27,11 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! log one APDU via the global GSMTAP instance.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] sub_type GSMTAP sub-type (GSMTAP_SIM_* constant)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] apdu User-provided buffer with APDU to log</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] len Length of apdu in bytes</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> int osmo_st2_gsmtap_send_apdu(uint8_t sub_type, const uint8_t *apdu, unsigned int len)</span><br><span> {</span><br><span> struct gsmtap_hdr *gh;</span><br><span>diff --git a/host/lib/simtrace2_api.c b/host/lib/simtrace2_api.c</span><br><span>index 0d48b8e..7a0289d 100644</span><br><span>--- a/host/lib/simtrace2_api.c</span><br><span>+++ b/host/lib/simtrace2_api.c</span><br><span>@@ -69,7 +69,7 @@</span><br><span> #endif</span><br><span> </span><br><span> /*! \brief Transmit a given command to the SIMtrace2 device */</span><br><span style="color: hsl(0, 100%, 40%);">-int st_transp_tx_msg(struct st_transport *transp, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_transp_tx_msg(struct osmo_st2_transport *transp, struct msgb *msg)</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span>@@ -106,12 +106,12 @@</span><br><span> </span><br><span> /* transmit a given message to a specified slot. Expects all headers</span><br><span> * present before calling the function */</span><br><span style="color: hsl(0, 100%, 40%);">-int st_slot_tx_msg(struct st_slot *slot, struct msgb *msg,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t msg_class, uint8_t msg_type)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t msg_class, uint8_t msg_type)</span><br><span> {</span><br><span> st_push_hdr(msg, msg_class, msg_type, slot->slot_nr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return st_transp_tx_msg(slot->transp, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_transp_tx_msg(slot->transp, msg);</span><br><span> }</span><br><span> </span><br><span> /***********************************************************************</span><br><span>@@ -120,7 +120,7 @@</span><br><span> </span><br><span> </span><br><span> /*! \brief Request the SIMtrace2 to generate a card-insert signal */</span><br><span style="color: hsl(0, 100%, 40%);">-int cardem_request_card_insert(struct cardem_inst *ci, bool inserted)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_card_insert(struct osmo_st2_cardem_inst *ci, bool inserted)</span><br><span> {</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct cardemu_usb_msg_cardinsert *cins;</span><br><span>@@ -130,11 +130,11 @@</span><br><span> if (inserted)</span><br><span> cins->card_insert = 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_CARDINSERT);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_CARDINSERT);</span><br><span> }</span><br><span> </span><br><span> /*! \brief Request the SIMtrace2 to transmit a Procedure Byte, then Rx */</span><br><span style="color: hsl(0, 100%, 40%);">-int cardem_request_pb_and_rx(struct cardem_inst *ci, uint8_t pb, uint8_t le)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_pb_and_rx(struct osmo_st2_cardem_inst *ci, uint8_t pb, uint8_t le)</span><br><span> {</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct cardemu_usb_msg_tx_data *txd;</span><br><span>@@ -148,12 +148,12 @@</span><br><span> /* one data byte */</span><br><span> msgb_put_u8(msg, pb);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA);</span><br><span> }</span><br><span> </span><br><span> /*! \brief Request the SIMtrace2 to transmit a Procedure Byte, then Tx */</span><br><span style="color: hsl(0, 100%, 40%);">-int cardem_request_pb_and_tx(struct cardem_inst *ci, uint8_t pb,</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *data, uint16_t data_len_in)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_pb_and_tx(struct osmo_st2_cardem_inst *ci, uint8_t pb,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *data, uint16_t data_len_in)</span><br><span> {</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct cardemu_usb_msg_tx_data *txd;</span><br><span>@@ -173,11 +173,11 @@</span><br><span> cur = msgb_put(msg, data_len_in);</span><br><span> memcpy(cur, data, data_len_in);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA);</span><br><span> }</span><br><span> </span><br><span> /*! \brief Request the SIMtrace2 to send a Status Word */</span><br><span style="color: hsl(0, 100%, 40%);">-int cardem_request_sw_tx(struct cardem_inst *ci, const uint8_t *sw)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_sw_tx(struct osmo_st2_cardem_inst *ci, const uint8_t *sw)</span><br><span> {</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct cardemu_usb_msg_tx_data *txd;</span><br><span>@@ -194,10 +194,10 @@</span><br><span> cur[0] = sw[0];</span><br><span> cur[1] = sw[1];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_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(0, 100%, 40%);">-int cardem_request_set_atr(struct cardem_inst *ci, const uint8_t *atr, unsigned int atr_len)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_cardem_request_set_atr(struct osmo_st2_cardem_inst *ci, const uint8_t *atr, unsigned int atr_len)</span><br><span> {</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct cardemu_usb_msg_set_atr *satr;</span><br><span>@@ -212,14 +212,14 @@</span><br><span> cur = msgb_put(msg, atr_len);</span><br><span> memcpy(cur, atr, atr_len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_SET_ATR);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_SET_ATR);</span><br><span> }</span><br><span> </span><br><span> /***********************************************************************</span><br><span> * Modem Control protocol</span><br><span> ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int _modem_reset(struct st_slot *slot, uint8_t asserted, uint16_t pulse_ms)</span><br><span style="color: hsl(120, 100%, 40%);">+static int _modem_reset(struct osmo_st2_slot *slot, uint8_t asserted, uint16_t pulse_ms)</span><br><span> {</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct st_modem_reset *sr ;</span><br><span>@@ -228,28 +228,28 @@</span><br><span> sr->asserted = asserted;</span><br><span> sr->pulse_duration_msec = pulse_ms;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return st_slot_tx_msg(slot, msg, SIMTRACE_MSGC_MODEM, SIMTRACE_MSGT_DT_MODEM_RESET);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_slot_tx_msg(slot, msg, SIMTRACE_MSGC_MODEM, SIMTRACE_MSGT_DT_MODEM_RESET);</span><br><span> }</span><br><span> </span><br><span> /*! \brief pulse the RESET line of the modem for \a duration_ms milli-seconds*/</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_reset_pulse(struct st_slot *slot, uint16_t duration_ms)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_reset_pulse(struct osmo_st2_slot *slot, uint16_t duration_ms)</span><br><span> {</span><br><span> return _modem_reset(slot, 2, duration_ms);</span><br><span> }</span><br><span> </span><br><span> /*! \brief assert the RESET line of the modem */</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_reset_active(struct st_slot *slot)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_reset_active(struct osmo_st2_slot *slot)</span><br><span> {</span><br><span> return _modem_reset(slot, 1, 0);</span><br><span> }</span><br><span> </span><br><span> /*! \brief de-assert the RESET line of the modem */</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_reset_inactive(struct st_slot *slot)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_reset_inactive(struct osmo_st2_slot *slot)</span><br><span> {</span><br><span> return _modem_reset(slot, 0, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int _modem_sim_select(struct st_slot *slot, uint8_t remote_sim)</span><br><span style="color: hsl(120, 100%, 40%);">+static int _modem_sim_select(struct osmo_st2_slot *slot, uint8_t remote_sim)</span><br><span> {</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> struct st_modem_sim_select *ss;</span><br><span>@@ -257,25 +257,25 @@</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 style="color: hsl(0, 100%, 40%);">- return st_slot_tx_msg(slot, msg, SIMTRACE_MSGC_MODEM, SIMTRACE_MSGT_DT_MODEM_SIM_SELECT);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_slot_tx_msg(slot, msg, SIMTRACE_MSGC_MODEM, SIMTRACE_MSGT_DT_MODEM_SIM_SELECT);</span><br><span> }</span><br><span> </span><br><span> /*! \brief select local (physical) SIM for given slot */</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_sim_select_local(struct st_slot *slot)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_sim_select_local(struct osmo_st2_slot *slot)</span><br><span> {</span><br><span> return _modem_sim_select(slot, 0);</span><br><span> }</span><br><span> </span><br><span> /*! \brief select remote (emulated/forwarded) SIM for given slot */</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_sim_select_remote(struct st_slot *slot)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_sim_select_remote(struct osmo_st2_slot *slot)</span><br><span> {</span><br><span> return _modem_sim_select(slot, 1);</span><br><span> }</span><br><span> </span><br><span> /*! \brief Request slot to send us status information about the modem */</span><br><span style="color: hsl(0, 100%, 40%);">-int st_modem_get_status(struct st_slot *slot)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_st2_modem_get_status(struct osmo_st2_slot *slot)</span><br><span> {</span><br><span> struct msgb *msg = st_msgb_alloc();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return st_slot_tx_msg(slot, msg, SIMTRACE_MSGC_MODEM, SIMTRACE_MSGT_BD_MODEM_STATUS);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_slot_tx_msg(slot, msg, SIMTRACE_MSGC_MODEM, SIMTRACE_MSGT_BD_MODEM_STATUS);</span><br><span> }</span><br><span>diff --git a/host/src/simtrace2-remsim.c b/host/src/simtrace2-remsim.c</span><br><span>index c76e587..5362733 100644</span><br><span>--- a/host/src/simtrace2-remsim.c</span><br><span>+++ b/host/src/simtrace2-remsim.c</span><br><span>@@ -68,7 +68,7 @@</span><br><span> ***********************************************************************/</span><br><span> </span><br><span> /*! \brief Process a STATUS message from the SIMtrace2 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int process_do_status(struct cardem_inst *ci, uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+static int process_do_status(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int len)</span><br><span> {</span><br><span> struct cardemu_usb_msg_status *status;</span><br><span> status = (struct cardemu_usb_msg_status *) buf;</span><br><span>@@ -81,7 +81,7 @@</span><br><span> }</span><br><span> </span><br><span> /*! \brief Process a PTS indication message from the SIMtrace2 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int process_do_pts(struct cardem_inst *ci, uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+static int process_do_pts(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int len)</span><br><span> {</span><br><span> struct cardemu_usb_msg_pts_info *pts;</span><br><span> pts = (struct cardemu_usb_msg_pts_info *) buf;</span><br><span>@@ -92,9 +92,9 @@</span><br><span> }</span><br><span> </span><br><span> /*! \brief Process a RX-DATA indication message from the SIMtrace2 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int process_do_rx_da(struct cardem_inst *ci, uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+static int process_do_rx_da(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static struct apdu_context ac;</span><br><span style="color: hsl(120, 100%, 40%);">+ static struct osmo_apdu_context ac;</span><br><span> struct cardemu_usb_msg_rx_data *data;</span><br><span> int rc;</span><br><span> </span><br><span>@@ -103,8 +103,8 @@</span><br><span> printf("=> DATA: flags=%x, %s: ", data->flags,</span><br><span> osmo_hexdump(data->data, data->data_len));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = apdu_segment_in(&ac, data->data, data->data_len,</span><br><span style="color: hsl(0, 100%, 40%);">- data->flags & CEMU_DATA_F_TPDU_HDR);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_apdu_segment_in(&ac, data->data, data->data_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ data->flags & CEMU_DATA_F_TPDU_HDR);</span><br><span> </span><br><span> if (rc & APDU_ACT_TX_CAPDU_TO_CARD) {</span><br><span> struct msgb *tmsg = msgb_alloc(1024, "TPDU");</span><br><span>@@ -132,16 +132,16 @@</span><br><span> ac.sw[1] = msgb_apdu_sw(tmsg) & 0xff;</span><br><span> printf("SW=0x%04x, len_rx=%d\n", msgb_apdu_sw(tmsg), msgb_l3len(tmsg));</span><br><span> if (msgb_l3len(tmsg))</span><br><span style="color: hsl(0, 100%, 40%);">- cardem_request_pb_and_tx(ci, ac.hdr.ins, tmsg->l3h, msgb_l3len(tmsg));</span><br><span style="color: hsl(0, 100%, 40%);">- cardem_request_sw_tx(ci, ac.sw);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_st2_cardem_request_pb_and_tx(ci, ac.hdr.ins, tmsg->l3h, msgb_l3len(tmsg));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_st2_cardem_request_sw_tx(ci, ac.sw);</span><br><span> } else if (ac.lc.tot > ac.lc.cur) {</span><br><span style="color: hsl(0, 100%, 40%);">- cardem_request_pb_and_rx(ci, ac.hdr.ins, ac.lc.tot - ac.lc.cur);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_st2_cardem_request_pb_and_rx(ci, ac.hdr.ins, ac.lc.tot - ac.lc.cur);</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> /*! \brief Process an incoming message from the SIMtrace2 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int process_usb_msg(struct cardem_inst *ci, uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+static int process_usb_msg(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int len)</span><br><span> {</span><br><span> struct simtrace_msg_hdr *sh = (struct simtrace_msg_hdr *)buf;</span><br><span> int rc;</span><br><span>@@ -212,9 +212,9 @@</span><br><span> { NULL, 0, 0, 0 }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void run_mainloop(struct cardem_inst *ci)</span><br><span style="color: hsl(120, 100%, 40%);">+static void run_mainloop(struct osmo_st2_cardem_inst *ci)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct st_transport *transp = ci->slot->transp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_st2_transport *transp = ci->slot->transp;</span><br><span> unsigned int msg_count, byte_count = 0;</span><br><span> uint8_t buf[16*265];</span><br><span> int xfer_len;</span><br><span>@@ -251,24 +251,24 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct st_transport _transp;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_st2_transport _transp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct st_slot _slot = {</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_st2_slot _slot = {</span><br><span> .transp = &_transp,</span><br><span> .slot_nr = 0,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct cardem_inst _ci = {</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_st2_cardem_inst _ci = {</span><br><span> .slot = &_slot,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct cardem_inst *ci = &_ci;</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_st2_cardem_inst *ci = &_ci;</span><br><span> </span><br><span> static void signal_handler(int signal)</span><br><span> {</span><br><span> switch (signal) {</span><br><span> case SIGINT:</span><br><span style="color: hsl(0, 100%, 40%);">- cardem_request_card_insert(ci, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_st2_cardem_request_card_insert(ci, false);</span><br><span> exit(0);</span><br><span> break;</span><br><span> default:</span><br><span>@@ -278,7 +278,7 @@</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct st_transport *transp = ci->slot->transp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_st2_transport *transp = ci->slot->transp;</span><br><span> char *gsmtap_host = "127.0.0.1";</span><br><span> int rc;</span><br><span> int c, ret = 1;</span><br><span>@@ -427,10 +427,10 @@</span><br><span> }</span><br><span> </span><br><span> /* simulate card-insert to modem (owhw, not qmod) */</span><br><span style="color: hsl(0, 100%, 40%);">- cardem_request_card_insert(ci, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_st2_cardem_request_card_insert(ci, true);</span><br><span> </span><br><span> /* select remote (forwarded) SIM */</span><br><span style="color: hsl(0, 100%, 40%);">- st_modem_sim_select_remote(ci->slot);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_st2_modem_sim_select_remote(ci->slot);</span><br><span> </span><br><span> if (!skip_atr) {</span><br><span> /* set the ATR */</span><br><span>@@ -438,11 +438,11 @@</span><br><span> 0xA0, 0x73, 0xBE, 0x21, 0x13, 0x67, 0x43, 0x20,</span><br><span> 0x07, 0x18, 0x00, 0x00, 0x01, 0xA5 };</span><br><span> atr_update_csum(real_atr, sizeof(real_atr));</span><br><span style="color: hsl(0, 100%, 40%);">- cardem_request_set_atr(ci, real_atr, sizeof(real_atr));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_st2_cardem_request_set_atr(ci, real_atr, sizeof(real_atr));</span><br><span> }</span><br><span> </span><br><span> /* select remote (forwarded) SIM */</span><br><span style="color: hsl(0, 100%, 40%);">- st_modem_reset_pulse(ci->slot, 300);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_st2_modem_reset_pulse(ci->slot, 300);</span><br><span> </span><br><span> run_mainloop(ci);</span><br><span> ret = 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16195">change 16195</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/+/16195"/><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: Ie2686b30717b9541b1217802ca967cd0a4cbde9b </div>
<div style="display:none"> Gerrit-Change-Number: 16195 </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: tsaitgaist <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>