Change in osmo-bsc[master]: abis_om2000: make om2k_mo_name() an exported function

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Mon Dec 21 16:00:38 UTC 2020


laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21826 )


Change subject: abis_om2000: make om2k_mo_name() an exported function
......................................................................

abis_om2000: make om2k_mo_name() an exported function

Change-Id: Idb05bcad8059ab2b2be6c7057495d0279a4b62c7
---
M include/osmocom/bsc/abis_om2000.h
M src/osmo-bsc/abis_om2000.c
2 files changed, 22 insertions(+), 20 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/21826/1

diff --git a/include/osmocom/bsc/abis_om2000.h b/include/osmocom/bsc/abis_om2000.h
index 0d48c0c..58c07c4 100644
--- a/include/osmocom/bsc/abis_om2000.h
+++ b/include/osmocom/bsc/abis_om2000.h
@@ -130,4 +130,6 @@
 struct vty;
 void abis_om2k_config_write_bts(struct vty *vty, struct gsm_bts *bts);
 
+const char *abis_om2k_mo_name(const struct abis_om2k_mo *mo);
+
 #endif /* OPENBCS_ABIS_OM2K_H */
diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c
index a1eed5b..151ecdf 100644
--- a/src/osmo-bsc/abis_om2000.c
+++ b/src/osmo-bsc/abis_om2000.c
@@ -849,7 +849,7 @@
 	return abis_om2k_msg_tlv_parse(&odm->tp, o2h);
 }
 
-static char *om2k_mo_name(const struct abis_om2k_mo *mo)
+const char *abis_om2k_mo_name(const struct abis_om2k_mo *mo)
 {
 	static char mo_buf[64];
 
@@ -1042,7 +1042,7 @@
 		trx = gsm_bts_trx_num(bts, o2h->mo.inst);
 		if (!trx) {
 			LOGP(DNM, LOGL_ERROR, "MO=%s Tx Dropping msg to "
-				"non-existing TRX\n", om2k_mo_name(&o2h->mo));
+				"non-existing TRX\n", abis_om2k_mo_name(&o2h->mo));
 			return -ENODEV;
 		}
 		msg->dst = trx->oml_link;
@@ -1052,7 +1052,7 @@
 		trx = gsm_bts_trx_num(bts, o2h->mo.assoc_so);
 		if (!trx) {
 			LOGP(DNM, LOGL_ERROR, "MO=%s Tx Dropping msg to "
-				"non-existing TRX\n", om2k_mo_name(&o2h->mo));
+				"non-existing TRX\n", abis_om2k_mo_name(&o2h->mo));
 			return -ENODEV;
 		}
 		msg->dst = trx->oml_link;
@@ -1111,7 +1111,7 @@
 	o2k = (struct abis_om2k_hdr *) msgb_put(msg, sizeof(*o2k));
 	fill_om2k_hdr(o2k, mo, msg_type);
 
-	DEBUGP(DNM, "Tx MO=%s %s\n", om2k_mo_name(mo),
+	DEBUGP(DNM, "Tx MO=%s %s\n", abis_om2k_mo_name(mo),
 		get_value_string(om2k_msgcode_vals, msg_type));
 
 	return abis_om2k_sendmsg(bts, msg);
@@ -1168,7 +1168,7 @@
 
 	msgb_tv_put(msg, OM2K_DEI_OP_INFO, operational);
 
-	DEBUGP(DNM, "Tx MO=%s %s\n", om2k_mo_name(mo),
+	DEBUGP(DNM, "Tx MO=%s %s\n", abis_om2k_mo_name(mo),
 		get_value_string(om2k_msgcode_vals, OM2K_MSGT_OP_INFO));
 
 	/* we update the state here... and send the signal at ACK */
@@ -1240,7 +1240,7 @@
 	talloc_free(cg);
 
 	DEBUGP(DNM, "Tx MO=%s %s\n",
-		om2k_mo_name(&bts->rbs2000.is.om2k_mo.addr),
+		abis_om2k_mo_name(&bts->rbs2000.is.om2k_mo.addr),
 		get_value_string(om2k_msgcode_vals, OM2K_MSGT_IS_CONF_REQ));
 
 	return abis_om2k_sendmsg(bts, msg);
@@ -1290,7 +1290,7 @@
 			OM2K_MSGT_CON_CONF_REQ);
 
 	DEBUGP(DNM, "Tx MO=%s %s\n",
-		om2k_mo_name(&bts->rbs2000.con.om2k_mo.addr),
+		abis_om2k_mo_name(&bts->rbs2000.con.om2k_mo.addr),
 		get_value_string(om2k_msgcode_vals, OM2K_MSGT_CON_CONF_REQ));
 
 	return abis_om2k_sendmsg(bts, msg);
@@ -1319,7 +1319,7 @@
 	fill_om2k_hdr(o2k, &bts->rbs2000.mctr.om2k_mo.addr,
 			OM2K_MSGT_MCTR_CONF_REQ);
 	DEBUGP(DNM, "Tx MO=%s %s\n",
-		om2k_mo_name(&bts->rbs2000.mctr.om2k_mo.addr),
+		abis_om2k_mo_name(&bts->rbs2000.mctr.om2k_mo.addr),
 		get_value_string(om2k_msgcode_vals, OM2K_MSGT_MCTR_CONF_REQ));
 
 	return abis_om2k_sendmsg(bts, msg);
@@ -1409,7 +1409,7 @@
 			  sizeof(fs_offset_undef), fs_offset_undef);
 
 	DEBUGP(DNM, "Tx MO=%s %s\n",
-		om2k_mo_name(&bts->rbs2000.tf.om2k_mo.addr),
+		abis_om2k_mo_name(&bts->rbs2000.tf.om2k_mo.addr),
 		get_value_string(om2k_msgcode_vals, OM2K_MSGT_TF_CONF_REQ));
 
 	return abis_om2k_sendmsg(bts, msg);
@@ -1606,7 +1606,7 @@
 	}
 
 	DEBUGP(DNM, "Tx MO=%s %s\n",
-		om2k_mo_name(&mo),
+		abis_om2k_mo_name(&mo),
 		get_value_string(om2k_msgcode_vals, OM2K_MSGT_TS_CONF_REQ));
 
 	return abis_om2k_sendmsg(ts->trx->bts, msg);
@@ -2598,7 +2598,7 @@
 
 	msgb_tlv_put(msg, OM2K_DEI_NEGOT_REC2, len, data);
 
-	DEBUGP(DNM, "Tx MO=%s %s\n", om2k_mo_name(mo),
+	DEBUGP(DNM, "Tx MO=%s %s\n", abis_om2k_mo_name(mo),
 		get_value_string(om2k_msgcode_vals, OM2K_MSGT_NEGOT_REQ_ACK));
 
 	return abis_om2k_sendmsg(bts, msg);
@@ -2720,7 +2720,7 @@
 	uint16_t msg_type = ntohs(o2h->msg_type);
 	struct tlv_parsed tp;
 
-	LOGP(DNM, LOGL_ERROR, "Rx MO=%s %s", om2k_mo_name(&o2h->mo),
+	LOGP(DNM, LOGL_ERROR, "Rx MO=%s %s", abis_om2k_mo_name(&o2h->mo),
 		get_value_string(om2k_msgcode_vals, msg_type));
 
 	abis_om2k_msg_tlv_parse(&tp, o2h);
@@ -2746,7 +2746,7 @@
 	mo_state = *TLVP_VAL(&odm->tp, OM2K_DEI_MO_STATE);
 
 	LOGP(DNM, LOGL_DEBUG, "Rx MO=%s %s, MO State: %s\n",
-		om2k_mo_name(&odm->o2h.mo),
+		abis_om2k_mo_name(&odm->o2h.mo),
 		get_value_string(om2k_msgcode_vals, odm->msg_type),
 		get_value_string(om2k_mostate_vals, mo_state));
 
@@ -2756,7 +2756,7 @@
 	    && mo_state != OM2K_MO_S_ENABLED) {
 		LOGP(DNM, LOGL_ERROR,
 		     "Rx MO=%s %s Failed to enable MO State!\n",
-		     om2k_mo_name(&odm->o2h.mo),
+		     abis_om2k_mo_name(&odm->o2h.mo),
 		     get_value_string(om2k_msgcode_vals, odm->msg_type));
 	}
 
@@ -2797,7 +2797,7 @@
 	}
 
 	sprintf(string + strlen(string), ")\n");
-	DEBUGP(DNM, "Rx MO=%s %s", om2k_mo_name(mo), string);
+	DEBUGP(DNM, "Rx MO=%s %s", abis_om2k_mo_name(mo), string);
 
 	return true;
 }
@@ -2828,7 +2828,7 @@
 	src_len--;
 	if (msg_code != OM2K_MSGT_FAULT_REP) {
 		LOGP(DNM, LOGL_ERROR, "Rx MO=%s Fault report: invalid message code!\n",
-		     om2k_mo_name(mo));
+		     abis_om2k_mo_name(mo));
 		return;
 	}
 
@@ -2844,7 +2844,7 @@
 		if (tlv_count >= 11) {
 			LOGP(DNM, LOGL_ERROR,
 			     "Rx MO=%s Fault Report: too many tlv elements!\n",
-			     om2k_mo_name(mo));
+			     abis_om2k_mo_name(mo));
 			return;
 		}
 
@@ -2856,7 +2856,7 @@
 		else {
 			LOGP(DNM, LOGL_ERROR,
 			     "Rx MO=%s Fault Report: invalid tlv element!\n",
-			     om2k_mo_name(mo));
+			     abis_om2k_mo_name(mo));
 			return;
 		}
 
@@ -2884,7 +2884,7 @@
 
 	if (!faults_present) {
 		DEBUGP(DNM, "Rx MO=%s Fault Report: All faults ceased!\n",
-		       om2k_mo_name(mo));
+		       abis_om2k_mo_name(mo));
 	}
 }
 
@@ -2920,7 +2920,7 @@
 		return -EINVAL;
 	}
 
-	DEBUGP(DNM, "Rx MO=%s %s (%s)\n", om2k_mo_name(&o2h->mo),
+	DEBUGP(DNM, "Rx MO=%s %s (%s)\n", abis_om2k_mo_name(&o2h->mo),
 		get_value_string(om2k_msgcode_vals, msg_type),
 		osmo_hexdump(msg->l2h, msgb_l2len(msg)));
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21826
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Idb05bcad8059ab2b2be6c7057495d0279a4b62c7
Gerrit-Change-Number: 21826
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201221/5c2558c4/attachment.htm>


More information about the gerrit-log mailing list