From e4fbd43fd523dca125237786586d5881f209e65c Mon Sep 17 00:00:00 2001
From: root <root@sysmocom>
Date: Sat, 15 Oct 2016 21:24:57 +0200
Subject: om2000: Add support for querying RBS capabilities

---
 openbsc/include/openbsc/abis_om2000.h |  1 +
 openbsc/src/libbsc/abis_om2000.c      | 15 +++++++++++++++
 openbsc/src/libbsc/abis_om2000_vty.c  | 12 ++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/openbsc/include/openbsc/abis_om2000.h b/openbsc/include/openbsc/abis_om2000.h
index 5a7344f40..c745112f3 100644
--- a/openbsc/include/openbsc/abis_om2000.h
+++ b/openbsc/include/openbsc/abis_om2000.h
@@ -77,6 +77,7 @@ int abis_om2k_tx_disable_req(struct gsm_bts *bts, const struct abis_om2k_mo *mo)
 int abis_om2k_tx_test_req(struct gsm_bts *bts, const struct abis_om2k_mo *mo);
 int abis_om2k_tx_op_info(struct gsm_bts *bts, const struct abis_om2k_mo *mo,
 			 uint8_t operational);
+int abis_om2k_tx_cap_req(struct gsm_bts *bts, const struct abis_om2k_mo *mo);
 int abis_om2k_tx_is_conf_req(struct gsm_bts *bts);
 int abis_om2k_tx_tf_conf_req(struct gsm_bts *bts);
 int abis_om2k_tx_rx_conf_req(struct gsm_bts_trx *trx);
diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c
index aeac87614..33374127a 100644
--- a/openbsc/src/libbsc/abis_om2000.c
+++ b/openbsc/src/libbsc/abis_om2000.c
@@ -190,6 +190,13 @@ enum abis_om2k_msgtype {
 	OM2K_MSGT_TX_CONF_RES_NACK		= 0x00b5,
 	OM2K_MSGT_TX_CONF_RES			= 0x00b6,
 
+	OM2K_MSGT_CAPA_REQ			= 0x00e8,
+	OM2K_MSGT_CAPA_REQ_ACK			= 0x00ea,
+	OM2K_MSGT_CAPA_REQ_REJ			= 0x00eb,
+	OM2K_MSGT_CAPA_RES			= 0x00ee,
+	OM2K_MSGT_CAPA_RES_ACK			= 0x00ec,
+	OM2K_MSGT_CAPA_RES_NACK			= 0x00ed,
+
 	OM2K_MSGT_NEGOT_REQ_ACK			= 0x0104,
 	OM2K_MSGT_NEGOT_REQ_NACK		= 0x0105,
 	OM2K_MSGT_NEGOT_REQ			= 0x0106,
@@ -1067,6 +1074,11 @@ int abis_om2k_tx_op_info(struct gsm_bts *bts, const struct abis_om2k_mo *mo,
 	return abis_om2k_sendmsg(bts, msg);
 }
 
+int abis_om2k_tx_cap_req(struct gsm_bts *bts, const struct abis_om2k_mo *mo)
+{
+	return abis_om2k_tx_simple(bts, mo, OM2K_MSGT_CAPA_REQ);
+}
+
 static void om2k_fill_is_conn_grp(struct om2k_is_conn_grp *grp, uint16_t icp1,
 				  uint16_t icp2, uint8_t cont_idx)
 {
@@ -2439,6 +2451,9 @@ int abis_om2k_rcvmsg(struct msgb *msg)
 	case OM2K_MSGT_TEST_RES:
 		rc = abis_om2k_tx_simple(bts, &o2h->mo, OM2K_MSGT_TEST_RES_ACK);
 		break;
+	case OM2K_MSGT_CAPA_RES:
+		rc = abis_om2k_tx_simple(bts, &o2h->mo, OM2K_MSGT_CAPA_RES_ACK);
+		break;
 	/* ERrors */
 	case OM2K_MSGT_START_REQ_REJ:
 	case OM2K_MSGT_CONNECT_REJ:
diff --git a/openbsc/src/libbsc/abis_om2000_vty.c b/openbsc/src/libbsc/abis_om2000_vty.c
index 72422a1d5..d48ff9562 100644
--- a/openbsc/src/libbsc/abis_om2000_vty.c
+++ b/openbsc/src/libbsc/abis_om2000_vty.c
@@ -236,6 +236,17 @@ DEFUN(om2k_test, om2k_test_cmd,
 	return CMD_SUCCESS;
 }
 
+DEFUN(om2k_cap_req, om2k_cap_req_cmd,
+	"capabilities-request",
+	"Request MO capabilities\n")
+{
+	struct oml_node_state *oms = vty->index;
+
+	abis_om2k_tx_cap_req(oms->bts, &oms->mo);
+	return CMD_SUCCESS;
+}
+
+
 struct con_conn_group {
 	struct llist_head list;
 
@@ -455,6 +466,7 @@ int abis_om2k_vty_init(void)
 	install_element(OM2K_NODE, &om2k_disable_cmd);
 	install_element(OM2K_NODE, &om2k_op_info_cmd);
 	install_element(OM2K_NODE, &om2k_test_cmd);
+	install_element(OM2K_NODE, &om2k_cap_req_cmd);
 	install_element(OM2K_NODE, &om2k_conf_req_cmd);
 	install_element(OM2K_NODE, &om2k_con_list_dec_cmd);
 	install_element(OM2K_NODE, &om2k_con_list_tei_cmd);
-- 
cgit v1.2.3