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/.
fixeria gerrit-no-reply at lists.osmocom.orgfixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19479 ) Change subject: firmware/layer1: refactor multi-frame task mask composition ...................................................................... firmware/layer1: refactor multi-frame task mask composition Change-Id: I91780146d066c45c42b037c22cb49fd8a96e832b --- M src/target/firmware/layer1/l23_api.c 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/19479/1 diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index 62c21f6..e9ce032 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -79,8 +79,8 @@ uint8_t lch_idx; enum mframe_task master_task = 0; enum mframe_task second_task = 0; - uint32_t neigh_task = 0; enum mf_type multiframe = 0; + uint32_t task_mask = 0x00; if (cbits == 0x01) { lch_idx = 0; @@ -121,22 +121,27 @@ master_task = MF_TASK_BCCH_CCCH; #endif } + + /* Primary and secondary tasks */ + task_mask |= (1 << master_task) | (1 << second_task); + switch (neigh_mode) { case NEIGH_MODE_PM: switch (multiframe) { case MF51: - neigh_task = (1 << MF_TASK_NEIGH_PM51); + task_mask |= (1 << MF_TASK_NEIGH_PM51); break; case MF26EVEN: - neigh_task = (1 << MF_TASK_NEIGH_PM26E); + task_mask |= (1 << MF_TASK_NEIGH_PM26E); break; case MF26ODD: - neigh_task = (1 << MF_TASK_NEIGH_PM26O); + task_mask |= (1 << MF_TASK_NEIGH_PM26O); break; } break; } - return (1 << master_task) | (1 << second_task) | neigh_task; + + return task_mask; } static int chan_nr2dchan_type(uint8_t chan_nr) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I91780146d066c45c42b037c22cb49fd8a96e832b Gerrit-Change-Number: 19479 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200731/0d5f56cc/attachment.htm>