<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18163">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><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_READ symbol when<br>copy-pasting somewhere else.<br><br>Change-Id: Id51ccb2c273c5f0fa4986f28bbd69a72d2dbaa0e<br>---<br>M src/common/pcu_sock.c<br>M src/osmo-bts-litecell15/l1_transp_hw.c<br>M src/osmo-bts-litecell15/oml_router.c<br>M src/osmo-bts-oc2g/l1_transp_hw.c<br>M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c<br>M src/osmo-bts-oc2g/oml_router.c<br>M src/osmo-bts-octphy/l1_if.c<br>M src/osmo-bts-sysmo/l1_fwd_main.c<br>M src/osmo-bts-sysmo/l1_transp_fwd.c<br>M src/osmo-bts-sysmo/l1_transp_hw.c<br>M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c<br>M src/osmo-bts-sysmo/oml_router.c<br>M src/osmo-bts-trx/scheduler_trx.c<br>M src/osmo-bts-virtual/osmo_mcast_sock.c<br>M src/osmo-bts-virtual/virtual_um.c<br>15 files changed, 49 insertions(+), 49 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index 579f8cc..7ced69c 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -742,7 +742,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> msgb_enqueue(&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>@@ -772,7 +772,7 @@</span><br><span> regenerate_si3_restoctets(bts);</span><br><span> </span><br><span> /* re-enable the generation of ACCEPT for new connections */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when |= OSMO_FD_READ;</span><br><span> </span><br><span> #if 0</span><br><span> /* remove si13, ... */</span><br><span>@@ -862,7 +862,7 @@</span><br><span> msg = llist_entry(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>@@ -877,7 +877,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>@@ -901,12 +901,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>@@ -932,13 +932,13 @@</span><br><span> LOGP(DPCU, LOGL_NOTICE, "PCU connects but we already have "</span><br><span> "another active connection ?!?\n");</span><br><span> /* We already have one PCU connected, this is all we support */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when &= ~OSMO_FD_READ;</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when = OSMO_FD_READ;</span><br><span> conn_bfd->cb = pcu_sock_cb;</span><br><span> conn_bfd->data = state;</span><br><span> </span><br><span>@@ -983,7 +983,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when = OSMO_FD_READ;</span><br><span> bfd->cb = pcu_sock_accept;</span><br><span> bfd->data = state;</span><br><span> </span><br><span>diff --git a/src/osmo-bts-litecell15/l1_transp_hw.c b/src/osmo-bts-litecell15/l1_transp_hw.c</span><br><span>index c8972be..c353f43 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_transp_hw.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_transp_hw.c</span><br><span>@@ -88,18 +88,18 @@</span><br><span> </span><br><span> queue = container_of(fd, struct osmo_wqueue, bfd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ)</span><br><span> queue->read_cb(fd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_EXCEPT)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_EXCEPT)</span><br><span> queue->except_cb(fd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_WRITE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_WRITE) {</span><br><span> struct iovec iov[5];</span><br><span> struct msgb *msg, *tmp;</span><br><span> int written, count = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fd->when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> llist_for_each_entry(msg, &queue->msg_queue, list) {</span><br><span> /* more writes than we have */</span><br><span>@@ -117,7 +117,7 @@</span><br><span> /* Nothing scheduled? This should not happen. */</span><br><span> if (count == 0) {</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -125,7 +125,7 @@</span><br><span> if (written < 0) {</span><br><span> /* nothing written?! */</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -144,7 +144,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>@@ -269,7 +269,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>@@ -292,7 +292,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-litecell15/oml_router.c b/src/osmo-bts-litecell15/oml_router.c</span><br><span>index 198d5e3..e20ce5b 100644</span><br><span>--- a/src/osmo-bts-litecell15/oml_router.c</span><br><span>+++ b/src/osmo-bts-litecell15/oml_router.c</span><br><span>@@ -122,7 +122,7 @@</span><br><span> </span><br><span> read_fd->cb = oml_router_read_cb;</span><br><span> read_fd->data = bts;</span><br><span style="color: hsl(0, 100%, 40%);">- read_fd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ read_fd->when = OSMO_FD_READ;</span><br><span> read_fd->fd = -1;</span><br><span> </span><br><span> rc = osmo_sock_unix_init_ofd(accept_fd, SOCK_SEQPACKET, 0,</span><br><span>diff --git a/src/osmo-bts-oc2g/l1_transp_hw.c b/src/osmo-bts-oc2g/l1_transp_hw.c</span><br><span>index e1d4658..f9d4510 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_transp_hw.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_transp_hw.c</span><br><span>@@ -88,18 +88,18 @@</span><br><span> </span><br><span> queue = container_of(fd, struct osmo_wqueue, bfd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ)</span><br><span> queue->read_cb(fd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_EXCEPT)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_EXCEPT)</span><br><span> queue->except_cb(fd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_WRITE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_WRITE) {</span><br><span> struct iovec iov[5];</span><br><span> struct msgb *msg, *tmp;</span><br><span> int written, count = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fd->when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> llist_for_each_entry(msg, &queue->msg_queue, list) {</span><br><span> /* more writes than we have */</span><br><span>@@ -117,7 +117,7 @@</span><br><span> /* Nothing scheduled? This should not happen. */</span><br><span> if (count == 0) {</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -125,7 +125,7 @@</span><br><span> if (written < 0) {</span><br><span> /* nothing written?! */</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -144,7 +144,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>@@ -269,7 +269,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>@@ -292,7 +292,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/misc/oc2gbts_mgr_calib.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c</span><br><span>index 3ddf0e8..bb2984e 100644</span><br><span>--- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c</span><br><span>+++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c</span><br><span>@@ -222,7 +222,7 @@</span><br><span> </span><br><span> mgr->gps.gpsfd.data = mgr;</span><br><span> mgr->gps.gpsfd.cb = mgr_gps_read;</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->gps.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgr->gps.gpsfd.when = OSMO_FD_READ | OSMO_FD_EXCEPT;</span><br><span> mgr->gps.gpsfd.fd = mgr->gps.gpsdata.gps_fd;</span><br><span> if (osmo_fd_register(&mgr->gps.gpsfd) < 0) {</span><br><span> LOGP(DCALIB, LOGL_ERROR, "Failed to register GPSD fd\n");</span><br><span>@@ -607,7 +607,7 @@</span><br><span> select_led_pattern(mgr);</span><br><span> </span><br><span> /* The connection failures are to be expected during boot */</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->oc2gbts_ctrl.bts_conn->ofd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgr->oc2gbts_ctrl.bts_conn->ofd->when |= OSMO_FD_WRITE;</span><br><span> rc = ipa_client_conn_open(mgr->oc2gbts_ctrl.bts_conn);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DLCTRL, LOGL_NOTICE, "Failed to connect to BTS.\n");</span><br><span>diff --git a/src/osmo-bts-oc2g/oml_router.c b/src/osmo-bts-oc2g/oml_router.c</span><br><span>index 198d5e3..e20ce5b 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml_router.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml_router.c</span><br><span>@@ -122,7 +122,7 @@</span><br><span> </span><br><span> read_fd->cb = oml_router_read_cb;</span><br><span> read_fd->data = bts;</span><br><span style="color: hsl(0, 100%, 40%);">- read_fd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ read_fd->when = OSMO_FD_READ;</span><br><span> read_fd->fd = -1;</span><br><span> </span><br><span> rc = osmo_sock_unix_init_ofd(accept_fd, SOCK_SEQPACKET, 0,</span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index bdf85ca..fb62f8b 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -1826,7 +1826,7 @@</span><br><span> fl1h->phy_wq.write_cb = octphy_write_cb;</span><br><span> fl1h->phy_wq.read_cb = octphy_read_cb;</span><br><span> fl1h->phy_wq.bfd.fd = sfd;</span><br><span style="color: hsl(0, 100%, 40%);">- fl1h->phy_wq.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ fl1h->phy_wq.bfd.when = OSMO_FD_READ;</span><br><span> fl1h->phy_wq.bfd.cb = osmo_wqueue_bfd_cb;</span><br><span> fl1h->phy_wq.bfd.data = fl1h;</span><br><span> rc = osmo_fd_register(&fl1h->phy_wq.bfd);</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_fwd_main.c b/src/osmo-bts-sysmo/l1_fwd_main.c</span><br><span>index bc9fc21..8e8bd83 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_fwd_main.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_fwd_main.c</span><br><span>@@ -213,7 +213,7 @@</span><br><span> wq->write_cb = udp_write_cb;</span><br><span> wq->read_cb = udp_read_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ wq->bfd.when |= OSMO_FD_READ;</span><br><span> wq->bfd.data = l1fh;</span><br><span> wq->bfd.priv_nr = i;</span><br><span> rc = osmo_sock_init_ofd(&wq->bfd, AF_UNSPEC, SOCK_DGRAM,</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_transp_fwd.c b/src/osmo-bts-sysmo/l1_transp_fwd.c</span><br><span>index 87c230b..97200ce 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_transp_fwd.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_transp_fwd.c</span><br><span>@@ -128,7 +128,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/l1_transp_hw.c b/src/osmo-bts-sysmo/l1_transp_hw.c</span><br><span>index 01bc200..45f4a07 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_transp_hw.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_transp_hw.c</span><br><span>@@ -95,18 +95,18 @@</span><br><span> </span><br><span> queue = container_of(fd, struct osmo_wqueue, bfd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ)</span><br><span> queue->read_cb(fd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_EXCEPT)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_EXCEPT)</span><br><span> queue->except_cb(fd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_WRITE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_WRITE) {</span><br><span> struct iovec iov[5];</span><br><span> struct msgb *msg, *tmp;</span><br><span> int written, count = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fd->when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> llist_for_each_entry(msg, &queue->msg_queue, list) {</span><br><span> /* more writes than we have */</span><br><span>@@ -124,7 +124,7 @@</span><br><span> /* Nothing scheduled? This should not happen. */</span><br><span> if (count == 0) {</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -132,7 +132,7 @@</span><br><span> if (written < 0) {</span><br><span> /* nothing written?! */</span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -151,7 +151,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>@@ -275,7 +275,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>@@ -295,7 +295,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/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c</span><br><span>index d769ce7..2fbdfa6 100644</span><br><span>--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c</span><br><span>+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c</span><br><span>@@ -169,7 +169,7 @@</span><br><span> #endif</span><br><span> mgr->calib.gpsfd.data = mgr;</span><br><span> mgr->calib.gpsfd.cb = mgr_gps_read;</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgr->calib.gpsfd.when = OSMO_FD_READ | OSMO_FD_EXCEPT;</span><br><span> mgr->calib.gpsfd.fd = mgr->calib.gpsdata->gps_fd;</span><br><span> if (osmo_fd_register(&mgr->calib.gpsfd) < 0) {</span><br><span> LOGP(DCALIB, LOGL_ERROR, "Failed to register GPSD fd\n");</span><br><span>@@ -459,7 +459,7 @@</span><br><span> struct sysmobts_mgr_instance *mgr = data;</span><br><span> </span><br><span> /* The connection failures are to be expected during boot */</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->calib.bts_conn->ofd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgr->calib.bts_conn->ofd->when |= OSMO_FD_WRITE;</span><br><span> rc = ipa_client_conn_open(mgr->calib.bts_conn);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DLCTRL, LOGL_NOTICE, "Failed to connect to BTS.\n");</span><br><span>diff --git a/src/osmo-bts-sysmo/oml_router.c b/src/osmo-bts-sysmo/oml_router.c</span><br><span>index f3d0837..faaf1b5 100644</span><br><span>--- a/src/osmo-bts-sysmo/oml_router.c</span><br><span>+++ b/src/osmo-bts-sysmo/oml_router.c</span><br><span>@@ -119,7 +119,7 @@</span><br><span> </span><br><span> read_fd->cb = oml_router_read_cb;</span><br><span> read_fd->data = bts;</span><br><span style="color: hsl(0, 100%, 40%);">- read_fd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ read_fd->when = OSMO_FD_READ;</span><br><span> read_fd->fd = -1;</span><br><span> </span><br><span> rc = osmo_sock_unix_init_ofd(accept_fd, SOCK_SEQPACKET, 0,</span><br><span>diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>index 8c3dd64..e5c5519 100644</span><br><span>--- a/src/osmo-bts-trx/scheduler_trx.c</span><br><span>+++ b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>@@ -1719,7 +1719,7 @@</span><br><span> int64_t elapsed_us, error_us;</span><br><span> int rc, i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!(what & BSC_FD_READ))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(what & OSMO_FD_READ))</span><br><span> return 0;</span><br><span> </span><br><span> /* read from timerfd: number of expirations of periodic timer */</span><br><span>diff --git a/src/osmo-bts-virtual/osmo_mcast_sock.c b/src/osmo-bts-virtual/osmo_mcast_sock.c</span><br><span>index c0f0af5..91203b7 100644</span><br><span>--- a/src/osmo-bts-virtual/osmo_mcast_sock.c</span><br><span>+++ b/src/osmo-bts-virtual/osmo_mcast_sock.c</span><br><span>@@ -44,7 +44,7 @@</span><br><span> unsigned int flags = OSMO_SOCK_F_BIND | OSMO_SOCK_F_NO_MCAST_ALL | OSMO_SOCK_F_UDP_REUSEADDR;</span><br><span> </span><br><span> ofd->cb = fd_rx_cb;</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> ofd->data = osmo_fd_data;</span><br><span> </span><br><span> /* Create mcast client socket */</span><br><span>diff --git a/src/osmo-bts-virtual/virtual_um.c b/src/osmo-bts-virtual/virtual_um.c</span><br><span>index 280ba79..de32e49 100644</span><br><span>--- a/src/osmo-bts-virtual/virtual_um.c</span><br><span>+++ b/src/osmo-bts-virtual/virtual_um.c</span><br><span>@@ -39,7 +39,7 @@</span><br><span> {</span><br><span> struct virt_um_inst *vui = ofd->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ) {</span><br><span> struct msgb *msg = msgb_alloc(VIRT_UM_MSGB_SIZE, "Virtual UM Rx");</span><br><span> int rc;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18163">change 18163</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/+/18163"/><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: Id51ccb2c273c5f0fa4986f28bbd69a72d2dbaa0e </div>
<div style="display:none"> Gerrit-Change-Number: 18163 </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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>