This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/18166 ) Change subject: Use OSMO_FD_* instead of deprecated BSC_FD_* ...................................................................... Use OSMO_FD_* instead of deprecated BSC_FD_* New define is available since libosmocore 1.1.0, and we already require 1.3.0, so no need to update dependenices. Let's change it to avoid people re-using old BSC_FD_* symbols when copy-pasting somewhere else. Change-Id: Ida8fd3bd7347163567acde34ad67aefee913b0ea --- M src/osmo-bts-litecell15/lc15_l1_hw.c M src/osmo-bts-oc2g/oc2g_l1_hw.c M src/osmo-bts-sysmo/sysmo_l1_fwd.c M src/osmo-bts-sysmo/sysmo_l1_hw.c M src/osmobts_sock.cpp 5 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/66/18166/1 diff --git a/src/osmo-bts-litecell15/lc15_l1_hw.c b/src/osmo-bts-litecell15/lc15_l1_hw.c index 051dc5c..41dd72d 100644 --- a/src/osmo-bts-litecell15/lc15_l1_hw.c +++ b/src/osmo-bts-litecell15/lc15_l1_hw.c @@ -157,7 +157,7 @@ read_ofd->priv_nr = q; read_ofd->data = hdl; read_ofd->cb = l1if_fd_cb; - read_ofd->when = BSC_FD_READ; + read_ofd->when = OSMO_FD_READ; rc = osmo_fd_register(read_ofd); if (rc < 0) { close(read_ofd->fd); @@ -179,7 +179,7 @@ write_ofd->fd = rc; write_ofd->priv_nr = q; write_ofd->data = hdl; - write_ofd->when = BSC_FD_WRITE; + write_ofd->when = OSMO_FD_WRITE; rc = osmo_fd_register(write_ofd); if (rc < 0) { close(write_ofd->fd); diff --git a/src/osmo-bts-oc2g/oc2g_l1_hw.c b/src/osmo-bts-oc2g/oc2g_l1_hw.c index e96df89..b23282a 100644 --- a/src/osmo-bts-oc2g/oc2g_l1_hw.c +++ b/src/osmo-bts-oc2g/oc2g_l1_hw.c @@ -157,7 +157,7 @@ read_ofd->priv_nr = q; read_ofd->data = hdl; read_ofd->cb = l1if_fd_cb; - read_ofd->when = BSC_FD_READ; + read_ofd->when = OSMO_FD_READ; rc = osmo_fd_register(read_ofd); if (rc < 0) { close(read_ofd->fd); @@ -179,7 +179,7 @@ write_ofd->fd = rc; write_ofd->priv_nr = q; write_ofd->data = hdl; - write_ofd->when = BSC_FD_WRITE; + write_ofd->when = OSMO_FD_WRITE; rc = osmo_fd_register(write_ofd); if (rc < 0) { close(write_ofd->fd); diff --git a/src/osmo-bts-sysmo/sysmo_l1_fwd.c b/src/osmo-bts-sysmo/sysmo_l1_fwd.c index 535a7f0..cfb2b95 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_fwd.c +++ b/src/osmo-bts-sysmo/sysmo_l1_fwd.c @@ -121,7 +121,7 @@ ofd->data = fl1h; ofd->priv_nr = q; - ofd->when |= BSC_FD_READ; + ofd->when |= OSMO_FD_READ; rc = osmo_sock_init_ofd(ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, bts_host, fwd_udp_ports[q], diff --git a/src/osmo-bts-sysmo/sysmo_l1_hw.c b/src/osmo-bts-sysmo/sysmo_l1_hw.c index 8351d68..a67e875 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_hw.c +++ b/src/osmo-bts-sysmo/sysmo_l1_hw.c @@ -163,7 +163,7 @@ read_ofd->priv_nr = q; read_ofd->data = hdl; read_ofd->cb = l1if_fd_cb; - read_ofd->when = BSC_FD_READ; + read_ofd->when = OSMO_FD_READ; rc = osmo_fd_register(read_ofd); if (rc < 0) { close(read_ofd->fd); @@ -182,7 +182,7 @@ write_ofd->fd = rc; write_ofd->priv_nr = q; write_ofd->data = hdl; - write_ofd->when = BSC_FD_WRITE; + write_ofd->when = OSMO_FD_WRITE; rc = osmo_fd_register(write_ofd); if (rc < 0) { close(write_ofd->fd); diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index a139011..8d3d26f 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -82,7 +82,7 @@ return -EIO; } msgb_enqueue(&pcu_sock_state.upqueue, msg); - conn_bfd->when |= BSC_FD_WRITE; + conn_bfd->when |= OSMO_FD_WRITE; return 0; } @@ -153,7 +153,7 @@ msg = llist_entry(pcu_sock_state.upqueue.next, struct msgb, list); pcu_prim = (struct gsm_pcu_if *)msg->data; - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */ if (!msgb_length(msg)) { @@ -168,7 +168,7 @@ goto close; if (rc < 0) { if (errno == EAGAIN) { - bfd->when |= BSC_FD_WRITE; + bfd->when |= OSMO_FD_WRITE; break; } goto close; @@ -192,12 +192,12 @@ { int rc = 0; - if (flags & BSC_FD_READ) + if (flags & OSMO_FD_READ) rc = pcu_sock_read(bfd); if (rc < 0) return rc; - if (flags & BSC_FD_WRITE) + if (flags & OSMO_FD_WRITE) rc = pcu_sock_write(bfd); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/18166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ida8fd3bd7347163567acde34ad67aefee913b0ea Gerrit-Change-Number: 18166 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200509/3e1e7cd9/attachment.htm>