<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18166">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use OSMO_FD_* instead of deprecated BSC_FD_*<br><br>New define is available since libosmocore 1.1.0, and we already require<br>1.3.0, so no need to update dependenices.<br>Let's change it to avoid people re-using old BSC_FD_* symbols when<br>copy-pasting somewhere else.<br><br>Change-Id: Ida8fd3bd7347163567acde34ad67aefee913b0ea<br>---<br>M src/osmo-bts-litecell15/lc15_l1_hw.c<br>M src/osmo-bts-oc2g/oc2g_l1_hw.c<br>M src/osmo-bts-sysmo/sysmo_l1_fwd.c<br>M src/osmo-bts-sysmo/sysmo_l1_hw.c<br>M src/osmobts_sock.cpp<br>5 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/66/18166/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/lc15_l1_hw.c b/src/osmo-bts-litecell15/lc15_l1_hw.c</span><br><span>index 051dc5c..41dd72d 100644</span><br><span>--- a/src/osmo-bts-litecell15/lc15_l1_hw.c</span><br><span>+++ b/src/osmo-bts-litecell15/lc15_l1_hw.c</span><br><span>@@ -157,7 +157,7 @@</span><br><span> read_ofd->priv_nr = q;</span><br><span> read_ofd->data = hdl;</span><br><span> read_ofd->cb = l1if_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ read_ofd->when = OSMO_FD_READ;</span><br><span> rc = osmo_fd_register(read_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(read_ofd->fd);</span><br><span>@@ -179,7 +179,7 @@</span><br><span> write_ofd->fd = rc;</span><br><span> write_ofd->priv_nr = q;</span><br><span> write_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->when = BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ write_ofd->when = OSMO_FD_WRITE;</span><br><span> rc = osmo_fd_register(write_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(write_ofd->fd);</span><br><span>diff --git a/src/osmo-bts-oc2g/oc2g_l1_hw.c b/src/osmo-bts-oc2g/oc2g_l1_hw.c</span><br><span>index e96df89..b23282a 100644</span><br><span>--- a/src/osmo-bts-oc2g/oc2g_l1_hw.c</span><br><span>+++ b/src/osmo-bts-oc2g/oc2g_l1_hw.c</span><br><span>@@ -157,7 +157,7 @@</span><br><span> read_ofd->priv_nr = q;</span><br><span> read_ofd->data = hdl;</span><br><span> read_ofd->cb = l1if_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ read_ofd->when = OSMO_FD_READ;</span><br><span> rc = osmo_fd_register(read_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(read_ofd->fd);</span><br><span>@@ -179,7 +179,7 @@</span><br><span> write_ofd->fd = rc;</span><br><span> write_ofd->priv_nr = q;</span><br><span> write_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->when = BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ write_ofd->when = OSMO_FD_WRITE;</span><br><span> rc = osmo_fd_register(write_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(write_ofd->fd);</span><br><span>diff --git a/src/osmo-bts-sysmo/sysmo_l1_fwd.c b/src/osmo-bts-sysmo/sysmo_l1_fwd.c</span><br><span>index 535a7f0..cfb2b95 100644</span><br><span>--- a/src/osmo-bts-sysmo/sysmo_l1_fwd.c</span><br><span>+++ b/src/osmo-bts-sysmo/sysmo_l1_fwd.c</span><br><span>@@ -121,7 +121,7 @@</span><br><span> </span><br><span> ofd->data = fl1h;</span><br><span> ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->when |= OSMO_FD_READ;</span><br><span> </span><br><span> rc = osmo_sock_init_ofd(ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,</span><br><span> bts_host, fwd_udp_ports[q],</span><br><span>diff --git a/src/osmo-bts-sysmo/sysmo_l1_hw.c b/src/osmo-bts-sysmo/sysmo_l1_hw.c</span><br><span>index 8351d68..a67e875 100644</span><br><span>--- a/src/osmo-bts-sysmo/sysmo_l1_hw.c</span><br><span>+++ b/src/osmo-bts-sysmo/sysmo_l1_hw.c</span><br><span>@@ -163,7 +163,7 @@</span><br><span> read_ofd->priv_nr = q;</span><br><span> read_ofd->data = hdl;</span><br><span> read_ofd->cb = l1if_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- read_ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ read_ofd->when = OSMO_FD_READ;</span><br><span> rc = osmo_fd_register(read_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(read_ofd->fd);</span><br><span>@@ -182,7 +182,7 @@</span><br><span> write_ofd->fd = rc;</span><br><span> write_ofd->priv_nr = q;</span><br><span> write_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- write_ofd->when = BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ write_ofd->when = OSMO_FD_WRITE;</span><br><span> rc = osmo_fd_register(write_ofd);</span><br><span> if (rc < 0) {</span><br><span> close(write_ofd->fd);</span><br><span>diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp</span><br><span>index a139011..8d3d26f 100644</span><br><span>--- a/src/osmobts_sock.cpp</span><br><span>+++ b/src/osmobts_sock.cpp</span><br><span>@@ -82,7 +82,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> msgb_enqueue(&pcu_sock_state.upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -153,7 +153,7 @@</span><br><span> msg = llist_entry(pcu_sock_state.upqueue.next, struct msgb, list);</span><br><span> pcu_prim = (struct gsm_pcu_if *)msg->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -168,7 +168,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when |= OSMO_FD_WRITE;</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -192,12 +192,12 @@</span><br><span> {</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_READ)</span><br><span> rc = pcu_sock_read(bfd);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE)</span><br><span> rc = pcu_sock_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18166">change 18166</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/+/18166"/><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: Ida8fd3bd7347163567acde34ad67aefee913b0ea </div>
<div style="display:none"> Gerrit-Change-Number: 18166 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>