<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/20736">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use OSMO_FD_* instead of deprecated BSC_FD_*<br><br>Change-Id: Ib676eda521f0e89a1f4d8f9eac810598a3c813b9<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>M tests/e1inp_ipa_bts_test.c<br>9 files changed, 73 insertions(+), 73 deletions(-)<br><br></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 bf6da3e..55abc7c 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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ e1i_ts->driver.dahdi.fd.when |= OSMO_FD_WRITE;</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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</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>@@ -472,38 +472,38 @@</span><br><span> </span><br><span> switch (e1i_ts->type) {</span><br><span> case E1INP_TS_TYPE_SIGN:</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> handle_dahdi_exception(e1i_ts);</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> rc = handle_ts1_read(bfd);</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> rc = handle_ts1_write(bfd);</span><br><span> break;</span><br><span> case E1INP_TS_TYPE_HDLC:</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> handle_dahdi_exception(e1i_ts);</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> rc = handle_hdlc_read(bfd);</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> handle_hdlc_write(bfd);</span><br><span> break;</span><br><span> case E1INP_TS_TYPE_TRAU:</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> handle_dahdi_exception(e1i_ts);</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> rc = handle_tsX_read(bfd);</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> rc = handle_tsX_write(bfd);</span><br><span> /* We never include the DAHDI B-Channel FD into the</span><br><span> * writeset, since it doesn't support poll() based</span><br><span> * write flow control */</span><br><span> break;</span><br><span> case E1INP_TS_TYPE_RAW:</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> handle_dahdi_exception(e1i_ts);</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> rc = handle_ts_raw_read(bfd);</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> rc = handle_ts_raw_write(bfd);</span><br><span> /* We never include the DAHDI B-Channel FD into the</span><br><span> * writeset, since it doesn't support poll() based</span><br><span>@@ -665,7 +665,7 @@</span><br><span> bfd->fd = dahdi_open_slot(dev_nr);</span><br><span> if (bfd->fd < 0)</span><br><span> return -EIO;</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = BSC_FD_READ | BSC_FD_EXCEPT;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when = OSMO_FD_READ | OSMO_FD_EXCEPT;</span><br><span> ret = dahdi_set_bufinfo(bfd->fd, 1);</span><br><span> if (ret < 0)</span><br><span> return ret;</span><br><span>@@ -683,7 +683,7 @@</span><br><span> bfd->fd = dahdi_open_slot(dev_nr);</span><br><span> if (bfd->fd < 0)</span><br><span> return -EIO;</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = BSC_FD_READ | BSC_FD_EXCEPT;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when = OSMO_FD_READ | OSMO_FD_EXCEPT;</span><br><span> ret = dahdi_set_bufinfo(bfd->fd, 1);</span><br><span> if (ret < 0)</span><br><span> return ret;</span><br><span>@@ -705,7 +705,7 @@</span><br><span> /* We never include the DAHDI B-Channel FD into the</span><br><span> * writeset, since it doesn't support poll() based</span><br><span> * write flow control */</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = BSC_FD_READ | BSC_FD_EXCEPT;// | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when = OSMO_FD_READ | OSMO_FD_EXCEPT;// | OSMO_FD_WRITE;</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/input/e1d.c b/src/input/e1d.c</span><br><span>index beef93e..6323f90 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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</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>@@ -280,21 +280,21 @@</span><br><span> </span><br><span> switch (e1i_ts->type) {</span><br><span> case E1INP_TS_TYPE_SIGN:</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> ret = handle_ts_sign_read(bfd);</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> ret = handle_ts_sign_write(bfd);</span><br><span> break;</span><br><span> case E1INP_TS_TYPE_TRAU:</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> ret = handle_ts_trau_read(bfd);</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> ret = handle_ts_trau_write(bfd);</span><br><span> break;</span><br><span> case E1INP_TS_TYPE_RAW:</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> ret = handle_ts_raw_read(bfd);</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> ret = handle_ts_raw_write(bfd);</span><br><span> break;</span><br><span> default:</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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ e1i_ts->driver.e1d.fd.when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -400,7 +400,7 @@</span><br><span> talloc_free(ts_info);</span><br><span> return -EIO;</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> </span><br><span> if (!e1i_ts->lapd) {</span><br><span> char name[32];</span><br><span>@@ -430,7 +430,7 @@</span><br><span> talloc_free(ts_info);</span><br><span> return -EIO;</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> break;</span><br><span> case E1INP_TS_TYPE_TRAU:</span><br><span> case E1INP_TS_TYPE_RAW:</span><br><span>@@ -453,7 +453,7 @@</span><br><span> talloc_free(ts_info);</span><br><span> return -EIO;</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> break;</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/input/ipa.c b/src/input/ipa.c</span><br><span>index 0f67dca..c3e4ad3 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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->when &= ~OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> lh = link->tx_queue.next;</span><br><span>@@ -124,18 +124,18 @@</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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->when &= ~OSMO_FD_WRITE;</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> link->updown_cb(link, 1);</span><br><span> break;</span><br><span> case IPA_CLIENT_LINK_STATE_CONNECTED:</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> LOGIPA(link, LOGL_DEBUG, "connected read\n");</span><br><span> ret = ipa_client_read(link);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret != -EBADF && (what & BSC_FD_WRITE)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret != -EBADF && (what & OSMO_FD_WRITE)) {</span><br><span> LOGIPA(link, LOGL_DEBUG, "connected write\n");</span><br><span> ipa_client_write(link);</span><br><span> }</span><br><span>@@ -189,7 +189,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ipa_link->ofd->when |= BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_link->ofd->when |= OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> ipa_link->ofd->priv_nr = priv_nr;</span><br><span> ipa_link->ofd->cb = ipa_client_fd_cb;</span><br><span> ipa_link->ofd->data = ipa_link;</span><br><span>@@ -232,7 +232,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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ link->ofd->when |= OSMO_FD_WRITE;</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>@@ -245,7 +245,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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ link->ofd->when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> size_t ipa_client_conn_clear_queue(struct ipa_client_conn *link)</span><br><span>@@ -258,7 +258,7 @@</span><br><span> deleted += 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- link->ofd->when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ link->ofd->when &= ~OSMO_FD_WRITE;</span><br><span> return deleted;</span><br><span> }</span><br><span> </span><br><span>@@ -312,7 +312,7 @@</span><br><span> if (!ipa_link)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ipa_link->ofd.when |= BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_link->ofd.when |= OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> ipa_link->ofd.cb = ipa_server_fd_cb;</span><br><span> ipa_link->ofd.fd = -1;</span><br><span> ipa_link->ofd.data = ipa_link;</span><br><span>@@ -394,7 +394,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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when &= ~OSMO_FD_WRITE;</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -411,9 +411,9 @@</span><br><span> int rc = 0;</span><br><span> </span><br><span> LOGP(DLINP, LOGL_DEBUG, "connected read/write\n");</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> rc = ipa_server_conn_read(conn);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != -EBADF && (what & BSC_FD_WRITE))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != -EBADF && (what & OSMO_FD_WRITE))</span><br><span> ipa_server_conn_write(conn);</span><br><span> </span><br><span> return 0;</span><br><span>@@ -438,7 +438,7 @@</span><br><span> conn->ofd.fd = fd;</span><br><span> conn->ofd.data = conn;</span><br><span> conn->ofd.cb = ipa_server_conn_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->ofd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when = OSMO_FD_READ;</span><br><span> conn->cb = cb;</span><br><span> conn->closed_cb = closed_cb;</span><br><span> conn->data = data;</span><br><span>@@ -542,5 +542,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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span>diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c</span><br><span>index 30bcaf9..18cf7f5 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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ e1i_ts->driver.ipaccess.fd.when |= OSMO_FD_WRITE;</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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</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 |= BSC_FD_WRITE; /* come back for more msg */</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when |= OSMO_FD_WRITE; /* come back for more msg */</span><br><span> ret = -EINVAL;</span><br><span> goto out;</span><br><span> }</span><br><span>@@ -540,9 +540,9 @@</span><br><span> {</span><br><span> int rc = 0;</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> rc = handle_ts1_read(bfd);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != -EBADF && (what & BSC_FD_WRITE))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != -EBADF && (what & OSMO_FD_WRITE))</span><br><span> rc = handle_ts1_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -649,7 +649,7 @@</span><br><span> e1i_ts = e1inp_line_ipa_oml_ts(line);</span><br><span> </span><br><span> bfd = &e1i_ts->driver.ipaccess.fd;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_OML);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(bfd, fd, OSMO_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_OML);</span><br><span> ret = osmo_fd_register(bfd);</span><br><span> if (ret < 0) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "could not register FD\n");</span><br><span>@@ -702,7 +702,7 @@</span><br><span> e1i_ts = e1inp_line_ipa_rsl_ts(line, 0);</span><br><span> </span><br><span> bfd = &e1i_ts->driver.ipaccess.fd;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_RSL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(bfd, fd, OSMO_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_RSL);</span><br><span> ret = osmo_fd_register(bfd);</span><br><span> if (ret < 0) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "could not register FD\n");</span><br><span>diff --git a/src/input/misdn.c b/src/input/misdn.c</span><br><span>index 564d008..9d33932 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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ e1i_ts->driver.misdn.fd.when |= OSMO_FD_WRITE;</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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</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>@@ -481,20 +481,20 @@</span><br><span> </span><br><span> switch (e1i_ts->type) {</span><br><span> case E1INP_TS_TYPE_SIGN:</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> rc = handle_ts1_read(bfd);</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> rc = handle_ts1_write(bfd);</span><br><span> break;</span><br><span> case E1INP_TS_TYPE_TRAU:</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> rc = handle_tsX_read(bfd);</span><br><span> /* We never include the mISDN B-Channel FD into the</span><br><span> * writeset, since it doesn't support poll() based</span><br><span> * write flow control */ </span><br><span> break;</span><br><span> case E1INP_TS_TYPE_RAW:</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> rc = handle_ts_raw_read(bfd);</span><br><span> /* We never include the mISDN B-Channel FD into the</span><br><span> * writeset, since it doesn't support poll() based</span><br><span>@@ -603,7 +603,7 @@</span><br><span> case E1INP_TS_TYPE_HDLC:</span><br><span> bfd->fd = socket(PF_ISDN, SOCK_DGRAM,</span><br><span> ISDN_P_B_HDLC);</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> break;</span><br><span> case E1INP_TS_TYPE_SIGN:</span><br><span> if (mline->use_userspace_lapd)</span><br><span>@@ -612,7 +612,7 @@</span><br><span> else</span><br><span> bfd->fd = socket(PF_ISDN, SOCK_DGRAM,</span><br><span> ISDN_P_LAPD_NT);</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> break;</span><br><span> case E1INP_TS_TYPE_TRAU:</span><br><span> case E1INP_TS_TYPE_RAW:</span><br><span>@@ -620,7 +620,7 @@</span><br><span> /* We never include the mISDN B-Channel FD into the</span><br><span> * writeset, since it doesn't support poll() based</span><br><span> * write flow control */ </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> break;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/input/rs232.c b/src/input/rs232.c</span><br><span>index dfbf97c..390d7fe 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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</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>@@ -193,13 +193,13 @@</span><br><span> {</span><br><span> int rc = 0;</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> rc = handle_ser_read(bfd);</span><br><span> </span><br><span> if (rc < 0)</span><br><span> return rc;</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> rc = handle_ser_write(bfd);</span><br><span> </span><br><span> return rc;</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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ e1i_ts->driver.rs232.fd.when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -256,7 +256,7 @@</span><br><span> ser_handle->line = line;</span><br><span> ser_handle->delay_ms = delay_ms;</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 = serial_fd_cb;</span><br><span> bfd->data = ser_handle;</span><br><span> </span><br><span>diff --git a/src/input/unixsocket.c b/src/input/unixsocket.c</span><br><span>index cfb4979..252da03 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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</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>@@ -173,9 +173,9 @@</span><br><span> {</span><br><span> int ret = 0;</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> ret = unixsocket_read_cb(bfd);</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> ret = unixsocket_write_cb(bfd);</span><br><span> </span><br><span> return ret;</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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ line->fd.when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -243,7 +243,7 @@</span><br><span> </span><br><span> config = line->driver_data;</span><br><span> config->fd.data = line;</span><br><span style="color: hsl(0, 100%, 40%);">- config->fd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ config->fd.when = OSMO_FD_READ;</span><br><span> config->fd.cb = unixsocket_cb;</span><br><span> </span><br><span> /* Open unix domain socket */</span><br><span>diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c</span><br><span>index c070915..fab6471 100644</span><br><span>--- a/src/trau/osmo_ortp.c</span><br><span>+++ b/src/trau/osmo_ortp.c</span><br><span>@@ -213,10 +213,10 @@</span><br><span> {</span><br><span> struct osmo_rtp_socket *rs = fd->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> /* 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 &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when &= ~OSMO_FD_READ;</span><br><span> return 0;</span><br><span> }</span><br><span> if (!recv_with_cb(rs))</span><br><span>@@ -224,7 +224,7 @@</span><br><span> rs->rx_user_ts);</span><br><span> rs->rx_user_ts += 160;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* writing is not queued at the moment, so BSC_FD_WRITE</span><br><span style="color: hsl(120, 100%, 40%);">+ /* writing is not queued at the moment, so OSMO_FD_WRITE</span><br><span> * shouldn't occur */</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -249,7 +249,7 @@</span><br><span> </span><br><span> rs->rtp_bfd.fd = rtp_session_get_rtp_socket(rs->sess);</span><br><span> rs->rtcp_bfd.fd = rtp_session_get_rtcp_socket(rs->sess);</span><br><span style="color: hsl(0, 100%, 40%);">- rs->rtp_bfd.when = rs->rtcp_bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ rs->rtp_bfd.when = rs->rtcp_bfd.when = OSMO_FD_READ;</span><br><span> rs->rtp_bfd.data = rs->rtcp_bfd.data = rs;</span><br><span> rs->rtp_bfd.cb = osmo_rtp_fd_cb;</span><br><span> rs->rtcp_bfd.cb = osmo_rtcp_fd_cb;</span><br><span>diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c</span><br><span>index d6c3772..3c7613e 100644</span><br><span>--- a/tests/e1inp_ipa_bts_test.c</span><br><span>+++ b/tests/e1inp_ipa_bts_test.c</span><br><span>@@ -309,7 +309,7 @@</span><br><span> }</span><br><span> bts_eventfd.fd = eventfds[0];</span><br><span> bts_eventfd.cb = test_bts_gsm_12_21_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- bts_eventfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_eventfd.when = OSMO_FD_READ;</span><br><span> bts_eventfd.data = &bts_dev_info;</span><br><span> if (osmo_fd_register(&bts_eventfd) < 0) {</span><br><span> LOGP(DBTSTEST, LOGL_ERROR, "could not register event fd\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/20736">change 20736</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/+/20736"/><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: Ib676eda521f0e89a1f4d8f9eac810598a3c813b9 </div>
<div style="display:none"> Gerrit-Change-Number: 20736 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>