<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/20746">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;">ipc: Use OSMO_FD_* instead of deprecated BSC_FD_*<br><br>Change-Id: I98b3f9525954d6882f7488d650038a8e28f7b769<br>---<br>M Transceiver52M/device/ipc/IPCDevice.cpp<br>M Transceiver52M/device/ipc/ipc-driver-test.c<br>M Transceiver52M/device/ipc/ipc_chan.c<br>M Transceiver52M/device/ipc/ipc_sock.c<br>4 files changed, 25 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp</span><br><span>index 32a46e5..102cb9b 100644</span><br><span>--- a/Transceiver52M/device/ipc/IPCDevice.cpp</span><br><span>+++ b/Transceiver52M/device/ipc/IPCDevice.cpp</span><br><span>@@ -522,7 +522,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> msgb_enqueue(&state->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -659,7 +659,7 @@</span><br><span> msg = llist_entry(master_sk_state.upqueue.next, struct msgb, list);</span><br><span> ipc_prim = (struct ipc_sk_if *)msg->data;</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> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -676,7 +676,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</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> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -706,7 +706,7 @@</span><br><span> /* peek at the beginning of the queue */</span><br><span> msg = llist_entry(sk_chan_state[bfd->priv_nr].upqueue.next, struct msgb, list);</span><br><span> ipc_prim = (struct ipc_sk_chan_if *)msg->data;</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> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span> LOGP(DDEV, LOGL_ERROR,</span><br><span>@@ -722,7 +722,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</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> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -746,12 +746,12 @@</span><br><span> IPCDevice *device = static_cast<IPCDevice *>(bfd->data);</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_READ)</span><br><span> rc = device->ipc_sock_read(bfd);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE)</span><br><span> rc = device->ipc_sock_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -762,12 +762,12 @@</span><br><span> IPCDevice *device = static_cast<IPCDevice *>(bfd->data);</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_READ)</span><br><span> rc = device->ipc_chan_sock_read(bfd);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE)</span><br><span> rc = device->ipc_chan_sock_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>diff --git a/Transceiver52M/device/ipc/ipc-driver-test.c b/Transceiver52M/device/ipc/ipc-driver-test.c</span><br><span>index 44c8b0e..0cccbda 100644</span><br><span>--- a/Transceiver52M/device/ipc/ipc-driver-test.c</span><br><span>+++ b/Transceiver52M/device/ipc/ipc-driver-test.c</span><br><span>@@ -394,7 +394,7 @@</span><br><span> return -1;</span><br><span> }</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 = sock_callback_fn;</span><br><span> bfd->data = state;</span><br><span> bfd->priv_nr = n;</span><br><span>diff --git a/Transceiver52M/device/ipc/ipc_chan.c b/Transceiver52M/device/ipc/ipc_chan.c</span><br><span>index 9e35fb2..af18aab 100644</span><br><span>--- a/Transceiver52M/device/ipc/ipc_chan.c</span><br><span>+++ b/Transceiver52M/device/ipc/ipc_chan.c</span><br><span>@@ -142,7 +142,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> msgb_enqueue(&state->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -160,7 +160,7 @@</span><br><span> msg = llist_entry(state->upqueue.next, struct msgb, list);</span><br><span> ipc_prim = (struct ipc_sk_chan_if *)msg->data;</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> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -177,7 +177,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</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> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -200,12 +200,12 @@</span><br><span> {</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_READ)</span><br><span> rc = ipc_chan_sock_read(bfd);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE)</span><br><span> rc = ipc_chan_sock_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -231,13 +231,13 @@</span><br><span> "osmo-trx connects but we already have "</span><br><span> "another active connection ?!?\n");</span><br><span> /* We already have one IPC connected, this is all we support */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when &= ~OSMO_FD_READ;</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when = OSMO_FD_READ;</span><br><span> conn_bfd->cb = ipc_chan_sock_cb;</span><br><span> conn_bfd->data = state;</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/ipc/ipc_sock.c b/Transceiver52M/device/ipc/ipc_sock.c</span><br><span>index 435dc3c..26865bf 100644</span><br><span>--- a/Transceiver52M/device/ipc/ipc_sock.c</span><br><span>+++ b/Transceiver52M/device/ipc/ipc_sock.c</span><br><span>@@ -84,7 +84,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> msgb_enqueue(&state->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -102,7 +102,7 @@</span><br><span> osmo_fd_unregister(bfd);</span><br><span> </span><br><span> /* re-enable the generation of ACCEPT for new connections */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when |= OSMO_FD_READ;</span><br><span> </span><br><span> /* flush the queue */</span><br><span> while (!llist_empty(&state->upqueue)) {</span><br><span>@@ -172,7 +172,7 @@</span><br><span> msg = llist_entry(state->upqueue.next, struct msgb, list);</span><br><span> ipc_prim = (struct ipc_sk_if *)msg->data;</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> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -189,7 +189,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</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> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -212,12 +212,12 @@</span><br><span> {</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_READ)</span><br><span> rc = ipc_sock_read(bfd);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE)</span><br><span> rc = ipc_sock_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -244,13 +244,13 @@</span><br><span> "ip clent connects but we already have "</span><br><span> "another active connection ?!?\n");</span><br><span> /* We already have one IPC connected, this is all we support */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when &= ~OSMO_FD_READ;</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when = OSMO_FD_READ;</span><br><span> conn_bfd->cb = ipc_sock_cb;</span><br><span> conn_bfd->data = state;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/20746">change 20746</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-trx/+/20746"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I98b3f9525954d6882f7488d650038a8e28f7b769 </div>
<div style="display:none"> Gerrit-Change-Number: 20746 </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>