[PATCH] src: use namespace prefix osmo_wqueue*

Pablo Neira Ayuso pablo at gnumonks.org
Sun May 15 12:23:14 UTC 2011


Summary of changes:

s/struct write_queue/struct osmo_wqueue/g
s/write_queue_init/osmo_wqueue_init/g
s/write_queue_clear/osmo_wqueue_clear/g
s/write_queue_enqueue/osmo_wqueue_enqueue/g
s/write_queue_bfd_cb/osmo_wqueue_bfd_cb/g
---
 .../include/osmocom/bb/common/osmocom_data.h       |    2 +-
 src/host/layer23/src/common/l1l2_interface.c       |    4 ++--
 src/host/layer23/src/common/sap_interface.c        |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
index 9d8a030..9ca4114 100644
--- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
+++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
@@ -50,7 +50,7 @@ struct rx_meas_stat {
 struct osmocom_ms {
 	struct llist_head entity;
 	char name[32];
-	struct write_queue l2_wq, sap_wq;
+	struct osmo_wqueue l2_wq, sap_wq;
 	uint16_t test_arfcn;
 
 	uint8_t deleting, shutdown, started;
diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c
index 3272359..2abb660 100644
--- a/src/host/layer23/src/common/l1l2_interface.c
+++ b/src/host/layer23/src/common/l1l2_interface.c
@@ -126,7 +126,7 @@ int layer2_open(struct osmocom_ms *ms, const char *socket_path)
 		return rc;
 	}
 
-	write_queue_init(&ms->l2_wq, 100);
+	osmo_wqueue_init(&ms->l2_wq, 100);
 	ms->l2_wq.bfd.data = ms;
 	ms->l2_wq.bfd.when = BSC_FD_READ;
 	ms->l2_wq.read_cb = layer2_read;
@@ -167,7 +167,7 @@ int osmo_send_l1(struct osmocom_ms *ms, struct msgb *msg)
 	len = (uint16_t *) msgb_push(msg, sizeof(*len));
 	*len = htons(msg->len - sizeof(*len));
 
-	if (write_queue_enqueue(&ms->l2_wq, msg) != 0) {
+	if (osmo_wqueue_enqueue(&ms->l2_wq, msg) != 0) {
 		LOGP(DL1C, LOGL_ERROR, "Failed to enqueue msg.\n");
 		msgb_free(msg);
 		return -1;
diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c
index 4d465f0..5d92840 100644
--- a/src/host/layer23/src/common/sap_interface.c
+++ b/src/host/layer23/src/common/sap_interface.c
@@ -127,7 +127,7 @@ int sap_open(struct osmocom_ms *ms, const char *socket_path)
 		return rc;
 	}
 
-	write_queue_init(&ms->sap_wq, 100);
+	osmo_wqueue_init(&ms->sap_wq, 100);
 	ms->sap_wq.bfd.data = ms;
 	ms->sap_wq.bfd.when = BSC_FD_READ;
 	ms->sap_wq.read_cb = sap_read;
@@ -170,7 +170,7 @@ int osmosap_send(struct osmocom_ms *ms, struct msgb *msg)
 	len = (uint16_t *) msgb_push(msg, sizeof(*len));
 	*len = htons(msg->len - sizeof(*len));
 
-	if (write_queue_enqueue(&ms->sap_wq, msg) != 0) {
+	if (osmo_wqueue_enqueue(&ms->sap_wq, msg) != 0) {
 		LOGP(DSAP, LOGL_ERROR, "Failed to enqueue msg.\n");
 		msgb_free(msg);
 		return -1;
-- 
1.7.2.5


--------------080404070907070702060601--




More information about the baseband-devel mailing list