aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <vyanitskiy@sysmocom.de>2021-10-22 01:34:32 +0300
committerVadim Yanitskiy <vyanitskiy@sysmocom.de>2021-10-22 02:51:36 +0300
commit31637b467325dd456bfb0d23666648db49711305 (patch)
tree811cf8dc76675b8a239963c4fb624d8b85d1df6b
parente3818832b05f84ba9af6a225cca82e2e8940c6c2 (diff)
measurement: handle_ms_meas_report() accepts const gh
-rw-r--r--include/osmo-bts/measurement.h4
-rw-r--r--src/common/measurement.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h
index 481b7bed..f63a05a0 100644
--- a/include/osmo-bts/measurement.h
+++ b/include/osmo-bts/measurement.h
@@ -20,6 +20,8 @@ bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn);
int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn);
-int handle_ms_meas_report(struct gsm_lchan *lchan, struct gsm48_hdr *gh, unsigned int len);
+int handle_ms_meas_report(struct gsm_lchan *lchan,
+ const struct gsm48_hdr *gh,
+ unsigned int len);
#endif
diff --git a/src/common/measurement.c b/src/common/measurement.c
index 87e853ef..0a8a1825 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -791,7 +791,9 @@ static inline bool ms_to_valid(const struct gsm_lchan *lchan)
/* Called every time a Measurement Result (TS 08.58 8.4.8) is received from
* lower layers and has to be forwarded to BSC */
-int handle_ms_meas_report(struct gsm_lchan *lchan, struct gsm48_hdr *gh, unsigned int len)
+int handle_ms_meas_report(struct gsm_lchan *lchan,
+ const struct gsm48_hdr *gh,
+ unsigned int len)
{
int timing_offset, rc;
struct lapdm_entity *le;
@@ -804,7 +806,7 @@ int handle_ms_meas_report(struct gsm_lchan *lchan, struct gsm48_hdr *gh, unsigne
le = &lchan->lapdm_ch.lapdm_acch;
timing_offset = ms_to_valid(lchan) ? ms_to2rsl(lchan, le) : -1;
- rc = rsl_tx_meas_res(lchan, (uint8_t *)gh, len, timing_offset);
+ rc = rsl_tx_meas_res(lchan, (const uint8_t *)gh, len, timing_offset);
if (rc == 0) /* Count successful transmissions */
lchan->meas.res_nr++;
@@ -849,7 +851,7 @@ int handle_ms_meas_report(struct gsm_lchan *lchan, struct gsm48_hdr *gh, unsigne
lchan_ms_ta_ctrl(lchan, ms_ta, lchan->meas.ms_toa256);
lchan_ms_pwr_ctrl(lchan, ms_pwr, ul_rssi, ul_ci_cb);
if (gh)
- lchan_bs_pwr_ctrl(lchan, (const struct gsm48_hdr *) gh);
+ lchan_bs_pwr_ctrl(lchan, gh);
/* Reset state for next iteration */
lchan->tch.dtx.dl_active = false;