fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41903?usp=email )
(
1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: trxcon/l1sched: l1sched_reset(): remove unused param ......................................................................
trxcon/l1sched: l1sched_reset(): remove unused param
The l1sched no longer has its own clock source, so there's nothing to reset. This parameter is no-op and can be safely removed.
Change-Id: I88dfa8770c9cd205006f569315b07f4d91cc08de --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 8 insertions(+), 9 deletions(-)
Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified
diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 283f388..d145929 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -334,7 +334,7 @@
/* Scheduler management functions */ struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, void *priv); -void l1sched_reset(struct l1sched_state *sched, bool reset_clock); +void l1sched_reset(struct l1sched_state *sched); void l1sched_free(struct l1sched_state *sched);
void l1sched_sacch_cache_read(struct l1sched_state *sched, uint8_t *out); diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index ced3d99..a2ee464 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -180,15 +180,14 @@ talloc_free(sched); }
-void l1sched_reset(struct l1sched_state *sched, bool reset_clock) +void l1sched_reset(struct l1sched_state *sched) { unsigned int tn;
if (sched == NULL) return;
- LOGP_SCHEDC(sched, LOGL_NOTICE, "Reset scheduler %s\n", - reset_clock ? "and clock counter" : ""); + LOGP_SCHEDC(sched, LOGL_NOTICE, "Reset scheduler\n");
/* Free all potentially allocated timeslots */ for (tn = 0; tn < ARRAY_SIZE(sched->ts); tn++) diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index ce3c0dd..34ca21b 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -59,7 +59,7 @@ TALLOC_FREE(trxcon->fi_data); if (fi->state != TRXCON_ST_RESET) osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); - l1sched_reset(trxcon->sched, true); + l1sched_reset(trxcon->sched);
/* Reset the L1 parameters */ trxcon->l1p.band_arfcn = 0xffff; @@ -70,7 +70,7 @@ trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd); break; case TRXCON_EV_RESET_SCHED_REQ: - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); break; case TRXCON_EV_SET_PHY_CONFIG_REQ: { @@ -352,7 +352,7 @@ }
/* Remove all active timeslots */ - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched);
rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); if (rc) @@ -435,7 +435,7 @@ handle_dch_est_req(fi, (const struct trxcon_param_dch_est_req *)data); break; case TRXCON_EV_DCH_REL_REQ: - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); /* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */ break; case TRXCON_EV_SET_TCH_MODE_REQ: @@ -664,7 +664,7 @@ handle_dch_est_req(fi, (const struct trxcon_param_dch_est_req *)data); break; case TRXCON_EV_DCH_REL_REQ: - l1sched_reset(trxcon->sched, false); + l1sched_reset(trxcon->sched); /* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */ break; default:
-
fixeria