src: use namespace prefix osmo_fd* and osmo_select*

Summary of changes:

s/struct bsc_fd/struct osmo_fd/g
s/bsc_register_fd/osmo_fd_register/g
s/bsc_unregister_fd/osmo_fd_unregister/g
s/bsc_select_main/osmo_select_main/g

5 files changed, 17 insertions, 17 deletions

diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c
index dba93fb3..38aae2ca 100644
--- a/src/host/layer23/src/common/gps.c
+++ b/src/host/layer23/src/common/gps.c
@@ -52,13 +52,13 @@ struct osmo_gps g = {
 	0,0
 };
 
-static struct bsc_fd gps_bfd;
+static struct osmo_fd gps_bfd;
 
 #ifdef _HAVE_GPSD
 
 static struct gps_data_t* gdata;
 
-int osmo_gpsd_cb(struct bsc_fd *bfd, unsigned int what)
+int osmo_gpsd_cb(struct osmo_fd *bfd, unsigned int what)
 {
 	struct tm *tm;
 	unsigned diff = 0;
@@ -125,7 +125,7 @@ int osmo_gpsd_open(void)
 		return -1;
 	}
 
-	bsc_register_fd(&gps_bfd);
+	osmo_fd_register(&gps_bfd);
 
 	return 0;
 }
@@ -137,7 +137,7 @@ void osmo_gpsd_close(void)
 
 	LOGP(DGPS, LOGL_INFO, "Disconnecting from gpsd\n");
 
-	bsc_unregister_fd(&gps_bfd);
+	osmo_fd_unregister(&gps_bfd);
 
 	gps_close(gdata);
 	gps_bfd.fd = -1; /* -1 or 0 indicates: 'close' */
@@ -242,7 +242,7 @@ static int nmea_checksum(char *line)
 	return (strtoul(line+1, NULL, 16) == checksum);
 }
 
-int osmo_serialgps_cb(struct bsc_fd *bfd, unsigned int what)
+int osmo_serialgps_cb(struct osmo_fd *bfd, unsigned int what)
 {
 	char buff[128];
 	static char line[128];
@@ -323,7 +323,7 @@ int osmo_serialgps_open(void)
 			printf("Failed to set termios for GPS\n");
 	}
 
-	bsc_register_fd(&gps_bfd);
+	osmo_fd_register(&gps_bfd);
 
 	return 0;
 }
@@ -335,7 +335,7 @@ void osmo_serialgps_close(void)
 
 	LOGP(DGPS, LOGL_INFO, "Close GPS device\n");
 
-	bsc_unregister_fd(&gps_bfd);
+	osmo_fd_unregister(&gps_bfd);
 
 	if (isatty(gps_bfd.fd))
 		tcsetattr(gps_bfd.fd, TCSANOW, &gps_old_termios);
diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c
index 23e1ef2d..32723596 100644
--- a/src/host/layer23/src/common/l1l2_interface.c
+++ b/src/host/layer23/src/common/l1l2_interface.c
@@ -42,7 +42,7 @@
 #define GSM_L2_LENGTH 256
 #define GSM_L2_HEADROOM 32
 
-static int layer2_read(struct bsc_fd *fd)
+static int layer2_read(struct osmo_fd *fd)
 {
 	struct msgb *msg;
 	u_int16_t len;
@@ -86,7 +86,7 @@ static int layer2_read(struct bsc_fd *fd)
 	return 0;
 }
 
-static int layer2_write(struct bsc_fd *fd, struct msgb *msg)
+static int layer2_write(struct osmo_fd *fd, struct msgb *msg)
 {
 	int rc;
 
@@ -132,7 +132,7 @@ int layer2_open(struct osmocom_ms *ms, const char *socket_path)
 	ms->l2_wq.read_cb = layer2_read;
 	ms->l2_wq.write_cb = layer2_write;
 
-	rc = bsc_register_fd(&ms->l2_wq.bfd);
+	rc = osmo_fd_register(&ms->l2_wq.bfd);
 	if (rc != 0) {
 		fprintf(stderr, "Failed to register fd.\n");
 		close(ms->l2_wq.bfd.fd);
@@ -149,7 +149,7 @@ int layer2_close(struct osmocom_ms *ms)
 
 	close(ms->l2_wq.bfd.fd);
 	ms->l2_wq.bfd.fd = -1;
-	bsc_unregister_fd(&ms->l2_wq.bfd);
+	osmo_fd_unregister(&ms->l2_wq.bfd);
 
 	return 0;
 }
diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c
index 61513eae..40e6a07b 100644
--- a/src/host/layer23/src/common/main.c
+++ b/src/host/layer23/src/common/main.c
@@ -278,7 +278,7 @@ int main(int argc, char **argv)
 	while (!quit) {
 		if (l23_app_work)
 			l23_app_work(ms);
-		bsc_select_main(0);
+		osmo_select_main(0);
 	}
 
 	return 0;
diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c
index 54aa6357..4d465f0a 100644
--- a/src/host/layer23/src/common/sap_interface.c
+++ b/src/host/layer23/src/common/sap_interface.c
@@ -42,7 +42,7 @@
 #define GSM_SAP_LENGTH 300
 #define GSM_SAP_HEADROOM 32
 
-static int sap_read(struct bsc_fd *fd)
+static int sap_read(struct osmo_fd *fd)
 {
 	struct msgb *msg;
 	u_int16_t len;
@@ -88,7 +88,7 @@ static int sap_read(struct bsc_fd *fd)
 	return 0;
 }
 
-static int sap_write(struct bsc_fd *fd, struct msgb *msg)
+static int sap_write(struct osmo_fd *fd, struct msgb *msg)
 {
 	int rc;
 
@@ -133,7 +133,7 @@ int sap_open(struct osmocom_ms *ms, const char *socket_path)
 	ms->sap_wq.read_cb = sap_read;
 	ms->sap_wq.write_cb = sap_write;
 
-	rc = bsc_register_fd(&ms->sap_wq.bfd);
+	rc = osmo_fd_register(&ms->sap_wq.bfd);
 	if (rc != 0) {
 		fprintf(stderr, "Failed to register fd.\n");
 		return rc;
@@ -149,7 +149,7 @@ int sap_close(struct osmocom_ms *ms)
 
 	close(ms->sap_wq.bfd.fd);
 	ms->sap_wq.bfd.fd = -1;
-	bsc_unregister_fd(&ms->sap_wq.bfd);
+	osmo_fd_unregister(&ms->sap_wq.bfd);
 
 	return 0;
 }
diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c
index 47659957..1f423a2a 100644
--- a/src/host/layer23/src/mobile/main.c
+++ b/src/host/layer23/src/mobile/main.c
@@ -202,7 +202,7 @@ int main(int argc, char **argv)
 		l23_app_work(&quit);
 		if (quit && llist_empty(&ms_list))
 			break;
-		bsc_select_main(0);
+		osmo_select_main(0);
 	}
 
 	l23_app_exit();