cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

Constify the 'trx' argument of trx_get_hlayer1() everywhere 

Change-Id: I44523d26f2f564932ea95c17b1041d0ca9cc2828
This commit is contained in:
Vadim Yanitskiy 2020-08-03 02:05:24 +07:00
parent 3d5cf0b341
commit c14f1641c6
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/pcu_sock.c
View File

@ -46,7 +46,7 @@
#include <osmo-bts/l1sap.h>
#include <osmo-bts/oml.h>
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx);
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx);
extern struct gsm_network bts_gsmnet;
int pcu_direct = 0;

6
src/osmo-bts-litecell15/l1_if.h
View File

@ -133,14 +133,14 @@ int bts_check_for_ciph_cmd(struct lc15l1_hdl *fl1h,
int l1if_ms_pwr_ctrl(struct gsm_lchan *lchan, const int uplink_target,
const uint8_t ms_power, const float rxLevel);
static inline struct lc15l1_hdl *trx_lc15l1_hdl(struct gsm_bts_trx *trx)
static inline struct lc15l1_hdl *trx_lc15l1_hdl(const struct gsm_bts_trx *trx)
{
struct phy_instance *pinst = trx_phy_instance(trx);
const struct phy_instance *pinst = trx_phy_instance(trx);
OSMO_ASSERT(pinst);
return pinst->u.lc15.hdl;
}
static inline struct gsm_bts_trx *lc15l1_hdl_trx(struct lc15l1_hdl *fl1h)
static inline struct gsm_bts_trx *lc15l1_hdl_trx(const struct lc15l1_hdl *fl1h)
{
OSMO_ASSERT(fl1h->phy_inst);
return fl1h->phy_inst->trx;

4
src/osmo-bts-litecell15/oml.c
View File

@ -430,9 +430,9 @@ static int trx_init(struct gsm_bts_trx *trx)
return l1if_gsm_req_compl(fl1h, msg, trx_init_compl_cb, NULL);
}
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)
{
struct lc15l1_hdl *fl1h = trx_lc15l1_hdl(trx);
const struct lc15l1_hdl *fl1h = trx_lc15l1_hdl(trx);
return fl1h->hLayer1;
}

4
src/osmo-bts-oc2g/l1_if.h
View File

@ -136,9 +136,9 @@ int bts_check_for_ciph_cmd(struct oc2gl1_hdl *fl1h,
int l1if_ms_pwr_ctrl(struct gsm_lchan *lchan, const int uplink_target,
const uint8_t ms_power, const float rxLevel);
static inline struct oc2gl1_hdl *trx_oc2gl1_hdl(struct gsm_bts_trx *trx)
static inline struct oc2gl1_hdl *trx_oc2gl1_hdl(const struct gsm_bts_trx *trx)
{
struct phy_instance *pinst = trx_phy_instance(trx);
const struct phy_instance *pinst = trx_phy_instance(trx);
OSMO_ASSERT(pinst);
return pinst->u.oc2g.hdl;
}

4
src/osmo-bts-oc2g/oml.c
View File

@ -446,9 +446,9 @@ static int trx_init(struct gsm_bts_trx *trx)
return l1if_gsm_req_compl(fl1h, msg, trx_init_compl_cb, NULL);
}
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)
{
struct oc2gl1_hdl *fl1h = trx_oc2gl1_hdl(trx);
const struct oc2gl1_hdl *fl1h = trx_oc2gl1_hdl(trx);
return fl1h->hLayer1;
}

2
src/osmo-bts-octphy/l1_oml.c
View File

@ -1426,7 +1426,7 @@ static int l1if_over_sample_16x_modif(struct gsm_bts_trx *trx)
}
#endif
uint32_t trx_get_hlayer1(struct gsm_bts_trx * trx)
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)
{
return 0;
}

2
src/osmo-bts-octphy/l1_oml.h
View File

@ -10,7 +10,7 @@ int l1if_rsl_mode_modify(struct gsm_lchan *lchan);
int l1if_set_ciphering(struct gsm_lchan *lchan, int dir_downlink);
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx);
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx);
int gsm_abis_mo_check_attr(const struct gsm_abis_mo *mo,
const uint8_t * attr_ids, unsigned int num_attr_ids);

2
src/osmo-bts-omldummy/bts_model.c
View File

@ -169,7 +169,7 @@ int bts_model_ctrl_cmds_install(struct gsm_bts *bts)
return 0;
}
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)
{
return 0;
}

4
src/osmo-bts-sysmo/l1_if.h
View File

@ -156,9 +156,9 @@ int l1if_rf_clock_info_correct(struct femtol1_hdl *fl1h);
int bts_check_for_ciph_cmd(struct femtol1_hdl *fl1h,
struct msgb *msg, struct gsm_lchan *lchan);
static inline struct femtol1_hdl *trx_femtol1_hdl(struct gsm_bts_trx *trx)
static inline struct femtol1_hdl *trx_femtol1_hdl(const struct gsm_bts_trx *trx)
{
struct phy_instance *pinst = trx_phy_instance(trx);
const struct phy_instance *pinst = trx_phy_instance(trx);
OSMO_ASSERT(pinst);
return pinst->u.sysmobts.hdl;
}

4
src/osmo-bts-sysmo/oml.c
View File

@ -426,9 +426,9 @@ static int trx_init(struct gsm_bts_trx *trx)
return l1if_gsm_req_compl(fl1h, msg, trx_init_compl_cb, NULL);
}
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)
{
struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx);
const struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx);
return fl1h->hLayer1;
}

2
src/osmo-bts-trx/main.c
View File

@ -74,7 +74,7 @@ static const struct rate_ctr_group_desc btstrx_ctrg_desc = {
};
/* dummy, since no direct dsp support */
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)
{
return 0;
}

2
src/osmo-bts-virtual/main.c
View File

@ -50,7 +50,7 @@
#include "l1_if.h"
/* dummy, since no direct dsp support */
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)
{
return 0;
}

2
tests/stubs.c
View File

@ -36,7 +36,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo,
__attribute__((weak)) int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap)
{ return 0; }
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)
uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)
{ return 0; }
__attribute__((weak)) int bts_model_oml_estab(struct gsm_bts *bts)