<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/21054">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: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d<br>Depends: libosmocore.git Change-Id Idb89ba7bc7c129a6304a76900d17f47daf54d17d<br>---<br>M src/input/dahdi.c<br>M src/input/e1d.c<br>M src/input/ipa.c<br>M src/input/ipaccess.c<br>M src/input/misdn.c<br>M src/input/rs232.c<br>M src/input/unixsocket.c<br>M src/trau/osmo_ortp.c<br>8 files changed, 21 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/54/21054/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/dahdi.c b/src/input/dahdi.c</span><br><span>index a29a233..45a056a 100644</span><br><span>--- a/src/input/dahdi.c</span><br><span>+++ b/src/input/dahdi.c</span><br><span>@@ -204,7 +204,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- e1i_ts->driver.dahdi.fd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&e1i_ts->driver.dahdi.fd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -250,7 +250,7 @@</span><br><span> struct e1inp_sign_link *sign_link;</span><br><span> struct msgb *msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* get the next msg for this timeslot */</span><br><span> msg = e1inp_tx_ts(e1i_ts, &sign_link);</span><br><span>diff --git a/src/input/e1d.c b/src/input/e1d.c</span><br><span>index e3a3b82..4830df2 100644</span><br><span>--- a/src/input/e1d.c</span><br><span>+++ b/src/input/e1d.c</span><br><span>@@ -100,7 +100,7 @@</span><br><span> struct e1inp_sign_link *sign_link;</span><br><span> struct msgb *msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* get the next msg for this timeslot */</span><br><span> msg = e1inp_tx_ts(e1i_ts, &sign_link);</span><br><span>@@ -315,7 +315,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- e1i_ts->driver.e1d.fd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(& e1i_ts->driver.e1d.fd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/input/ipa.c b/src/input/ipa.c</span><br><span>index 8281b4f..f01ecd9 100644</span><br><span>--- a/src/input/ipa.c</span><br><span>+++ b/src/input/ipa.c</span><br><span>@@ -89,7 +89,7 @@</span><br><span> LOGIPA(link, LOGL_DEBUG, "sending data\n");</span><br><span> </span><br><span> if (llist_empty(&link->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(ofd);</span><br><span> return 0;</span><br><span> }</span><br><span> lh = link->tx_queue.next;</span><br><span>@@ -124,7 +124,7 @@</span><br><span> link->updown_cb(link, 0);</span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(ofd);</span><br><span> LOGIPA(link, LOGL_NOTICE, "connection done\n");</span><br><span> link->state = IPA_CLIENT_LINK_STATE_CONNECTED;</span><br><span> if (link->updown_cb)</span><br><span>@@ -228,7 +228,7 @@</span><br><span> if (ret < 0)</span><br><span> return ret;</span><br><span> link->ofd->fd = ret;</span><br><span style="color: hsl(0, 100%, 40%);">- link->ofd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(link->ofd);</span><br><span> if (osmo_fd_register(link->ofd) < 0) {</span><br><span> close(ret);</span><br><span> link->ofd->fd = -1;</span><br><span>@@ -241,7 +241,7 @@</span><br><span> void ipa_client_conn_send(struct ipa_client_conn *link, struct msgb *msg)</span><br><span> {</span><br><span> msgb_enqueue(&link->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- link->ofd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(link->ofd);</span><br><span> }</span><br><span> </span><br><span> size_t ipa_client_conn_clear_queue(struct ipa_client_conn *link)</span><br><span>@@ -254,7 +254,7 @@</span><br><span> deleted += 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- link->ofd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(link->ofd);</span><br><span> return deleted;</span><br><span> }</span><br><span> </span><br><span>@@ -387,7 +387,7 @@</span><br><span> msg = msgb_dequeue(&conn->tx_queue);</span><br><span> </span><br><span> if (!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_disable(&conn->ofd);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -532,5 +532,5 @@</span><br><span> void ipa_server_conn_send(struct ipa_server_conn *conn, 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>diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c</span><br><span>index 18cf7f5..f07ab85 100644</span><br><span>--- a/src/input/ipaccess.c</span><br><span>+++ b/src/input/ipaccess.c</span><br><span>@@ -422,7 +422,7 @@</span><br><span> </span><br><span> static int ts_want_write(struct e1inp_ts *e1i_ts)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- e1i_ts->driver.ipaccess.fd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&e1i_ts->driver.ipaccess.fd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -474,7 +474,7 @@</span><br><span> int ret;</span><br><span> </span><br><span> e1i_ts = ipaccess_line_ts(bfd, line);</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* get the next msg for this timeslot */</span><br><span> msg = e1inp_tx_ts(e1i_ts, &sign_link);</span><br><span>@@ -489,7 +489,7 @@</span><br><span> case E1INP_SIGN_OSMO:</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= OSMO_FD_WRITE; /* come back for more msg */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(bfd); /* come back for more msg */</span><br><span> ret = -EINVAL;</span><br><span> goto out;</span><br><span> }</span><br><span>diff --git a/src/input/misdn.c b/src/input/misdn.c</span><br><span>index 52cd311..985d70f 100644</span><br><span>--- a/src/input/misdn.c</span><br><span>+++ b/src/input/misdn.c</span><br><span>@@ -216,7 +216,7 @@</span><br><span> if (e1i_ts->type == E1INP_TS_TYPE_TRAU)</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- e1i_ts->driver.misdn.fd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&e1i_ts->driver.misdn.fd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -242,7 +242,7 @@</span><br><span> uint8_t *l2_data;</span><br><span> int ret;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* get the next msg for this timeslot */</span><br><span> msg = e1inp_tx_ts(e1i_ts, &sign_link);</span><br><span>diff --git a/src/input/rs232.c b/src/input/rs232.c</span><br><span>index 522cf0e..b594db2 100644</span><br><span>--- a/src/input/rs232.c</span><br><span>+++ b/src/input/rs232.c</span><br><span>@@ -86,7 +86,7 @@</span><br><span> struct msgb *msg;</span><br><span> int written;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* get the next msg for this timeslot */</span><br><span> msg = e1inp_tx_ts(e1i_ts, &sign_link);</span><br><span>@@ -207,7 +207,7 @@</span><br><span> </span><br><span> static int rs232_want_write(struct e1inp_ts *e1i_ts)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- e1i_ts->driver.rs232.fd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&e1i_ts->driver.rs232.fd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/input/unixsocket.c b/src/input/unixsocket.c</span><br><span>index 9a6ff9b..595dc7d 100644</span><br><span>--- a/src/input/unixsocket.c</span><br><span>+++ b/src/input/unixsocket.c</span><br><span>@@ -147,7 +147,7 @@</span><br><span> struct msgb *msg;</span><br><span> struct e1inp_sign_link *sign_link;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* get the next msg for this timeslot */</span><br><span> msg = e1inp_tx_ts(e1i_ts, &sign_link);</span><br><span>@@ -185,7 +185,7 @@</span><br><span> {</span><br><span> struct unixsocket_line *line = e1i_ts->line->driver_data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- line->fd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&line->fd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c</span><br><span>index 0cd4e9d..226b04f 100644</span><br><span>--- a/src/trau/osmo_ortp.c</span><br><span>+++ b/src/trau/osmo_ortp.c</span><br><span>@@ -216,7 +216,7 @@</span><br><span> if (what & OSMO_FD_READ) {</span><br><span> /* in polling mode, we don't want to be called here */</span><br><span> if (rs->flags & OSMO_RTP_F_POLL) {</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when &= ~OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_disable(fd);</span><br><span> return 0;</span><br><span> }</span><br><span> if (!recv_with_cb(rs))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/21054">change 21054</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-abis/+/21054"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d </div>
<div style="display:none"> Gerrit-Change-Number: 21054 </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>