<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/22891">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c<br><br>There is no point in having it there, as VTY is the only user.<br><br>Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c<br>---<br>M include/osmo-bts/l1sap.h<br>M src/common/l1sap.c<br>M src/common/vty.c<br>3 files changed, 17 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h</span><br><span>index 85fe548..af58d5e 100644</span><br><span>--- a/include/osmo-bts/l1sap.h</span><br><span>+++ b/include/osmo-bts/l1sap.h</span><br><span>@@ -127,7 +127,6 @@</span><br><span> extern uint16_t l1sap_log_ctx_sapi;</span><br><span> extern const struct value_string l1sap_common_sapi_names[];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern const struct value_string gsmtap_sapi_names[];</span><br><span> extern struct gsmtap_inst *gsmtap;</span><br><span> extern uint32_t gsmtap_sapi_mask;</span><br><span> extern uint8_t gsmtap_sapi_acch;</span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 97dd661..9b3b087 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -350,23 +350,6 @@</span><br><span> uint32_t gsmtap_sapi_mask = 0;</span><br><span> uint8_t gsmtap_sapi_acch = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string gsmtap_sapi_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-   { GSMTAP_CHANNEL_BCCH,  "BCCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-     { GSMTAP_CHANNEL_CCCH,  "CCCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-     { GSMTAP_CHANNEL_RACH,  "RACH" },</span><br><span style="color: hsl(0, 100%, 40%);">-     { GSMTAP_CHANNEL_AGCH,  "AGCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-     { GSMTAP_CHANNEL_PCH,   "PCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-      { GSMTAP_CHANNEL_SDCCH, "SDCCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-    { GSMTAP_CHANNEL_TCH_F, "TCH/F" },</span><br><span style="color: hsl(0, 100%, 40%);">-    { GSMTAP_CHANNEL_TCH_H, "TCH/H" },</span><br><span style="color: hsl(0, 100%, 40%);">-    { GSMTAP_CHANNEL_PACCH, "PACCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-    { GSMTAP_CHANNEL_PDCH,  "PDTCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-    { GSMTAP_CHANNEL_PTCCH, "PTCCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-    { GSMTAP_CHANNEL_CBCH51,"CBCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-     { GSMTAP_CHANNEL_ACCH,  "SACCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-    { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* send primitive as gsmtap */</span><br><span> static int gsmtap_ph_data(const struct osmo_phsap_prim *l1sap,</span><br><span>                      uint8_t *chan_type, uint8_t *ss, uint32_t fn,</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index f36c09e..84e3968 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -71,6 +71,23 @@</span><br><span> </span><br><span> int g_vty_port_num = OSMO_VTY_PORT_BTS;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct value_string gsmtap_sapi_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSMTAP_CHANNEL_BCCH,  "BCCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+   { GSMTAP_CHANNEL_CCCH,  "CCCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+   { GSMTAP_CHANNEL_RACH,  "RACH" },</span><br><span style="color: hsl(120, 100%, 40%);">+   { GSMTAP_CHANNEL_AGCH,  "AGCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+   { GSMTAP_CHANNEL_PCH,   "PCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+    { GSMTAP_CHANNEL_SDCCH, "SDCCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { GSMTAP_CHANNEL_TCH_F, "TCH/F" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { GSMTAP_CHANNEL_TCH_H, "TCH/H" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { GSMTAP_CHANNEL_PACCH, "PACCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { GSMTAP_CHANNEL_PDCH,  "PDTCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { GSMTAP_CHANNEL_PTCCH, "PTCCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { GSMTAP_CHANNEL_CBCH51,"CBCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+   { GSMTAP_CHANNEL_ACCH,  "SACCH" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct phy_instance *vty_get_phy_instance(struct vty *vty, int phy_nr, int inst_nr)</span><br><span> {</span><br><span>        struct phy_link *plink = phy_link_by_num(phy_nr);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/22891">change 22891</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-bts/+/22891"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c </div>
<div style="display:none"> Gerrit-Change-Number: 22891 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>