<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20780">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_setup() whenever applicable<br><br>Change-Id: I8abd4c50b172f6b312bb4ba3c29e74396f6e6b93<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>4 files changed, 7 insertions(+), 31 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/80/20780/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 41dd72d..b58a2f4 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>@@ -153,11 +153,7 @@</span><br><span>                    buf, strerror(errno));</span><br><span>               return rc;</span><br><span>   }</span><br><span style="color: hsl(0, 100%, 40%);">-       read_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-   read_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">-       read_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">-        read_ofd->cb = l1if_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-   read_ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(read_ofd, rc, OSMO_FD_READ, l1if_fd_cb, hdl, q);</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>@@ -176,10 +172,7 @@</span><br><span>       }</span><br><span>    osmo_wqueue_init(wq, 10);</span><br><span>    wq->write_cb = l1fd_write_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-        write_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-  write_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">-      write_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">-       write_ofd->when = OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fd_setup(write_ofd, rc, OSMO_FD_WRITE, osmo_wqueue_bfd_cb, hdl, q);</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 b23282a..3ff607b 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>@@ -153,11 +153,7 @@</span><br><span>                         buf, strerror(errno));</span><br><span>               return rc;</span><br><span>   }</span><br><span style="color: hsl(0, 100%, 40%);">-       read_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-   read_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">-       read_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">-        read_ofd->cb = l1if_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-   read_ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(read_ofd, rc, OSMO_FD_READ, l1if_fd_cb, hdl, q);</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>@@ -176,10 +172,7 @@</span><br><span>       }</span><br><span>    osmo_wqueue_init(wq, 10);</span><br><span>    wq->write_cb = l1fd_write_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-        write_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-  write_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">-      write_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">-       write_ofd->when = OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fd_setup(write_ofd, rc, OSMO_FD_WRITE, osmo_wqueue_bfd_cb, hdl, q);</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 cfb2b95..c7f2dab 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>@@ -119,10 +119,7 @@</span><br><span>     wq->write_cb = prim_write_cb;</span><br><span>     wq->read_cb = fwd_read_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       ofd->data = fl1h;</span><br><span style="color: hsl(0, 100%, 40%);">-    ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">-    ofd->when |= OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(ofd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, fl1h, q);</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>                          OSMO_SOCK_F_CONNECT);</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 a67e875..cc051be 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>@@ -159,11 +159,7 @@</span><br><span>                    strerror(errno));</span><br><span>            return rc;</span><br><span>   }</span><br><span style="color: hsl(0, 100%, 40%);">-       read_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-   read_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">-       read_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">-        read_ofd->cb = l1if_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-   read_ofd->when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(read_ofd, rc, OSMO_FD_READ, l1if_fd_cb, hdl, q);</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,10 +175,7 @@</span><br><span>       }</span><br><span>    osmo_wqueue_init(wq, 10);</span><br><span>    wq->write_cb = l1fd_write_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-        write_ofd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-  write_ofd->priv_nr = q;</span><br><span style="color: hsl(0, 100%, 40%);">-      write_ofd->data = hdl;</span><br><span style="color: hsl(0, 100%, 40%);">-       write_ofd->when = OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fd_setup(write_ofd, rc, OSMO_FD_WRITE, osmo_wqueue_bfd_cb, hdl, q);</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20780">change 20780</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/+/20780"/><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: I8abd4c50b172f6b312bb4ba3c29e74396f6e6b93 </div>
<div style="display:none"> Gerrit-Change-Number: 20780 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>