Use OSMO_FD_* instead of deprecated BSC_FD_*

New define is available since libosmocore 1.1.0, and we already require
1.3.0, so no need to update dependenices.
Let's change it to avoid people re-using old BSC_FD_READ symbol when
copy-pasting somewhere else.

Change-Id: Id51ccb2c273c5f0fa4986f28bbd69a72d2dbaa0e

5 files changed, 14 insertions, 14 deletions

diff --git a/src/osmo-bts-sysmo/l1_fwd_main.c b/src/osmo-bts-sysmo/l1_fwd_main.c
index bc9fc21c..8e8bd83f 100644
--- a/src/osmo-bts-sysmo/l1_fwd_main.c
+++ b/src/osmo-bts-sysmo/l1_fwd_main.c
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
 		wq->write_cb = udp_write_cb;
 		wq->read_cb = udp_read_cb;
 
-		wq->bfd.when |= BSC_FD_READ;
+		wq->bfd.when |= OSMO_FD_READ;
 		wq->bfd.data = l1fh;
 		wq->bfd.priv_nr = i;
 		rc = osmo_sock_init_ofd(&wq->bfd, AF_UNSPEC, SOCK_DGRAM,
diff --git a/src/osmo-bts-sysmo/l1_transp_fwd.c b/src/osmo-bts-sysmo/l1_transp_fwd.c
index 87c230bb..97200ce9 100644
--- a/src/osmo-bts-sysmo/l1_transp_fwd.c
+++ b/src/osmo-bts-sysmo/l1_transp_fwd.c
@@ -128,7 +128,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *fl1h)
 
 	ofd->data = fl1h;
 	ofd->priv_nr = q;
-	ofd->when |= BSC_FD_READ;
+	ofd->when |= OSMO_FD_READ;
 
 	rc = osmo_sock_init_ofd(ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
 				bts_host, fwd_udp_ports[q],
diff --git a/src/osmo-bts-sysmo/l1_transp_hw.c b/src/osmo-bts-sysmo/l1_transp_hw.c
index 01bc2005..45f4a071 100644
--- a/src/osmo-bts-sysmo/l1_transp_hw.c
+++ b/src/osmo-bts-sysmo/l1_transp_hw.c
@@ -95,18 +95,18 @@ static int wqueue_vector_cb(struct osmo_fd *fd, unsigned int what)
 
 	queue = container_of(fd, struct osmo_wqueue, bfd);
 
-	if (what & BSC_FD_READ)
+	if (what & OSMO_FD_READ)
 		queue->read_cb(fd);
 
-	if (what & BSC_FD_EXCEPT)
+	if (what & OSMO_FD_EXCEPT)
 		queue->except_cb(fd);
 
-	if (what & BSC_FD_WRITE) {
+	if (what & OSMO_FD_WRITE) {
 		struct iovec iov[5];
 		struct msgb *msg, *tmp;
 		int written, count = 0;
 
-		fd->when &= ~BSC_FD_WRITE;
+		fd->when &= ~OSMO_FD_WRITE;
 
 		llist_for_each_entry(msg, &queue->msg_queue, list) {
 			/* more writes than we have */
@@ -124,7 +124,7 @@ static int wqueue_vector_cb(struct osmo_fd *fd, unsigned int what)
 		/* Nothing scheduled? This should not happen. */
 		if (count == 0) {
 			if (!llist_empty(&queue->msg_queue))
-				fd->when |= BSC_FD_WRITE;
+				fd->when |= OSMO_FD_WRITE;
 			return 0;
 		}
 
@@ -132,7 +132,7 @@ static int wqueue_vector_cb(struct osmo_fd *fd, unsigned int what)
 		if (written < 0) {
 			/* nothing written?! */
 			if (!llist_empty(&queue->msg_queue))
-				fd->when |= BSC_FD_WRITE;
+				fd->when |= OSMO_FD_WRITE;
 			return 0;
 		}
 
@@ -151,7 +151,7 @@ static int wqueue_vector_cb(struct osmo_fd *fd, unsigned int what)
 		}
 
 		if (!llist_empty(&queue->msg_queue))
-			fd->when |= BSC_FD_WRITE;
+			fd->when |= OSMO_FD_WRITE;
 	}
 
 	return 0;
@@ -275,7 +275,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *hdl)
 	read_ofd->priv_nr = q;
 	read_ofd->data = hdl;
 	read_ofd->cb = l1if_fd_cb;
-	read_ofd->when = BSC_FD_READ;
+	read_ofd->when = OSMO_FD_READ;
 	rc = osmo_fd_register(read_ofd);
 	if (rc < 0) {
 		close(read_ofd->fd);
@@ -295,7 +295,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *hdl)
 	write_ofd->fd = rc;
 	write_ofd->priv_nr = q;
 	write_ofd->data = hdl;
-	write_ofd->when = BSC_FD_WRITE;
+	write_ofd->when = OSMO_FD_WRITE;
 	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 d769ce7d..2fbdfa6c 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c
@@ -169,7 +169,7 @@ static void mgr_gps_open(struct sysmobts_mgr_instance *mgr)
 #endif
 	mgr->calib.gpsfd.data = mgr;
 	mgr->calib.gpsfd.cb = mgr_gps_read;
-	mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT;
+	mgr->calib.gpsfd.when = OSMO_FD_READ | OSMO_FD_EXCEPT;
 	mgr->calib.gpsfd.fd = mgr->calib.gpsdata->gps_fd;
 	if (osmo_fd_register(&mgr->calib.gpsfd) < 0) {
 		LOGP(DCALIB, LOGL_ERROR, "Failed to register GPSD fd\n");
@@ -459,7 +459,7 @@ static void bts_recon_timer_cb(void *data)
 	struct sysmobts_mgr_instance *mgr = data;
 
 	/* The connection failures are to be expected during boot */
-	mgr->calib.bts_conn->ofd->when |= BSC_FD_WRITE;
+	mgr->calib.bts_conn->ofd->when |= OSMO_FD_WRITE;
 	rc = ipa_client_conn_open(mgr->calib.bts_conn);
 	if (rc < 0) {
 		LOGP(DLCTRL, LOGL_NOTICE, "Failed to connect to BTS.\n");
diff --git a/src/osmo-bts-sysmo/oml_router.c b/src/osmo-bts-sysmo/oml_router.c
index f3d08373..faaf1b57 100644
--- a/src/osmo-bts-sysmo/oml_router.c
+++ b/src/osmo-bts-sysmo/oml_router.c
@@ -119,7 +119,7 @@ int oml_router_init(struct gsm_bts *bts, const char *path,
 
 	read_fd->cb = oml_router_read_cb;
 	read_fd->data = bts;
-	read_fd->when = BSC_FD_READ;
+	read_fd->when = OSMO_FD_READ;
 	read_fd->fd = -1;
 
 	rc = osmo_sock_unix_init_ofd(accept_fd, SOCK_SEQPACKET, 0,