[PATCH] osmo-bts[master]: lc15: port lc15bts-mgr changes
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3277 to look at the new patch set (#4). lc15: port lc15bts-mgr changes That's mostly changes related to lc15bts-mgr from https://gitlab.com/nrw_noa/osmo-bts branch nrw/litecell15 based on eb5b7f80510b603579f7af6d7d5ead296c2fa260 commit. I wanted to incorporate vty and hardcoded paths changes so we can use it from this point without major backward-incompatible changes as a base for future ports. Change-Id: Iabbaedc84594150a4e5445c16dd1f6f89858 Related: SYS#3679 --- M doc/examples/litecell15/lc15bts-mgr.cfg M include/osmo-bts/phy_link.h M src/common/Makefile.am M src/osmo-bts-litecell15/Makefile.am M src/osmo-bts-litecell15/hw_misc.c A src/osmo-bts-litecell15/misc/lc15bts_bts.c A src/osmo-bts-litecell15/misc/lc15bts_bts.h M src/osmo-bts-litecell15/misc/lc15bts_clock.c A src/osmo-bts-litecell15/misc/lc15bts_led.c A src/osmo-bts-litecell15/misc/lc15bts_led.h M src/osmo-bts-litecell15/misc/lc15bts_mgr.c M src/osmo-bts-litecell15/misc/lc15bts_mgr.h M src/osmo-bts-litecell15/misc/lc15bts_mgr_temp.c M src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c M src/osmo-bts-litecell15/misc/lc15bts_misc.c M src/osmo-bts-litecell15/misc/lc15bts_misc.h M src/osmo-bts-litecell15/misc/lc15bts_par.c M src/osmo-bts-litecell15/misc/lc15bts_par.h M src/osmo-bts-litecell15/misc/lc15bts_power.c M src/osmo-bts-litecell15/misc/lc15bts_power.h M src/osmo-bts-litecell15/misc/lc15bts_temp.c M src/osmo-bts-litecell15/misc/lc15bts_temp.h 22 files changed, 2,014 insertions(+), 411 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/3277/4 diff --git a/doc/examples/litecell15/lc15bts-mgr.cfg b/doc/examples/litecell15/lc15bts-mgr.cfg index 750dc36..c7d0a79 100644 --- a/doc/examples/litecell15/lc15bts-mgr.cfg +++ b/doc/examples/litecell15/lc15bts-mgr.cfg @@ -25,39 +25,19 @@ no login ! lc15bts-mgr - limits supply - threshold warning 60 - threshold critical 78 - limits soc - threshold warning 60 - threshold critical 78 - limits fpga - threshold warning 60 - threshold critical 78 - limits logrf - threshold warning 60 - threshold critical 78 - limits tx0 - threshold warning 60 - threshold critical 78 - limits tx1 - threshold warning 60 - threshold critical 78 - limits pa0 - threshold warning 60 - threshold critical 78 - limits pa1 - threshold warning 60 - threshold critical 78 - actions normal - pa0-on - pa1-on - bts-service-on - actions warn - no pa0-off - no pa1-off - no bts-service-off - actions critical - pa0-off - pa1-off - no bts-service-off + limits supply_volt + threshold warning min 17500 + threshold critical min 19000 + limits tx0_vswr + threshold warning max 3 + limits tx1_vswr + threshold warning max 3 + limits supply_pwr + threshold warning max 110 + threshold critical max 120 + limits pa0_pwr + threshold warning max 50 + threshold critical max 60 + limits pa1_pwr + threshold warning max 50 + threshold critical max 60 diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index d8d3c6b..3d4bf91 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -124,6 +124,12 @@ int minTxPower; int maxTxPower; struct lc15l1_hdl *hdl; + uint8_t max_cell_size; /* 0:166 qbits*/ + uint8_t diversity_mode; /* 0: SISO A, 1: SISO B, 2: MRC */ + uint8_t pedestal_mode; /* 0: unused TS is OFF, 1: unused TS is in minimum Tx power */ + uint8_t dsp_alive_period; /* DSP alive timer period */ + uint8_t tx_pwr_adj_mode;/* 0: no auto adjust power, 1: auto adjust power using RMS detector */ + uint8_t tx_pwr_red_8psk;/* 8-PSK maximum Tx power reduction level in dB */ } lc15; } u; }; diff --git a/src/common/Makefile.am b/src/common/Makefile.am index dd368d0..d104c48 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -2,6 +2,10 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOCODEC_LIBS) +if ENABLE_LC15BTS +AM_CFLAGS += -DENABLE_LC15BTS +endif + noinst_LIBRARIES = libbts.a libl1sched.a libbts_a_SOURCES = gsm_data_shared.c sysinfo.c logging.c abis.c oml.c bts.c \ rsl.c vty.c paging.c measurement.c amr.c lchan.c \ diff --git a/src/osmo-bts-litecell15/Makefile.am b/src/osmo-bts-litecell15/Makefile.am index 3026e96..90e6c46 100644 --- a/src/osmo-bts-litecell15/Makefile.am +++ b/src/osmo-bts-litecell15/Makefile.am @@ -4,9 +4,11 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS)
[PATCH] osmo-bts[master]: lc15: port lc15bts-mgr changes
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3277 to look at the new patch set (#2). lc15: port lc15bts-mgr changes Change-Id: Iabbaedc84594150a4e5445c16dd1f6f89858 Related: SYS#3679 --- M doc/examples/litecell15/lc15bts-mgr.cfg M include/osmo-bts/phy_link.h M src/common/Makefile.am M src/osmo-bts-litecell15/Makefile.am M src/osmo-bts-litecell15/hw_misc.c A src/osmo-bts-litecell15/misc/lc15bts_bts.c A src/osmo-bts-litecell15/misc/lc15bts_bts.h M src/osmo-bts-litecell15/misc/lc15bts_clock.c A src/osmo-bts-litecell15/misc/lc15bts_led.c A src/osmo-bts-litecell15/misc/lc15bts_led.h M src/osmo-bts-litecell15/misc/lc15bts_mgr.c M src/osmo-bts-litecell15/misc/lc15bts_mgr.h M src/osmo-bts-litecell15/misc/lc15bts_mgr_temp.c M src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c M src/osmo-bts-litecell15/misc/lc15bts_misc.c M src/osmo-bts-litecell15/misc/lc15bts_misc.h M src/osmo-bts-litecell15/misc/lc15bts_par.c M src/osmo-bts-litecell15/misc/lc15bts_par.h M src/osmo-bts-litecell15/misc/lc15bts_power.c M src/osmo-bts-litecell15/misc/lc15bts_power.h M src/osmo-bts-litecell15/misc/lc15bts_temp.c M src/osmo-bts-litecell15/misc/lc15bts_temp.h 22 files changed, 2,014 insertions(+), 411 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/3277/2 diff --git a/doc/examples/litecell15/lc15bts-mgr.cfg b/doc/examples/litecell15/lc15bts-mgr.cfg index 750dc36..c7d0a79 100644 --- a/doc/examples/litecell15/lc15bts-mgr.cfg +++ b/doc/examples/litecell15/lc15bts-mgr.cfg @@ -25,39 +25,19 @@ no login ! lc15bts-mgr - limits supply - threshold warning 60 - threshold critical 78 - limits soc - threshold warning 60 - threshold critical 78 - limits fpga - threshold warning 60 - threshold critical 78 - limits logrf - threshold warning 60 - threshold critical 78 - limits tx0 - threshold warning 60 - threshold critical 78 - limits tx1 - threshold warning 60 - threshold critical 78 - limits pa0 - threshold warning 60 - threshold critical 78 - limits pa1 - threshold warning 60 - threshold critical 78 - actions normal - pa0-on - pa1-on - bts-service-on - actions warn - no pa0-off - no pa1-off - no bts-service-off - actions critical - pa0-off - pa1-off - no bts-service-off + limits supply_volt + threshold warning min 17500 + threshold critical min 19000 + limits tx0_vswr + threshold warning max 3 + limits tx1_vswr + threshold warning max 3 + limits supply_pwr + threshold warning max 110 + threshold critical max 120 + limits pa0_pwr + threshold warning max 50 + threshold critical max 60 + limits pa1_pwr + threshold warning max 50 + threshold critical max 60 diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index d8d3c6b..3d4bf91 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -124,6 +124,12 @@ int minTxPower; int maxTxPower; struct lc15l1_hdl *hdl; + uint8_t max_cell_size; /* 0:166 qbits*/ + uint8_t diversity_mode; /* 0: SISO A, 1: SISO B, 2: MRC */ + uint8_t pedestal_mode; /* 0: unused TS is OFF, 1: unused TS is in minimum Tx power */ + uint8_t dsp_alive_period; /* DSP alive timer period */ + uint8_t tx_pwr_adj_mode;/* 0: no auto adjust power, 1: auto adjust power using RMS detector */ + uint8_t tx_pwr_red_8psk;/* 8-PSK maximum Tx power reduction level in dB */ } lc15; } u; }; diff --git a/src/common/Makefile.am b/src/common/Makefile.am index dd368d0..d104c48 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -2,6 +2,10 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOCODEC_LIBS) +if ENABLE_LC15BTS +AM_CFLAGS += -DENABLE_LC15BTS +endif + noinst_LIBRARIES = libbts.a libl1sched.a libbts_a_SOURCES = gsm_data_shared.c sysinfo.c logging.c abis.c oml.c bts.c \ rsl.c vty.c paging.c measurement.c amr.c lchan.c \ diff --git a/src/osmo-bts-litecell15/Makefile.am b/src/osmo-bts-litecell15/Makefile.am index 3026e96..90e6c46 100644 --- a/src/osmo-bts-litecell15/Makefile.am +++ b/src/osmo-bts-litecell15/Makefile.am @@ -4,9 +4,11 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) $(ORTP_CFLAGS) COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS) -EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h \ +AM_CFLAGS += -DENABLE_LC15BTS +
[PATCH] osmo-bts[master]: lc15: port lc15bts-mgr changes
Review at https://gerrit.osmocom.org/3277 lc15: port lc15bts-mgr changes Change-Id: Iabbaedc84594150a4e5445c16dd1f6f89858 Related: SYS#3679 --- M doc/examples/litecell15/lc15bts-mgr.cfg M include/osmo-bts/phy_link.h M src/common/Makefile.am M src/osmo-bts-litecell15/Makefile.am M src/osmo-bts-litecell15/hw_misc.c A src/osmo-bts-litecell15/misc/lc15bts_bts.c A src/osmo-bts-litecell15/misc/lc15bts_bts.h M src/osmo-bts-litecell15/misc/lc15bts_clock.c A src/osmo-bts-litecell15/misc/lc15bts_led.c A src/osmo-bts-litecell15/misc/lc15bts_led.h M src/osmo-bts-litecell15/misc/lc15bts_mgr.c M src/osmo-bts-litecell15/misc/lc15bts_mgr.h M src/osmo-bts-litecell15/misc/lc15bts_mgr_temp.c M src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c M src/osmo-bts-litecell15/misc/lc15bts_misc.c M src/osmo-bts-litecell15/misc/lc15bts_misc.h M src/osmo-bts-litecell15/misc/lc15bts_par.c M src/osmo-bts-litecell15/misc/lc15bts_par.h M src/osmo-bts-litecell15/misc/lc15bts_power.c M src/osmo-bts-litecell15/misc/lc15bts_power.h M src/osmo-bts-litecell15/misc/lc15bts_temp.c M src/osmo-bts-litecell15/misc/lc15bts_temp.h 22 files changed, 2,013 insertions(+), 410 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/3277/1 diff --git a/doc/examples/litecell15/lc15bts-mgr.cfg b/doc/examples/litecell15/lc15bts-mgr.cfg index 750dc36..c7d0a79 100644 --- a/doc/examples/litecell15/lc15bts-mgr.cfg +++ b/doc/examples/litecell15/lc15bts-mgr.cfg @@ -25,39 +25,19 @@ no login ! lc15bts-mgr - limits supply - threshold warning 60 - threshold critical 78 - limits soc - threshold warning 60 - threshold critical 78 - limits fpga - threshold warning 60 - threshold critical 78 - limits logrf - threshold warning 60 - threshold critical 78 - limits tx0 - threshold warning 60 - threshold critical 78 - limits tx1 - threshold warning 60 - threshold critical 78 - limits pa0 - threshold warning 60 - threshold critical 78 - limits pa1 - threshold warning 60 - threshold critical 78 - actions normal - pa0-on - pa1-on - bts-service-on - actions warn - no pa0-off - no pa1-off - no bts-service-off - actions critical - pa0-off - pa1-off - no bts-service-off + limits supply_volt + threshold warning min 17500 + threshold critical min 19000 + limits tx0_vswr + threshold warning max 3 + limits tx1_vswr + threshold warning max 3 + limits supply_pwr + threshold warning max 110 + threshold critical max 120 + limits pa0_pwr + threshold warning max 50 + threshold critical max 60 + limits pa1_pwr + threshold warning max 50 + threshold critical max 60 diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index d8d3c6b..3d4bf91 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -124,6 +124,12 @@ int minTxPower; int maxTxPower; struct lc15l1_hdl *hdl; + uint8_t max_cell_size; /* 0:166 qbits*/ + uint8_t diversity_mode; /* 0: SISO A, 1: SISO B, 2: MRC */ + uint8_t pedestal_mode; /* 0: unused TS is OFF, 1: unused TS is in minimum Tx power */ + uint8_t dsp_alive_period; /* DSP alive timer period */ + uint8_t tx_pwr_adj_mode;/* 0: no auto adjust power, 1: auto adjust power using RMS detector */ + uint8_t tx_pwr_red_8psk;/* 8-PSK maximum Tx power reduction level in dB */ } lc15; } u; }; diff --git a/src/common/Makefile.am b/src/common/Makefile.am index dd368d0..d104c48 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -2,6 +2,10 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOCODEC_LIBS) +if ENABLE_LC15BTS +AM_CFLAGS += -DENABLE_LC15BTS +endif + noinst_LIBRARIES = libbts.a libl1sched.a libbts_a_SOURCES = gsm_data_shared.c sysinfo.c logging.c abis.c oml.c bts.c \ rsl.c vty.c paging.c measurement.c amr.c lchan.c \ diff --git a/src/osmo-bts-litecell15/Makefile.am b/src/osmo-bts-litecell15/Makefile.am index 3026e96..7920df4 100644 --- a/src/osmo-bts-litecell15/Makefile.am +++ b/src/osmo-bts-litecell15/Makefile.am @@ -4,7 +4,9 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) $(ORTP_CFLAGS) COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS) -EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h \ +AM_CFLAGS += -DENABLE_LC15BTS + +EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h misc/lc15bts_led.h \