diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-10-19 12:27:36 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2020-10-19 12:27:36 +0200 |
| commit | c5989fe180465fe8839dd822424fd1c6765512ea (patch) | |
| tree | 863deb5fa1a3262884d2d74fcc1f678b6ed9088d | |
| parent | 08970c562fe688812137ec6f3960a4311d92254b (diff) | |
Use osmo_fd_setup() wherever applicable
Change-Id: Ie093dea96ec8990368695c0c5824e0fe44fb8540
| -rw-r--r-- | Transceiver52M/device/ipc/ipc-driver-test.c | 5 | ||||
| -rw-r--r-- | Transceiver52M/device/ipc/ipc_chan.c | 7 | ||||
| -rw-r--r-- | Transceiver52M/device/ipc/ipc_sock.c | 5 |
3 files changed, 3 insertions, 14 deletions
diff --git a/Transceiver52M/device/ipc/ipc-driver-test.c b/Transceiver52M/device/ipc/ipc-driver-test.c index 0cccbda..da53463 100644 --- a/Transceiver52M/device/ipc/ipc-driver-test.c +++ b/Transceiver52M/device/ipc/ipc-driver-test.c @@ -394,10 +394,7 @@ int ipc_sock_init(const char *path, struct ipc_sock_state **global_state_var, return -1; } - bfd->when = OSMO_FD_READ; - bfd->cb = sock_callback_fn; - bfd->data = state; - bfd->priv_nr = n; + osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, sock_callback_fn, state, n); rc = osmo_fd_register(bfd); if (rc < 0) { diff --git a/Transceiver52M/device/ipc/ipc_chan.c b/Transceiver52M/device/ipc/ipc_chan.c index af18aab..50782b9 100644 --- a/Transceiver52M/device/ipc/ipc_chan.c +++ b/Transceiver52M/device/ipc/ipc_chan.c @@ -236,13 +236,8 @@ int ipc_chan_sock_accept(struct osmo_fd *bfd, unsigned int flags) return 0; } - conn_bfd->fd = rc; - conn_bfd->when = OSMO_FD_READ; - conn_bfd->cb = ipc_chan_sock_cb; - conn_bfd->data = state; - /* copy chan nr, required for proper bfd<->chan # mapping */ - conn_bfd->priv_nr = bfd->priv_nr; + osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, ipc_chan_sock_cb, state, bfd->priv_nr); if (osmo_fd_register(conn_bfd) != 0) { LOGP(DDEV, LOGL_ERROR, diff --git a/Transceiver52M/device/ipc/ipc_sock.c b/Transceiver52M/device/ipc/ipc_sock.c index 26865bf..b014fac 100644 --- a/Transceiver52M/device/ipc/ipc_sock.c +++ b/Transceiver52M/device/ipc/ipc_sock.c @@ -249,10 +249,7 @@ int ipc_sock_accept(struct osmo_fd *bfd, unsigned int flags) return 0; } - conn_bfd->fd = rc; - conn_bfd->when = OSMO_FD_READ; - conn_bfd->cb = ipc_sock_cb; - conn_bfd->data = state; + osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, ipc_sock_cb, state, 0); if (osmo_fd_register(conn_bfd) != 0) { LOGP(DDEV, LOGL_ERROR, |