use osmo_fd_setup() everywhere

Change-Id: I9be55f791a15fae2362dc431dc778b9b9d8db349

4 files changed, 6 insertions, 21 deletions

diff --git a/src/osmo-bts-sysmo/l1_fwd_main.c b/src/osmo-bts-sysmo/l1_fwd_main.c
index 8e8bd83f..db35ec3b 100644
--- a/src/osmo-bts-sysmo/l1_fwd_main.c
+++ b/src/osmo-bts-sysmo/l1_fwd_main.c
@@ -213,9 +213,7 @@ int main(int argc, char **argv)
 		wq->write_cb = udp_write_cb;
 		wq->read_cb = udp_read_cb;
 
-		wq->bfd.when |= OSMO_FD_READ;
-		wq->bfd.data = l1fh;
-		wq->bfd.priv_nr = i;
+		osmo_fd_setup(&wq->bfd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, l1fh, i);
 		rc = osmo_sock_init_ofd(&wq->bfd, AF_UNSPEC, SOCK_DGRAM,
 					IPPROTO_UDP, NULL, fwd_udp_ports[i],
 					OSMO_SOCK_F_BIND);
diff --git a/src/osmo-bts-sysmo/l1_transp_fwd.c b/src/osmo-bts-sysmo/l1_transp_fwd.c
index 97200ce9..ef272eb1 100644
--- a/src/osmo-bts-sysmo/l1_transp_fwd.c
+++ b/src/osmo-bts-sysmo/l1_transp_fwd.c
@@ -126,10 +126,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);
diff --git a/src/osmo-bts-sysmo/l1_transp_hw.c b/src/osmo-bts-sysmo/l1_transp_hw.c
index 45f4a071..5561af47 100644
--- a/src/osmo-bts-sysmo/l1_transp_hw.c
+++ b/src/osmo-bts-sysmo/l1_transp_hw.c
@@ -271,11 +271,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *hdl)
 		     q, rd_devnames[q], 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);
@@ -291,11 +287,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *hdl)
 	}
 	osmo_wqueue_init(wq, 10);
 	wq->write_cb = l1fd_write_cb;
-	write_ofd->cb = wqueue_vector_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, wqueue_vector_cb, hdl, q);
 	rc = osmo_fd_register(write_ofd);
 	if (rc < 0) {
 		close(write_ofd->fd);
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c
index 2fbdfa6c..0126aaa5 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c
@@ -167,10 +167,8 @@ static void mgr_gps_open(struct sysmobts_mgr_instance *mgr)
 #else
 	gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL);
 #endif
-	mgr->calib.gpsfd.data = mgr;
-	mgr->calib.gpsfd.cb = mgr_gps_read;
-	mgr->calib.gpsfd.when = OSMO_FD_READ | OSMO_FD_EXCEPT;
-	mgr->calib.gpsfd.fd = mgr->calib.gpsdata->gps_fd;
+	osmo_fd_setup(&mgr->calib.gpsfd, mgr->calib.gpsdata->gps_fd, OSMO_FD_READ | OSMO_FD_EXCEPT,
+		      mgr_gps_read, mgr, 0);
 	if (osmo_fd_register(&mgr->calib.gpsfd) < 0) {
 		LOGP(DCALIB, LOGL_ERROR, "Failed to register GPSD fd\n");
 		calib_state_reset(mgr, CALIB_FAIL_GPS);