From adaf08bec898cbf97df7b8caa1d235e37f4503d1 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 18 Jan 2009 11:08:10 +0000 Subject: [PATCH] add some more BS11 specific OML definitions --- include/openbsc/abis_nm.h | 19 ++++++++++++++++--- src/abis_nm.c | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/include/openbsc/abis_nm.h b/include/openbsc/abis_nm.h index 0b732e14d..8255f1116 100644 --- a/include/openbsc/abis_nm.h +++ b/include/openbsc/abis_nm.h @@ -184,11 +184,19 @@ enum abis_nm_msgtype { NM_MT_BS11_DELETE_OBJ_ACK, NM_MT_BS11_DELETE_OBJ_NACK, - NM_MT_BS11_DEACT_TRX1 = 0xd0, /* BS11: Set attr */ + NM_MT_BS11_SET_ATTR = 0xd0, + NM_MT_BS11_SET_ATTR_ACK, + NM_MT_BS11_FACTORY_LOGON = 0xe5, + NM_MT_BS11_FACTORY_LOGON_ACK, NM_MT_BS11_RESTART = 0xe7, + NM_MT_BS11_RESTART_ACK, NM_MT_BS11_DISCONNECT = 0xe9, + NM_MT_BS11_DISCONNECT_ACK, + NM_MT_BS11_LOGOFF = 0xec, + NM_MT_BS11_LOGOFF_ACK, NM_MT_BS11_RECONNECT = 0xf1, + NM_MT_BS11_RECONNECT_ACK, }; /* Section 9.2: Object Class */ @@ -199,8 +207,11 @@ enum abis_nm_obj_class { NM_OC_BASEB_TRANSC, NM_OC_CHANNEL, /* RFU: 05-FE */ - NM_OC_BS11_unknown = 0xa3, + NM_OC_BS11_A0 = 0xa0, + NM_OC_BS11_A3 = 0xa3, + NM_OC_BS11_A4 = 0xa4, NM_OC_BS11 = 0xa5, + NM_OC_BS11_A6 = 0xa6, NM_OC_BS11_ENVABTSE = 0xa8, NM_OC_BS11_BPORT = 0xa9, @@ -209,7 +220,7 @@ enum abis_nm_obj_class { /* Section 9.4: Attributes */ enum abis_nm_attr { - NM_ATT_CHANNEL = 0x01, + NM_ATT_ABIS_CHANNEL = 0x01, NM_ATT_ADD_INFO, NM_ATT_ADD_TEXT, NM_ATT_ADM_STATE, @@ -267,6 +278,8 @@ enum abis_nm_attr { NM_ATT_VSWR_THRESH, NM_ATT_WINDOW_SIZE, /* Res */ + NM_ATT_BS11_TXPWR = 0x3e, + /* Res */ NM_ATT_TSC = 0x40, NM_ATT_SW_CONFIG, NM_ATT_SW_DESCR, diff --git a/src/abis_nm.c b/src/abis_nm.c index e6230b4b0..0a4f6bb77 100644 --- a/src/abis_nm.c +++ b/src/abis_nm.c @@ -287,7 +287,7 @@ int abis_nm_sw_activate(struct abis_nm_h *h) static void fill_nm_channel(struct abis_nm_channel *ch, u_int8_t bts_port, u_int8_t ts_nr, u_int8_t subslot_nr) { - ch->attrib = NM_ATT_CHANNEL; + ch->attrib = NM_ATT_ABIS_CHANNEL; ch->bts_port = bts_port; ch->timeslot = ts_nr; ch->subslot = subslot_nr;