OM2000: TLV parser definitions for more DEI's

1 files changed, 40 insertions, 0 deletions

diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c
index eb0e3e190..00bbc4520 100644
--- a/openbsc/src/libbsc/abis_om2000.c
+++ b/openbsc/src/libbsc/abis_om2000.c
@@ -176,6 +176,8 @@ enum abis_om2k_dei {
 	OM2K_DEI_CON_CONN_LIST			= 0x10,
 	OM2K_DEI_DRX_DEV_MAX			= 0x12,
 	OM2K_DEI_END_LIST_NR			= 0x13,
+	OM2K_DEI_EXT_COND_MAP_1			= 0x14,
+	OM2K_DEI_EXT_COND_MAP_2			= 0x15,
 	OM2K_DEI_FILLING_MARKER			= 0x1c,
 	OM2K_DEI_FN_OFFSET			= 0x1d,
 	OM2K_DEI_FREQ_LIST			= 0x1e,
@@ -183,9 +185,15 @@ enum abis_om2k_dei {
 	OM2K_DEI_FREQ_SPEC_TX			= 0x20,
 	OM2K_DEI_HSN				= 0x21,
 	OM2K_DEI_ICM_INDICATOR			= 0x22,
+	OM2K_DEI_INT_FAULT_MAP_1A		= 0x23,
+	OM2K_DEI_INT_FAULT_MAP_1B		= 0x24,
+	OM2K_DEI_INT_FAULT_MAP_2A		= 0x25,
+	OM2K_DEI_INT_FAULT_MAP_2A_EXT		= 0x26,
 	OM2K_DEI_IS_CONN_LIST			= 0x27,
 	OM2K_DEI_LIST_NR			= 0x28,
+	OM2K_DEI_LOCAL_ACCESS			= 0x2a,
 	OM2K_DEI_MAIO				= 0x2b,
+	OM2K_DEI_MO_STATE			= 0x2c,
 	OM2K_DEI_NY1				= 0x2d,
 	OM2K_DEI_OP_INFO			= 0x2e,
 	OM2K_DEI_POWER				= 0x2f,
@@ -196,16 +204,28 @@ enum abis_om2k_dei {
 	OM2K_DEI_TF_MODE			= 0x3a,
 	OM2K_DEI_TS_NR				= 0x3c,
 	OM2K_DEI_TSC				= 0x3d,
+	OM2K_DEI_BTS_VERSION			= 0x40,
+	OM2K_DEI_OML_IWD_VERSION		= 0x41,
+	OM2K_DEI_RSL_IWD_VERSION		= 0x42,
+	OM2K_DEI_OML_FUNC_MAP_1			= 0x43,
+	OM2K_DEI_OML_FUNC_MAP_2			= 0x44,
+	OM2K_DEI_RSL_FUNC_MAP_1			= 0x45,
+	OM2K_DEI_RSL_FUNC_MAP_2			= 0x46,
 	OM2K_DEI_EXT_RANGE			= 0x47,
+	OM2K_DEI_REQ_IND			= 0x48,
+	OM2K_DEI_REPL_UNIT_MAP			= 0x50,
 	OM2K_DEI_LSC				= 0x79,
 	OM2K_DEI_LSC_FILT_TIME			= 0x7a,
 	OM2K_DEI_CALL_SUPV_TIME			= 0x7b,
+	OM2K_DEI_HW_INFO_SIG			= 0x84,
 	OM2K_DEI_TTA				= 0x87,
+	OM2K_DEI_CAPA_SIG			= 0x8a,
 	OM2K_DEI_NEGOT_REC1			= 0x90,
 	OM2K_DEI_NEGOT_REC2			= 0x91,
 	OM2K_DEI_ENCR_ALG			= 0x92,
 	OM2K_DEI_INTERF_REJ_COMB		= 0x94,
 	OM2K_DEI_FS_OFFSET			= 0x98,
+	OM2K_DEI_EXT_COND_MAP_2_EXT		= 0x9c,
 };
 
 const struct tlv_definition om2k_att_tlvdef = {
@@ -215,12 +235,18 @@ const struct tlv_definition om2k_att_tlvdef = {
 		[OM2K_DEI_BSIC] =		{ TLV_TYPE_TV },
 		[OM2K_DEI_BA_PA_MFRMS] =	{ TLV_TYPE_TV },
 		[OM2K_DEI_CBCH_INDICATOR] =	{ TLV_TYPE_TV },
+		[OM2K_DEI_INT_FAULT_MAP_1A] =	{ TLV_TYPE_FIXED, 6 },
+		[OM2K_DEI_INT_FAULT_MAP_1B] =	{ TLV_TYPE_FIXED, 6 },
+		[OM2K_DEI_INT_FAULT_MAP_2A] =	{ TLV_TYPE_FIXED, 6 },
+		[OM2K_DEI_INT_FAULT_MAP_2A_EXT]={ TLV_TYPE_FIXED, 6 },
 		[OM2K_DEI_CCCH_OPTIONS] =	{ TLV_TYPE_TV },
 		[OM2K_DEI_CAL_TIME] =		{ TLV_TYPE_FIXED, 6 },
 		[OM2K_DEI_COMBINATION] =	{ TLV_TYPE_TV },
 		[OM2K_DEI_CON_CONN_LIST] =	{ TLV_TYPE_TLV },
 		[OM2K_DEI_DRX_DEV_MAX] =	{ TLV_TYPE_TV },
 		[OM2K_DEI_END_LIST_NR] =	{ TLV_TYPE_TV },
+		[OM2K_DEI_EXT_COND_MAP_1] =	{ TLV_TYPE_FIXED, 2 },
+		[OM2K_DEI_EXT_COND_MAP_2] =	{ TLV_TYPE_FIXED, 2 },
 		[OM2K_DEI_FILLING_MARKER] =	{ TLV_TYPE_TV },
 		[OM2K_DEI_FN_OFFSET] =		{ TLV_TYPE_FIXED, 2 },
 		[OM2K_DEI_FREQ_LIST] =		{ TLV_TYPE_TLV },
@@ -230,7 +256,9 @@ const struct tlv_definition om2k_att_tlvdef = {
 		[OM2K_DEI_ICM_INDICATOR] =	{ TLV_TYPE_TV },
 		[OM2K_DEI_IS_CONN_LIST] =	{ TLV_TYPE_TLV },
 		[OM2K_DEI_LIST_NR] =		{ TLV_TYPE_TV },
+		[OM2K_DEI_LOCAL_ACCESS] =	{ TLV_TYPE_TV },
 		[OM2K_DEI_MAIO] =		{ TLV_TYPE_TV },
+		[OM2K_DEI_MO_STATE] =		{ TLV_TYPE_TV },
 		[OM2K_DEI_NY1] =		{ TLV_TYPE_TV },
 		[OM2K_DEI_OP_INFO] =		{ TLV_TYPE_TV },
 		[OM2K_DEI_POWER] =		{ TLV_TYPE_TV },
@@ -241,16 +269,28 @@ const struct tlv_definition om2k_att_tlvdef = {
 		[OM2K_DEI_TF_MODE] =		{ TLV_TYPE_TV },
 		[OM2K_DEI_TS_NR] =		{ TLV_TYPE_TV },
 		[OM2K_DEI_TSC] =		{ TLV_TYPE_TV },
+		[OM2K_DEI_BTS_VERSION] =	{ TLV_TYPE_FIXED, 12 },
+		[OM2K_DEI_OML_IWD_VERSION] =	{ TLV_TYPE_FIXED, 6 },
+		[OM2K_DEI_RSL_IWD_VERSION] =	{ TLV_TYPE_FIXED, 6 },
+		[OM2K_DEI_OML_FUNC_MAP_1] =	{ TLV_TYPE_TLV },
+		[OM2K_DEI_OML_FUNC_MAP_2] =	{ TLV_TYPE_TLV },
+		[OM2K_DEI_RSL_FUNC_MAP_1] =	{ TLV_TYPE_TLV },
+		[OM2K_DEI_RSL_FUNC_MAP_2] =	{ TLV_TYPE_TLV },
 		[OM2K_DEI_EXT_RANGE] =		{ TLV_TYPE_TV },
+		[OM2K_DEI_REQ_IND] =		{ TLV_TYPE_TV },
+		[OM2K_DEI_REPL_UNIT_MAP] =	{ TLV_TYPE_FIXED, 6 },
 		[OM2K_DEI_LSC] =		{ TLV_TYPE_TV },
 		[OM2K_DEI_LSC_FILT_TIME] =	{ TLV_TYPE_TV },
 		[OM2K_DEI_CALL_SUPV_TIME] =	{ TLV_TYPE_TV },
+		[OM2K_DEI_HW_INFO_SIG] =	{ TLV_TYPE_FIXED, 2 },
 		[OM2K_DEI_TTA] =		{ TLV_TYPE_TV },
+		[OM2K_DEI_CAPA_SIG] =		{ TLV_TYPE_FIXED, 2 },
 		[OM2K_DEI_NEGOT_REC1] =		{ TLV_TYPE_TLV },
 		[OM2K_DEI_NEGOT_REC2] =		{ TLV_TYPE_TLV },
 		[OM2K_DEI_ENCR_ALG] =		{ TLV_TYPE_TV },
 		[OM2K_DEI_INTERF_REJ_COMB] =	{ TLV_TYPE_TV },
 		[OM2K_DEI_FS_OFFSET] =		{ TLV_TYPE_FIXED, 5 },
+		[OM2K_DEI_EXT_COND_MAP_2_EXT] = { TLV_TYPE_FIXED, 4 },
 	},
 };