<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/20821">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">migrate to osmo_fd_{read,write}_{enable,disable}()<br><br>Change-Id: Ia8ffcbc61883a4e1615c101dbd3307771ae33974<br>Depends: libosmocore.git Change-Id Idb89ba7bc7c129a6304a76900d17f47daf54d17d<br>---<br>M src/datagram.c<br>M src/rs232.c<br>M src/stream.c<br>3 files changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/21/20821/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/datagram.c b/src/datagram.c</span><br><span>index 8b68244..afae3e7 100644</span><br><span>--- a/src/datagram.c</span><br><span>+++ b/src/datagram.c</span><br><span>@@ -95,7 +95,7 @@</span><br><span>     LOGP(DLINP, LOGL_DEBUG, "sending data\n");</span><br><span> </span><br><span>     if (llist_empty(&conn->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">-              conn->ofd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+              osmo_fd_write_disable(&conn->ofd);</span><br><span>            return 0;</span><br><span>    }</span><br><span>    lh = conn->tx_queue.next;</span><br><span>@@ -236,7 +236,7 @@</span><br><span>                            struct msgb *msg)</span><br><span> {</span><br><span>      msgb_enqueue(&conn->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-      conn->ofd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fd_write_enable(&conn->ofd);</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span>diff --git a/src/rs232.c b/src/rs232.c</span><br><span>index 865ec97..b20c111 100644</span><br><span>--- a/src/rs232.c</span><br><span>+++ b/src/rs232.c</span><br><span>@@ -62,7 +62,7 @@</span><br><span>         struct osmo_rs232 *r = ptr;</span><br><span> </span><br><span>      /* we're again ready to transmit. */</span><br><span style="color: hsl(0, 100%, 40%);">-        r->ofd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_fd_write_enable(&r->ofd);</span><br><span> }</span><br><span> </span><br><span> static int handle_ser_write(struct osmo_fd *bfd)</span><br><span>@@ -75,7 +75,7 @@</span><br><span>       LOGP(DLINP, LOGL_DEBUG, "writing data to rs232\n");</span><br><span> </span><br><span>    if (llist_empty(&r->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">-         r->ofd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+         osmo_fd_write_disable(&r->ofd);</span><br><span>               return 0;</span><br><span>    }</span><br><span>    lh = r->tx_queue.next;</span><br><span>@@ -92,7 +92,7 @@</span><br><span> </span><br><span>    /* We've got more data to write, but we have to wait to make it. */</span><br><span>      if (!llist_empty(&r->tx_queue) && r->cfg.delay_us) {</span><br><span style="color: hsl(0, 100%, 40%);">-          r->ofd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+         osmo_fd_write_disable(&r->ofd);</span><br><span>               osmo_timer_schedule(&r->tx_timer, 0, r->cfg.delay_us);</span><br><span>     }</span><br><span>    return 0;</span><br><span>@@ -255,7 +255,7 @@</span><br><span> void osmo_rs232_write(struct osmo_rs232 *r, struct msgb *msg)</span><br><span> {</span><br><span>        msgb_enqueue(&r->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- r->ofd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_fd_write_enable(&r->ofd);</span><br><span> }</span><br><span> </span><br><span> void osmo_rs232_close(struct osmo_rs232 *r)</span><br><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index 3376126..e4fb668 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -335,7 +335,7 @@</span><br><span>     int ret;</span><br><span> </span><br><span>         if (llist_empty(&cli->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">-               cli->ofd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+               osmo_fd_write_disable(&cli->ofd);</span><br><span>             return 0;</span><br><span>    }</span><br><span>    lh = cli->tx_queue.next;</span><br><span>@@ -391,7 +391,7 @@</span><br><span>            /* If messages got enqueued while 'connecting', keep WRITE flag</span><br><span>                 up to dispatch them upon next main loop step */</span><br><span>           if (llist_empty(&cli->tx_queue))</span><br><span style="color: hsl(0, 100%, 40%);">-                 cli->ofd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+                       osmo_fd_write_disable(&cli->ofd);</span><br><span> </span><br><span>                 LOGSCLI(cli, LOGL_DEBUG, "connection done.\n");</span><br><span>            cli->state = STREAM_CLI_STATE_CONNECTED;</span><br><span>@@ -787,7 +787,7 @@</span><br><span> void osmo_stream_cli_send(struct osmo_stream_cli *cli, struct msgb *msg)</span><br><span> {</span><br><span>   msgb_enqueue(&cli->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-       cli->ofd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_fd_write_enable(&cli->ofd);</span><br><span> }</span><br><span> </span><br><span> /*! \brief Receive data via an Osmocom stream client</span><br><span>@@ -1137,7 +1137,7 @@</span><br><span>     LOGP(DLINP, LOGL_DEBUG, "sending data\n");</span><br><span> </span><br><span>     if (llist_empty(&conn->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">-              conn->ofd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+              osmo_fd_write_disable(&conn->ofd);</span><br><span>            return;</span><br><span>      }</span><br><span>    lh = conn->tx_queue.next;</span><br><span>@@ -1287,7 +1287,7 @@</span><br><span>         }</span><br><span> </span><br><span>        msgb_enqueue(&conn->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">-      conn->ofd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fd_write_enable(&conn->ofd);</span><br><span> }</span><br><span> </span><br><span> /*! \brief Receive data via Osmocom stream server</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/20821">change 20821</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/libosmo-netif/+/20821"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia8ffcbc61883a4e1615c101dbd3307771ae33974 </div>
<div style="display:none"> Gerrit-Change-Number: 20821 </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>