<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12465">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/sap_interface.c: avoid using 'osmo' prefix<br><br>The 'osmo' prefix is usually used by libosmo-* symbols.<br><br>Change-Id: Id37d8553c2f2c20012fb1b729967b92a9a03f612<br>---<br>M src/host/layer23/include/osmocom/bb/common/osmocom_data.h<br>M src/host/layer23/include/osmocom/bb/common/sap_interface.h<br>M src/host/layer23/src/common/sap_interface.c<br>M src/host/layer23/src/common/sim.c<br>M src/host/layer23/src/mobile/app_mobile.c<br>5 files changed, 18 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/65/12465/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h</span><br><span>index 486c36d..a3ecc92 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h</span><br><span>@@ -23,7 +23,7 @@</span><br><span> #include <osmocom/bb/common/l1ctl.h></span><br><span> </span><br><span> struct osmosap_entity {</span><br><span style="color: hsl(0, 100%, 40%);">- osmosap_cb_t msg_handler;</span><br><span style="color: hsl(120, 100%, 40%);">+ sap_cb_t msg_handler;</span><br><span> uint8_t sap_state;</span><br><span> uint16_t max_msg_size;</span><br><span> };</span><br><span>diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h</span><br><span>index 270c565..5332982 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h</span><br><span>@@ -1,14 +1,14 @@</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-typedef int (*osmosap_cb_t)(struct msgb *msg, struct osmocom_ms *ms);</span><br><span style="color: hsl(120, 100%, 40%);">+typedef int (*sap_cb_t)(struct msgb *msg, struct osmocom_ms *ms);</span><br><span> </span><br><span> int sap_open(struct osmocom_ms *ms);</span><br><span> int sap_close(struct osmocom_ms *ms);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmosap_init(struct osmocom_ms *ms);</span><br><span style="color: hsl(120, 100%, 40%);">+int sap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length);</span><br><span style="color: hsl(120, 100%, 40%);">+int sap_register_handler(struct osmocom_ms *ms, sap_cb_t cb);</span><br><span style="color: hsl(120, 100%, 40%);">+int sap_init(struct osmocom_ms *ms);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum osmosap_state {</span><br><span style="color: hsl(120, 100%, 40%);">+enum sap_state {</span><br><span> SAP_SOCKET_ERROR,</span><br><span> SAP_NOT_CONNECTED,</span><br><span> SAP_IDLE,</span><br><span>@@ -18,7 +18,7 @@</span><br><span> };</span><br><span> </span><br><span> /* Table 5.1: Message Overview */</span><br><span style="color: hsl(0, 100%, 40%);">-enum osmosap_msg_type {</span><br><span style="color: hsl(120, 100%, 40%);">+enum sap_msg_type {</span><br><span> SAP_CONNECT_REQ = 0x00,</span><br><span> SAP_CONNECT_RESP = 0x01,</span><br><span> SAP_DISCONNECT_REQ = 0x02,</span><br><span>@@ -43,7 +43,7 @@</span><br><span> };</span><br><span> </span><br><span> /* Table 5.15: List of Parameter IDs */</span><br><span style="color: hsl(0, 100%, 40%);">-enum osmosap_param_type {</span><br><span style="color: hsl(120, 100%, 40%);">+enum sap_param_type {</span><br><span> SAP_MAX_MSG_SIZE = 0x00,</span><br><span> SAP_CONNECTION_STATUS = 0x01,</span><br><span> SAP_RESULT_CODE = 0x02,</span><br><span>diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c</span><br><span>index b777cf6..a152c18 100644</span><br><span>--- a/src/host/layer23/src/common/sap_interface.c</span><br><span>+++ b/src/host/layer23/src/common/sap_interface.c</span><br><span>@@ -154,7 +154,7 @@</span><br><span> return msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int osmosap_send(struct osmocom_ms *ms, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static int sap_send(struct osmocom_ms *ms, struct msgb *msg)</span><br><span> {</span><br><span> if(ms->sap_entity.sap_state == SAP_NOT_CONNECTED)</span><br><span> sap_connect(ms);</span><br><span>@@ -294,7 +294,7 @@</span><br><span> if(!msg)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmosap_send(ms, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ sap_send(ms, msg);</span><br><span> ms->sap_entity.sap_state = SAP_PROCESSING_ATR_REQUEST;</span><br><span> }</span><br><span> </span><br><span>@@ -458,7 +458,7 @@</span><br><span> if(!msg)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmosap_send(ms, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ sap_send(ms, msg);</span><br><span> </span><br><span> ms->sap_entity.sap_state = SAP_CONNECTION_UNDER_NEGOTIATION;</span><br><span> }</span><br><span>@@ -475,7 +475,7 @@</span><br><span> if(!msg)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmosap_send(ms, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ sap_send(ms, msg);</span><br><span> </span><br><span> ms->sap_entity.sap_state = SAP_NOT_CONNECTED;</span><br><span> }</span><br><span>@@ -499,7 +499,7 @@</span><br><span> if(!msg)</span><br><span> return -ENOMEM;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmosap_send(ms, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sap_send(ms, msg);</span><br><span> if (rc)</span><br><span> return rc;</span><br><span> </span><br><span>@@ -546,7 +546,7 @@</span><br><span> }</span><br><span> </span><br><span> /* same signature as in L1CTL, so it can be called from sim.c */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmosap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length)</span><br><span style="color: hsl(120, 100%, 40%);">+int sap_send_apdu(struct osmocom_ms *ms, uint8_t *data, uint16_t length)</span><br><span> {</span><br><span> //LOGP(DSAP, LOGL_ERROR, "Received the following APDU from sim.c: %s\n" ,</span><br><span> // osmo_hexdump(data, length));</span><br><span>@@ -554,7 +554,7 @@</span><br><span> }</span><br><span> </span><br><span> /* register message handler for messages that are sent from L2->L3 */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmosap_register_handler(struct osmocom_ms *ms, osmosap_cb_t cb)</span><br><span style="color: hsl(120, 100%, 40%);">+int sap_register_handler(struct osmocom_ms *ms, sap_cb_t cb)</span><br><span> {</span><br><span> ms->sap_entity.msg_handler = cb;</span><br><span> </span><br><span>@@ -562,7 +562,7 @@</span><br><span> }</span><br><span> </span><br><span> /* init */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmosap_init(struct osmocom_ms *ms)</span><br><span style="color: hsl(120, 100%, 40%);">+int sap_init(struct osmocom_ms *ms)</span><br><span> {</span><br><span> struct osmosap_entity *sap = &ms->sap_entity;</span><br><span> </span><br><span>diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c</span><br><span>index 9d14cd3..a63ae2a 100644</span><br><span>--- a/src/host/layer23/src/common/sim.c</span><br><span>+++ b/src/host/layer23/src/common/sim.c</span><br><span>@@ -205,7 +205,7 @@</span><br><span> * it makes more sense to do it here then in L1CTL */</span><br><span> if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) {</span><br><span> LOGP(DSIM, LOGL_INFO, "Using SAP backend\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmosap_send_apdu(ms, data, length);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sap_send_apdu(ms, data, length);</span><br><span> } else {</span><br><span> LOGP(DSIM, LOGL_INFO, "Using built-in SIM reader\n");</span><br><span> rc = l1ctl_tx_sim_req(ms, data, length);</span><br><span>diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c</span><br><span>index a2c02c0..27e1d9b 100644</span><br><span>--- a/src/host/layer23/src/mobile/app_mobile.c</span><br><span>+++ b/src/host/layer23/src/mobile/app_mobile.c</span><br><span>@@ -200,7 +200,7 @@</span><br><span> lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms);</span><br><span> </span><br><span> /* init SAP client before SIM card starts up */</span><br><span style="color: hsl(0, 100%, 40%);">- osmosap_init(ms);</span><br><span style="color: hsl(120, 100%, 40%);">+ sap_init(ms);</span><br><span> </span><br><span> gsm_sim_init(ms);</span><br><span> gsm48_cc_init(ms);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12465">change 12465</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/12465"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Id37d8553c2f2c20012fb1b729967b92a9a03f612 </div>
<div style="display:none"> Gerrit-Change-Number: 12465 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>