diff options
| -rw-r--r-- | include/osmo-bts/oml.h | 1 | ||||
| -rw-r--r-- | include/osmo-bts/vty.h | 2 | ||||
| -rw-r--r-- | src/common/bts_ctrl_lookup.c | 1 | ||||
| -rw-r--r-- | src/common/l1sap.c | 1 | ||||
| -rw-r--r-- | src/common/msg_utils.c | 6 | ||||
| -rw-r--r-- | src/common/rsl.c | 1 | ||||
| -rw-r--r-- | src/common/vty.c | 4 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/l1_if.h | 2 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c | 2 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/sysmobts_vty.c | 1 |
10 files changed, 13 insertions, 8 deletions
diff --git a/include/osmo-bts/oml.h b/include/osmo-bts/oml.h index d32a5fbc..d3dda710 100644 --- a/include/osmo-bts/oml.h +++ b/include/osmo-bts/oml.h @@ -4,6 +4,7 @@ struct gsm_bts; struct gsm_abis_mo; struct msgb; +struct gsm_lchan; int oml_init(void); diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h index 510abab1..546729c0 100644 --- a/include/osmo-bts/vty.h +++ b/include/osmo-bts/vty.h @@ -12,7 +12,7 @@ enum bts_vty_node { extern struct cmd_element ournode_exit_cmd; extern struct cmd_element ournode_end_cmd; -enum node_type bts_vty_go_parent(struct vty *vty); +int bts_vty_go_parent(struct vty *vty); int bts_vty_is_config_node(struct vty *vty, int node); int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat); diff --git a/src/common/bts_ctrl_lookup.c b/src/common/bts_ctrl_lookup.c index e6937180..3857ec39 100644 --- a/src/common/bts_ctrl_lookup.c +++ b/src/common/bts_ctrl_lookup.c @@ -26,6 +26,7 @@ #include <osmocom/ctrl/ports.h> #include <osmo-bts/logging.h> #include <osmo-bts/gsm_data.h> +#include <osmo-bts/control_if.h> extern vector ctrl_node_vec; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index e6c361e6..56eaa668 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -45,6 +45,7 @@ #include <osmo-bts/rsl.h> #include <osmo-bts/bts_model.h> #include <osmo-bts/handover.h> +#include <osmo-bts/power_control.h> static struct gsm_lchan * get_lchan_by_chan_nr(struct gsm_bts_trx *trx, unsigned int chan_nr) diff --git a/src/common/msg_utils.c b/src/common/msg_utils.c index 22a3012a..841ffe61 100644 --- a/src/common/msg_utils.c +++ b/src/common/msg_utils.c @@ -96,7 +96,7 @@ int msg_verify_ipa_structure(struct msgb *msg) if (msgb_l1len(msg) < sizeof(struct ipaccess_head)) { LOGP(DL1C, LOGL_ERROR, - "Ipa header insufficient space %d %d\n", + "Ipa header insufficient space %d %zu\n", msgb_l1len(msg), sizeof(struct ipaccess_head)); return -1; } @@ -105,7 +105,7 @@ int msg_verify_ipa_structure(struct msgb *msg) if (ntohs(hh->len) != msgb_l1len(msg) - sizeof(struct ipaccess_head)) { LOGP(DL1C, LOGL_ERROR, - "Incorrect ipa header msg size %d %d\n", + "Incorrect ipa header msg size %d %zu\n", ntohs(hh->len), msgb_l1len(msg) - sizeof(struct ipaccess_head)); return -1; } @@ -142,7 +142,7 @@ int msg_verify_oml_structure(struct msgb *msg) struct abis_om_hdr *omh; if (msgb_l2len(msg) < sizeof(*omh)) { - LOGP(DL1C, LOGL_ERROR, "Om header insufficient space %d %d\n", + LOGP(DL1C, LOGL_ERROR, "Om header insufficient space %d %zu\n", msgb_l2len(msg), sizeof(*omh)); return -1; } diff --git a/src/common/rsl.c b/src/common/rsl.c index 03509eda..a503355d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -47,6 +47,7 @@ #include <osmo-bts/handover.h> #include <osmo-bts/cbch.h> #include <osmo-bts/l1sap.h> +#include <osmo-bts/bts_model.h> //#define FAKE_CIPH_MODE_COMPL diff --git a/src/common/vty.c b/src/common/vty.c index a67ffe1d..ae8125cc 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -49,7 +49,7 @@ #include <osmo-bts/vty.h> #include <osmo-bts/l1sap.h> -enum node_type bts_vty_go_parent(struct vty *vty) +int bts_vty_go_parent(struct vty *vty) { switch (vty->node) { case TRX_NODE: @@ -814,6 +814,8 @@ int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat) install_element(TRX_NODE, &cfg_trx_ms_power_control_cmd); install_element(ENABLE_NODE, &bts_t_t_l_jitter_buf_cmd); + install_element(ENABLE_NODE, &bts_t_t_l_loopback_cmd); + install_element(ENABLE_NODE, &no_bts_t_t_l_loopback_cmd); return 0; } diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h index d258f43b..3f2938f2 100644 --- a/src/osmo-bts-sysmo/l1_if.h +++ b/src/osmo-bts-sysmo/l1_if.h @@ -134,6 +134,4 @@ int l1if_rf_clock_info_correct(struct femtol1_hdl *fl1h); /* public helpers for test */ int bts_check_for_ciph_cmd(struct femtol1_hdl *fl1h, struct msgb *msg, struct gsm_lchan *lchan); -inline int l1if_ms_pwr_ctrl(struct gsm_lchan *lchan, const int uplink_target, - const uint8_t ms_power, const float rxLevel); #endif /* _FEMTO_L1_H */ diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c index 00176104..3020d904 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c @@ -48,7 +48,7 @@ static const char copyright[] = "This is free software: you are free to change and redistribute it.\r\n" "There is NO WARRANTY, to the extent permitted by law.\r\n"; -static enum node_type go_to_parent(struct vty *vty) +static int go_to_parent(struct vty *vty) { switch (vty->node) { case MGR_NODE: diff --git a/src/osmo-bts-sysmo/sysmobts_vty.c b/src/osmo-bts-sysmo/sysmobts_vty.c index 3c1dafa4..4a37b5d0 100644 --- a/src/osmo-bts-sysmo/sysmobts_vty.c +++ b/src/osmo-bts-sysmo/sysmobts_vty.c @@ -534,6 +534,7 @@ int bts_model_vty_init(struct gsm_bts *bts) install_element(TRX_NODE, &cfg_trx_clkcal_def_cmd); install_element(TRX_NODE, &cfg_trx_clksrc_cmd); install_element(TRX_NODE, &cfg_trx_cal_path_cmd); + install_element(TRX_NODE, &cfg_trx_ul_power_target_cmd); install_element(TRX_NODE, &cfg_trx_min_qual_rach_cmd); install_element(TRX_NODE, &cfg_trx_min_qual_norm_cmd); install_element(TRX_NODE, &cfg_trx_nominal_power_cmd); |