cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

Use osmo_fd_setup() whenever applicable 

Change-Id: I8abd4c50b172f6b312bb4ba3c29e74396f6e6b93
This commit is contained in:
Harald Welte 2020-10-19 12:56:30 +02:00 committed by laforge
parent a6c5db954f
commit 8347359cb0
4 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osmo-bts-litecell15/lc15_l1_hw.c
View File

@ -153,11 +153,7 @@ int l1if_transport_open(int q, struct lc15l1_hdl *hdl)
buf, strerror(errno));
return rc;
}
read_ofd->fd = rc;
read_ofd->priv_nr = q;
read_ofd->data = hdl;
read_ofd->cb = l1if_fd_cb;
read_ofd->when = OSMO_FD_READ;
osmo_fd_setup(read_ofd, rc, OSMO_FD_READ, l1if_fd_cb, hdl, q);
rc = osmo_fd_register(read_ofd);
if (rc < 0) {
close(read_ofd->fd);
@ -176,10 +172,7 @@ int l1if_transport_open(int q, struct lc15l1_hdl *hdl)
}
osmo_wqueue_init(wq, 10);
wq->write_cb = l1fd_write_cb;
write_ofd->fd = rc;
write_ofd->priv_nr = q;
write_ofd->data = hdl;
write_ofd->when = OSMO_FD_WRITE;
osmo_fd_setup(write_ofd, rc, OSMO_FD_WRITE, osmo_wqueue_bfd_cb, hdl, q);
rc = osmo_fd_register(write_ofd);
if (rc < 0) {
close(write_ofd->fd);

11
src/osmo-bts-oc2g/oc2g_l1_hw.c
View File

@ -153,11 +153,7 @@ int l1if_transport_open(int q, struct oc2gl1_hdl *hdl)
buf, strerror(errno));
return rc;
}
read_ofd->fd = rc;
read_ofd->priv_nr = q;
read_ofd->data = hdl;
read_ofd->cb = l1if_fd_cb;
read_ofd->when = OSMO_FD_READ;
osmo_fd_setup(read_ofd, rc, OSMO_FD_READ, l1if_fd_cb, hdl, q);
rc = osmo_fd_register(read_ofd);
if (rc < 0) {
close(read_ofd->fd);
@ -176,10 +172,7 @@ int l1if_transport_open(int q, struct oc2gl1_hdl *hdl)
}
osmo_wqueue_init(wq, 10);
wq->write_cb = l1fd_write_cb;
write_ofd->fd = rc;
write_ofd->priv_nr = q;
write_ofd->data = hdl;
write_ofd->when = OSMO_FD_WRITE;
osmo_fd_setup(write_ofd, rc, OSMO_FD_WRITE, osmo_wqueue_bfd_cb, hdl, q);
rc = osmo_fd_register(write_ofd);
if (rc < 0) {
close(write_ofd->fd);

5
src/osmo-bts-sysmo/sysmo_l1_fwd.c
View File

@ -119,10 +119,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *fl1h)
wq->write_cb = prim_write_cb;
wq->read_cb = fwd_read_cb;
ofd->data = fl1h;
ofd->priv_nr = q;
ofd->when |= OSMO_FD_READ;
osmo_fd_setup(ofd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, fl1h, q);
rc = osmo_sock_init_ofd(ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
bts_host, fwd_udp_ports[q],
OSMO_SOCK_F_CONNECT);

11
src/osmo-bts-sysmo/sysmo_l1_hw.c
View File

@ -159,11 +159,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *hdl)
strerror(errno));
return rc;
}
read_ofd->fd = rc;
read_ofd->priv_nr = q;
read_ofd->data = hdl;
read_ofd->cb = l1if_fd_cb;
read_ofd->when = OSMO_FD_READ;
osmo_fd_setup(read_ofd, rc, OSMO_FD_READ, l1if_fd_cb, hdl, q);
rc = osmo_fd_register(read_ofd);
if (rc < 0) {
close(read_ofd->fd);
@ -179,10 +175,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *hdl)
}
osmo_wqueue_init(wq, 10);
wq->write_cb = l1fd_write_cb;
write_ofd->fd = rc;
write_ofd->priv_nr = q;
write_ofd->data = hdl;
write_ofd->when = OSMO_FD_WRITE;
osmo_fd_setup(write_ofd, rc, OSMO_FD_WRITE, osmo_wqueue_bfd_cb, hdl, q);
rc = osmo_fd_register(write_ofd);
if (rc < 0) {
close(write_ofd->fd);