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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Convert osmo_bts_sock.cpp to C<br><br>There's no real point in using C++ there, and using C++ makes the<br>compiler fail to use llist_head in multi-bts patches added later due to:<br>"""<br>'offsetof' within non-standard-layout type is conditionally-supported<br>"""<br><br>Change-Id: I8965b5cc5a713e64788b5b6aa183d3035341ddbb<br>---<br>M src/Makefile.am<br>R src/osmobts_sock.c<br>M src/pcu_l1_if.h<br>M src/pdch.cpp<br>M src/pdch.h<br>M tests/tbf/TbfTest.cpp<br>6 files changed, 17 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 60f05a5..de924a6 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -65,7 +65,7 @@</span><br><span>   decoding.cpp \</span><br><span>       llc.cpp \</span><br><span>    rlc.cpp \</span><br><span style="color: hsl(0, 100%, 40%);">-       osmobts_sock.cpp \</span><br><span style="color: hsl(120, 100%, 40%);">+    osmobts_sock.c \</span><br><span>     gprs_codel.c \</span><br><span>       coding_scheme.c \</span><br><span>    egprs_rlc_compression.cpp \</span><br><span>diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.c</span><br><span>similarity index 98%</span><br><span>rename from src/osmobts_sock.cpp</span><br><span>rename to src/osmobts_sock.c</span><br><span>index c68b7b9..ec9d7ce 100644</span><br><span>--- a/src/osmobts_sock.cpp</span><br><span>+++ b/src/osmobts_sock.c</span><br><span>@@ -25,13 +25,13 @@</span><br><span> #include <assert.h></span><br><span> #include <sys/socket.h></span><br><span> #include <sys/un.h></span><br><span style="color: hsl(0, 100%, 40%);">-extern "C" {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/timer.h></span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> #include <pcu_l1_if.h></span><br><span> #include <gprs_debug.h></span><br><span>@@ -41,9 +41,7 @@</span><br><span> #include <tbf.h></span><br><span> #include <pdch.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern "C" {</span><br><span> int l1if_close_pdch(void *obj);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span> </span><br><span> /*</span><br><span>  * osmo-bts PCU socket functions</span><br><span>@@ -115,7 +113,7 @@</span><br><span>                 }</span><br><span> #endif</span><br><span>          for (ts = 0; ts < 8; ts++)</span><br><span style="color: hsl(0, 100%, 40%);">-                   bts->trx[trx].pdch[ts].disable();</span><br><span style="color: hsl(120, 100%, 40%);">+                  pdch_disable(&bts->trx[trx].pdch[ts]);</span><br><span> /* FIXME: NOT ALL RESOURCES are freed in this case... inconsistent with the other code. Share the code with pcu_l1if.c</span><br><span> for the reset. */</span><br><span>                 bts_trx_free_all_tbf(&bts->trx[trx]);</span><br><span>diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h</span><br><span>index 674ccca..8ef262c 100644</span><br><span>--- a/src/pcu_l1_if.h</span><br><span>+++ b/src/pcu_l1_if.h</span><br><span>@@ -150,19 +150,18 @@</span><br><span> void pcu_l1if_tx_agch(bitvec * block, int len);</span><br><span> </span><br><span> void pcu_l1if_tx_pch(bitvec * block, int plen, uint16_t pgroup);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_tx_txt_ind(enum gsm_pcu_if_text_type t, const char *fmt, ...);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_l1if_open(void);</span><br><span style="color: hsl(0, 100%, 40%);">-void pcu_l1if_close(void);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_rx(uint8_t msg_type, struct gsm_pcu_if *pcu_prim);</span><br><span style="color: hsl(0, 100%, 40%);">-int pcu_sock_send(struct msgb *msg);</span><br><span> #endif</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> extern "C" {</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_rx(uint8_t msg_type, struct gsm_pcu_if *pcu_prim);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_l1if_open(void);</span><br><span style="color: hsl(120, 100%, 40%);">+void pcu_l1if_close(void);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_sock_send(struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_tx_txt_ind(enum gsm_pcu_if_text_type t, const char *fmt, ...);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int pcu_rx_rts_req_pdtch(uint8_t trx, uint8_t ts,</span><br><span>      uint32_t fn, uint8_t block_nr);</span><br><span> int pcu_rx_rts_req_ptcch(uint8_t trx, uint8_t ts,</span><br><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 15fd139..5a329f3 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -1031,3 +1031,7 @@</span><br><span>                    tbf_free(tbf);</span><br><span>       }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void pdch_disable(struct gprs_rlcmac_pdch *pdch) {</span><br><span style="color: hsl(120, 100%, 40%);">+  pdch->disable();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/pdch.h b/src/pdch.h</span><br><span>index 57e0f43..8871986 100644</span><br><span>--- a/src/pdch.h</span><br><span>+++ b/src/pdch.h</span><br><span>@@ -188,6 +188,7 @@</span><br><span> extern "C" {</span><br><span> #endif</span><br><span> void pdch_free_all_tbf(struct gprs_rlcmac_pdch *pdch);</span><br><span style="color: hsl(120, 100%, 40%);">+void pdch_disable(struct gprs_rlcmac_pdch *pdch);</span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span> #endif</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index fbcb503..798dc3c 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -166,7 +166,7 @@</span><br><span> </span><br><span> /* override, requires '-Wl,--wrap=pcu_sock_send' */</span><br><span> int __real_pcu_sock_send(struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">-int __wrap_pcu_sock_send(struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+extern "C" int __wrap_pcu_sock_send(struct msgb *msg)</span><br><span> {</span><br><span>     return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22297">change 22297</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-pcu/+/22297"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8965b5cc5a713e64788b5b6aa183d3035341ddbb </div>
<div style="display:none"> Gerrit-Change-Number: 22297 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </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>