This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Max gerrit-no-reply at lists.osmocom.orgMax has submitted this change and it was merged. ( https://gerrit.osmocom.org/13355 ) Change subject: trxcon: use static helper to prepare FBSB ...................................................................... trxcon: use static helper to prepare FBSB Use static helper to prepare l1ctl_fbsb_conf - this simplifies fbsb-related functions and make difference between timer callback and regular response more obvious. Change-Id: I43832d6a912a32ea5795ed0110981e0b714a7a61 --- M src/host/trxcon/l1ctl.c 1 file changed, 15 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 8145936..97c2496 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -151,6 +151,19 @@ return dl; } +/* Fill in FBSB payload: BSIC and sync result */ +static struct l1ctl_fbsb_conf *fbsb_conf_make(struct msgb *msg, uint8_t result, uint8_t bsic) +{ + struct l1ctl_fbsb_conf *conf = (struct l1ctl_fbsb_conf *) msgb_put(msg, sizeof(*conf)); + + LOGP(DL1C, LOGL_DEBUG, "Send FBSB Conf (result=%u, bsic=%u)\n", result, bsic); + + conf->result = result; + conf->bsic = bsic; + + return conf; +} + int l1ctl_tx_fbsb_conf(struct l1ctl_link *l1l, uint8_t result, struct l1ctl_info_dl *dl_info, uint8_t bsic) { @@ -161,16 +174,10 @@ if (msg == NULL) return -ENOMEM; - LOGP(DL1C, LOGL_DEBUG, "Send FBSB Conf (result=%u, bsic=%u)\n", - result, bsic); - put_dl_info_hdr(msg, dl_info); talloc_free(dl_info); - /* Fill in FBSB payload: BSIC and sync result */ - conf = (struct l1ctl_fbsb_conf *) msgb_put(msg, sizeof(*conf)); - conf->result = result; - conf->bsic = bsic; + conf = fbsb_conf_make(msg, result, bsic); /* FIXME: set proper value */ conf->initial_freq_err = 0; @@ -287,7 +294,6 @@ static void fbsb_timer_cb(void *data) { struct l1ctl_link *l1l = (struct l1ctl_link *) data; - struct l1ctl_fbsb_conf *conf; struct l1ctl_info_dl *dl; struct msgb *msg; @@ -302,10 +308,7 @@ /* Fill in current ARFCN */ dl->band_arfcn = htons(l1l->trx->band_arfcn); - /* Fill in FBSB payload: BSIC and sync result */ - conf = (struct l1ctl_fbsb_conf *) msgb_put(msg, sizeof(*conf)); - conf->result = 255; - conf->bsic = 0; + fbsb_conf_make(msg, 255, 0); /* Ask SCH handler not to send L1CTL_FBSB_CONF anymore */ l1l->fbsb_conf_sent = true; -- To view, visit https://gerrit.osmocom.org/13355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I43832d6a912a32ea5795ed0110981e0b714a7a61 Gerrit-Change-Number: 13355 Gerrit-PatchSet: 3 Gerrit-Owner: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com> Gerrit-Reviewer: dexter <pmaier at sysmocom.de> Gerrit-Reviewer: osmith <osmith at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190322/df5e6772/attachment.htm>