July 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: trxcon: cosmetic: rename 'trx->fsm' to 'trx->fi'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28673 ) Change subject: trxcon: cosmetic: rename 'trx->fsm' to 'trx->fi' ...................................................................... trxcon: cosmetic: rename 'trx->fsm' to 'trx->fi' Make it cleaner that it's an FSM *instance*. Change-Id: I688b903fe21086beca7fb86dcee90f6f751d7cc3 --- M src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c 3 files changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/73/28673/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h index ec0b56d..d02d7b7 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h @@ -27,7 +27,7 @@ struct osmo_timer_list trx_ctrl_timer; struct llist_head trx_ctrl_list; - struct osmo_fsm_inst *fsm; + struct osmo_fsm_inst *fi; /* HACK: we need proper state machines */ uint32_t prev_state; diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 7a2ecb9..974690d 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -149,9 +149,9 @@ send(trx->trx_ofd_ctrl.fd, tcm->cmd, strlen(tcm->cmd) + 1, 0); /* Trigger state machine */ - if (trx->fsm->state != TRX_STATE_RSP_WAIT) { - trx->prev_state = trx->fsm->state; - osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_RSP_WAIT, 0, 0); + if (trx->fi->state != TRX_STATE_RSP_WAIT) { + trx->prev_state = trx->fi->state; + osmo_fsm_inst_state_chg(trx->fi, TRX_STATE_RSP_WAIT, 0, 0); } /* Start expire timer */ @@ -175,7 +175,7 @@ tcm = llist_entry(trx->trx_ctrl_list.next, struct trx_ctrl_msg, list); if (++tcm->retry_cnt > 3) { LOGP(DTRX, LOGL_NOTICE, "Transceiver offline\n"); - osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_OFFLINE, 0, 0); + osmo_fsm_inst_state_chg(trx->fi, TRX_STATE_OFFLINE, 0, 0); osmo_fsm_inst_dispatch(trxcon->fi, TRX_EVENT_OFFLINE, trx); return; } @@ -538,18 +538,18 @@ /* Trigger state machine */ if (!strncmp(tcm->cmd + 4, "POWERON", 7)) { trx->powered_up = true; - osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_ACTIVE, 0, 0); + osmo_fsm_inst_state_chg(trx->fi, TRX_STATE_ACTIVE, 0, 0); } else if (!strncmp(tcm->cmd + 4, "POWEROFF", 8)) { trx->powered_up = false; - osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_IDLE, 0, 0); + osmo_fsm_inst_state_chg(trx->fi, TRX_STATE_IDLE, 0, 0); } else if (!strncmp(tcm->cmd + 4, "MEASURE", 7)) trx_if_measure_rsp_cb(trx, buf + 14); else if (!strncmp(tcm->cmd + 4, "ECHO", 4)) - osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_IDLE, 0, 0); + osmo_fsm_inst_state_chg(trx->fi, TRX_STATE_IDLE, 0, 0); else - osmo_fsm_inst_state_chg(trx->fsm, trx->prev_state, 0, 0); + osmo_fsm_inst_state_chg(trx->fi, trx->prev_state, 0, 0); /* Remove command from list */ llist_del(&tcm->list); @@ -664,7 +664,7 @@ * transceiver and its TRXC interface. */ #if 0 - if (trx->fsm->state != TRX_STATE_ACTIVE) { + if (trx->fi->state != TRX_STATE_ACTIVE) { LOGP(DTRXD, LOGL_ERROR, "Ignoring TX data, " "transceiver isn't ready\n"); return -EAGAIN; @@ -711,9 +711,9 @@ /* Allocate a new dedicated state machine */ /* TODO: allocate it as a child of trxcon->fi */ - trx->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx, + trx->fi = osmo_fsm_inst_alloc(&trx_fsm, trx, NULL, LOGL_DEBUG, "trx_interface"); - if (trx->fsm == NULL) { + if (trx->fi == NULL) { LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); talloc_free(trx); @@ -740,7 +740,7 @@ udp_error: LOGP(DTRX, LOGL_ERROR, "Couldn't establish UDP connection\n"); - osmo_fsm_inst_free(trx->fsm); + osmo_fsm_inst_free(trx->fi); talloc_free(trx); return NULL; } @@ -751,7 +751,7 @@ struct trx_ctrl_msg *tcm; /* Reset state machine */ - osmo_fsm_inst_state_chg(trx->fsm, TRX_STATE_IDLE, 0, 0); + osmo_fsm_inst_state_chg(trx->fi, TRX_STATE_IDLE, 0, 0); /* Clear command queue */ while (!llist_empty(&trx->trx_ctrl_list)) { @@ -778,7 +778,7 @@ trx_udp_close(&trx->trx_ofd_data); /* Free memory */ - osmo_fsm_inst_free(trx->fsm); + osmo_fsm_inst_free(trx->fi); talloc_free(trx); } diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 05afe2f..3b03956 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -270,7 +270,7 @@ case L1CTL_EVENT_DISCONNECT: osmo_fsm_inst_state_chg(fi, TRXCON_STATE_IDLE, 0, 0); - if (trxcon->trx->fsm->state != TRX_STATE_OFFLINE) { + if (trxcon->trx->fi->state != TRX_STATE_OFFLINE) { /* Reset scheduler and clock counter */ l1sched_reset(trxcon->sched, true); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I688b903fe21086beca7fb86dcee90f6f751d7cc3 Gerrit-Change-Number: 28673 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework L1CTL socket API to support multiple clients

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28669 to look at the new patch set (#4). Change subject: trxcon: rework L1CTL socket API to support multiple clients ...................................................................... trxcon: rework L1CTL socket API to support multiple clients Change-Id: I1cfc49f36ead6e2ba0a6110b0fb65c55412ef5e3 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/l1ctl_link.c M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c 7 files changed, 256 insertions(+), 271 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/69/28669/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1cfc49f36ead6e2ba0a6110b0fb65c55412ef5e3 Gerrit-Change-Number: 28669 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: introduce and use struct 'trxcon_inst'

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28667 to look at the new patch set (#3). Change subject: trxcon: introduce and use struct 'trxcon_inst' ...................................................................... trxcon: introduce and use struct 'trxcon_inst' trxcon consists of the following three main components: * the L1 TDMA scheduler (libl1sched), * L1 interface (TRXC/TRXD over UDP), * L2 interface (L1CTL). In [1] and [2] the L1 scheduler was abstracted out from both L1 and L2 interfaces and separated into a library, so it does not use the TRXC/TRXD nor L1CTL related API directly. This change is the next step towards the goal of having all three components abstracted from each other. Moreover, this patch brings us closer to another goal of being able to support multiple L1CTL connections (each having its own scheduler). The idea is to give both L1 and L2 interfaces access to the 'trxcon_inst' structure, which basically groups all three components mentioned above into a single piece. The end goal is to eliminate direct interaction between the interfaces, and the scheduler, so that one could easily replace TRXC/TRXD and/or L1CTL with something else. Change-Id: I23319951c56577085e1092669b5534f9d6bda48d Related: [1] I31f77976a7a225ef292fe6dcd583513aec97ed44 Related: [2] I001fb7bc2663eea308b5a8882746ed9863f2c2f8 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h M src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h M src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/l1ctl_link.c M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c 9 files changed, 186 insertions(+), 122 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/28667/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I23319951c56577085e1092669b5534f9d6bda48d Gerrit-Change-Number: 28667 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework L1CTL socket API to support multiple clients

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28669 to look at the new patch set (#3). Change subject: trxcon: rework L1CTL socket API to support multiple clients ...................................................................... trxcon: rework L1CTL socket API to support multiple clients Change-Id: I1cfc49f36ead6e2ba0a6110b0fb65c55412ef5e3 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/l1ctl_link.c M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c 7 files changed, 257 insertions(+), 272 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/69/28669/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1cfc49f36ead6e2ba0a6110b0fb65c55412ef5e3 Gerrit-Change-Number: 28669 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename l1ctl_link.[ch] to l1ctl_server.[ch]

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28670 to look at the new patch set (#3). Change subject: trxcon: cosmetic: rename l1ctl_link.[ch] to l1ctl_server.[ch] ...................................................................... trxcon: cosmetic: rename l1ctl_link.[ch] to l1ctl_server.[ch] Change-Id: I91149087bac6c745253d99deae2e32275b446a39 --- M src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h R src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h M src/host/trxcon/src/Makefile.am M src/host/trxcon/src/l1ctl.c R src/host/trxcon/src/l1ctl_server.c M src/host/trxcon/src/trxcon.c 7 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/70/28670/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I91149087bac6c745253d99deae2e32275b446a39 Gerrit-Change-Number: 28670 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: fix coding style in statements applying inverted mask

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28672 ) Change subject: trxcon: fix coding style in statements applying inverted mask ...................................................................... trxcon: fix coding style in statements applying inverted mask Change-Id: I28b9fc34e0d40b02d0ca56e9e0bf4463cf4ff336 --- M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trx_if.c 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/28672/1 diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5db9945..5475290 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -88,7 +88,7 @@ LOGP(DL1C, LOGL_DEBUG, "Send PM Conf (%s %d = %d dBm)\n", arfcn2band_name(band_arfcn), - band_arfcn &~ ARFCN_FLAG_MASK, dbm); + band_arfcn & ~ARFCN_FLAG_MASK, dbm); pmc = (struct l1ctl_pm_conf *) msgb_put(msg, sizeof(*pmc)); pmc->band_arfcn = htons(band_arfcn); @@ -303,7 +303,7 @@ if (msg == NULL) return; - LOGP(DL1C, LOGL_NOTICE, "FBSB timer fired for ARFCN %u\n", l1l->trx->band_arfcn &~ ARFCN_FLAG_MASK); + LOGP(DL1C, LOGL_NOTICE, "FBSB timer fired for ARFCN %u\n", l1l->trx->band_arfcn & ~ARFCN_FLAG_MASK); dl = put_dl_info_hdr(msg, NULL); @@ -340,7 +340,7 @@ LOGP(DL1C, LOGL_NOTICE, "Received FBSB request (%s %d)\n", arfcn2band_name(band_arfcn), - band_arfcn &~ ARFCN_FLAG_MASK); + band_arfcn & ~ARFCN_FLAG_MASK); /* Reset scheduler and clock counter */ l1sched_reset(l1l->sched, true); @@ -398,8 +398,8 @@ LOGP(DL1C, LOGL_NOTICE, "Received power measurement " "request (%s: %d -> %d)\n", arfcn2band_name(band_arfcn_start), - band_arfcn_start &~ ARFCN_FLAG_MASK, - band_arfcn_stop &~ ARFCN_FLAG_MASK); + band_arfcn_start & ~ARFCN_FLAG_MASK, + band_arfcn_stop & ~ARFCN_FLAG_MASK); /* Send measurement request to transceiver */ rc = trx_if_cmd_measure(l1l->trx, band_arfcn_start, band_arfcn_stop); @@ -570,7 +570,7 @@ band_arfcn = ntohs(h->band_arfcn); LOGP(DL1C, LOGL_NOTICE, "L1CTL_DM_EST_REQ indicates a single " - "ARFCN=%u channel\n", band_arfcn &~ ARFCN_FLAG_MASK); + "ARFCN=%u channel\n", band_arfcn & ~ARFCN_FLAG_MASK); /* Do we need to retune? */ if (trx->band_arfcn == band_arfcn) diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 9984e0e..eec287c 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -379,8 +379,8 @@ if (band_arfcn != trx->pm_band_arfcn_start) { LOGP(DTRX, LOGL_ERROR, "Power measurement error: " "response ARFCN=%u doesn't match expected ARFCN=%u\n", - band_arfcn &~ ARFCN_FLAG_MASK, - trx->pm_band_arfcn_start &~ ARFCN_FLAG_MASK); + band_arfcn & ~ARFCN_FLAG_MASK, + trx->pm_band_arfcn_start & ~ARFCN_FLAG_MASK); return; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I28b9fc34e0d40b02d0ca56e9e0bf4463cf4ff336 Gerrit-Change-Number: 28672 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: introduce and use struct 'trxcon_inst'

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28667 to look at the new patch set (#2). Change subject: trxcon: introduce and use struct 'trxcon_inst' ...................................................................... trxcon: introduce and use struct 'trxcon_inst' trxcon consists of the following three main components: * the L1 TDMA scheduler (libl1sched), * L1 interface (TRXC/TRXD over UDP), * L2 interface (L1CTL). In [1] and [2] the L1 scheduler was abstracted out from both L1 and L2 interfaces and separated into a library, so it does not use the TRXC/TRXD nor L1CTL related API directly. This change is the next step towards the goal of having all three components abstracted from each other. Moreover, this patch brings us closer to another goal of being able to support multiple L1CTL connections (each having its own scheduler). The idea is to give both L1 and L2 interfaces access to the 'trxcon_inst' structure, which basically groups all three components mentioned above into a single piece. The end goal is to eliminate direct interaction between the interfaces, and the scheduler, so that one could easily replace TRXC/TRXD and/or L1CTL with something else. Change-Id: I23319951c56577085e1092669b5534f9d6bda48d Related: [1] I31f77976a7a225ef292fe6dcd583513aec97ed44 Related: [2] I001fb7bc2663eea308b5a8882746ed9863f2c2f8 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h M src/host/trxcon/include/osmocom/bb/trxcon/l1sched.h M src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/l1ctl_link.c M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c 9 files changed, 181 insertions(+), 119 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/28667/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I23319951c56577085e1092669b5534f9d6bda48d Gerrit-Change-Number: 28667 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename l1ctl_link.[ch] to l1ctl_server.[ch]

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28670 ) Change subject: trxcon: cosmetic: rename l1ctl_link.[ch] to l1ctl_server.[ch] ...................................................................... trxcon: cosmetic: rename l1ctl_link.[ch] to l1ctl_server.[ch] Change-Id: I91149087bac6c745253d99deae2e32275b446a39 --- M src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h R src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h M src/host/trxcon/src/Makefile.am M src/host/trxcon/src/l1ctl.c R src/host/trxcon/src/l1ctl_server.c M src/host/trxcon/src/trxcon.c 7 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/70/28670/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am index 4463a1d..3b9b216 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am +++ b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am @@ -1,6 +1,6 @@ noinst_HEADERS = \ l1ctl_proto.h \ - l1ctl_link.h \ + l1ctl_server.h \ l1ctl.h \ l1sched.h \ trx_if.h \ diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index cc8dc84..43d8fed 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -3,7 +3,7 @@ #include <stdint.h> #include <osmocom/core/msgb.h> -#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_server.h> #include <osmocom/bb/trxcon/l1ctl_proto.h> /* Event handlers */ diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h similarity index 100% rename from src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h rename to src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h diff --git a/src/host/trxcon/src/Makefile.am b/src/host/trxcon/src/Makefile.am index c97265b..cf1357f 100644 --- a/src/host/trxcon/src/Makefile.am +++ b/src/host/trxcon/src/Makefile.am @@ -38,7 +38,7 @@ bin_PROGRAMS = trxcon trxcon_SOURCES = \ - l1ctl_link.c \ + l1ctl_server.c \ l1ctl.c \ trx_if.c \ logging.c \ diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 885ca93..ec25107 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -37,7 +37,7 @@ #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/bb/trxcon/logging.h> -#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_server.h> #include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/trxcon/trx_if.h> diff --git a/src/host/trxcon/src/l1ctl_link.c b/src/host/trxcon/src/l1ctl_server.c similarity index 98% rename from src/host/trxcon/src/l1ctl_link.c rename to src/host/trxcon/src/l1ctl_server.c index a9d5b1f..7152a53 100644 --- a/src/host/trxcon/src/l1ctl_link.c +++ b/src/host/trxcon/src/l1ctl_server.c @@ -36,7 +36,7 @@ #include <osmocom/core/write_queue.h> #include <osmocom/bb/trxcon/logging.h> -#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_server.h> static int l1ctl_client_read_cb(struct osmo_fd *ofd) { diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 1e7ebaa..e5ee69d 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -45,7 +45,7 @@ #include <osmocom/bb/trxcon/trx_if.h> #include <osmocom/bb/trxcon/logging.h> #include <osmocom/bb/trxcon/l1ctl.h> -#include <osmocom/bb/trxcon/l1ctl_link.h> +#include <osmocom/bb/trxcon/l1ctl_server.h> #include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/trxcon/l1sched.h> -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I91149087bac6c745253d99deae2e32275b446a39 Gerrit-Change-Number: 28670 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: get tid of GEN_MASK macro, define it locally

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28671 ) Change subject: trxcon: get tid of GEN_MASK macro, define it locally ...................................................................... trxcon: get tid of GEN_MASK macro, define it locally Change-Id: I9504f022ef1767276479f21b8228ac094d28a858 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c 3 files changed, 17 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/71/28671/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 2a068b7..2c28f80 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -1,7 +1,5 @@ #pragma once -#define GEN_MASK(state) (0x01 << state) - struct l1sched_state; struct trx_instance; struct l1ctl_client; diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 8c58da5..28f7598 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -45,6 +45,8 @@ #include <osmocom/bb/trxcon/trx_if.h> #include <osmocom/bb/trxcon/logging.h> +#define S(x) (1 << (x)) + static struct value_string trx_evt_names[] = { { 0, NULL } /* no events? */ }; @@ -52,8 +54,8 @@ static struct osmo_fsm_state trx_fsm_states[] = { [TRX_STATE_OFFLINE] = { .out_state_mask = ( - GEN_MASK(TRX_STATE_IDLE) | - GEN_MASK(TRX_STATE_RSP_WAIT)), + S(TRX_STATE_IDLE) | + S(TRX_STATE_RSP_WAIT)), .name = "OFFLINE", }, [TRX_STATE_IDLE] = { @@ -62,15 +64,15 @@ }, [TRX_STATE_ACTIVE] = { .out_state_mask = ( - GEN_MASK(TRX_STATE_IDLE) | - GEN_MASK(TRX_STATE_RSP_WAIT)), + S(TRX_STATE_IDLE) | + S(TRX_STATE_RSP_WAIT)), .name = "ACTIVE", }, [TRX_STATE_RSP_WAIT] = { .out_state_mask = ( - GEN_MASK(TRX_STATE_IDLE) | - GEN_MASK(TRX_STATE_ACTIVE) | - GEN_MASK(TRX_STATE_OFFLINE)), + S(TRX_STATE_IDLE) | + S(TRX_STATE_ACTIVE) | + S(TRX_STATE_OFFLINE)), .name = "RSP_WAIT", }, }; diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index e5ee69d..2e92c72 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -49,6 +49,8 @@ #include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/trxcon/l1sched.h> +#define S(x) (1 << (x)) + #define COPYRIGHT \ "Copyright (C) 2016-2022 by Vadim Yanitskiy <axilirator(a)gmail.com>\n" \ "Contributions by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\n" \ @@ -288,17 +290,17 @@ static struct osmo_fsm_state trxcon_fsm_states[] = { [TRXCON_STATE_IDLE] = { - .in_event_mask = GEN_MASK(L1CTL_EVENT_CONNECT), - .out_state_mask = GEN_MASK(TRXCON_STATE_MANAGED), + .in_event_mask = S(L1CTL_EVENT_CONNECT), + .out_state_mask = S(TRXCON_STATE_MANAGED), .name = "IDLE", .action = trxcon_fsm_idle_action, }, [TRXCON_STATE_MANAGED] = { .in_event_mask = ( - GEN_MASK(L1CTL_EVENT_DISCONNECT) | - GEN_MASK(TRX_EVENT_RSP_ERROR) | - GEN_MASK(TRX_EVENT_OFFLINE)), - .out_state_mask = GEN_MASK(TRXCON_STATE_IDLE), + S(L1CTL_EVENT_DISCONNECT) | + S(TRX_EVENT_RSP_ERROR) | + S(TRX_EVENT_OFFLINE)), + .out_state_mask = S(TRXCON_STATE_IDLE), .name = "MANAGED", .action = trxcon_fsm_managed_action, }, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9504f022ef1767276479f21b8228ac094d28a858 Gerrit-Change-Number: 28671 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move FBSB state from struct l1ctl_link to trxcon_inst

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28668 ) Change subject: trxcon: move FBSB state from struct l1ctl_link to trxcon_inst ...................................................................... trxcon: move FBSB state from struct l1ctl_link to trxcon_inst Ideally, FBSB procedure should be implemented as a state of trxcon's FSM. For now let's simply move the related fields to trxcon_inst. Remove l1ctl_shutdown_cb() as it's not needed anymore. Change-Id: I92b50cf1bb36886fbe3d6460af3c0b1c57256ae8 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/l1ctl_link.c M src/host/trxcon/src/trxcon.c 6 files changed, 17 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/68/28668/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h index 6fac3a0..4d1670e 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h @@ -8,7 +8,6 @@ /* Event handlers */ int l1ctl_rx_cb(struct l1ctl_link *l1l, struct msgb *msg); -void l1ctl_shutdown_cb(struct l1ctl_link *l1l); int l1ctl_tx_fbsb_conf(struct l1ctl_link *l1l, uint8_t result, const struct l1ctl_info_dl *dl_info, uint8_t bsic); diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h index 5cfcc10..84a8638 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_link.h @@ -29,13 +29,6 @@ /* Some private data */ void *priv; - - /* L1CTL handlers specific */ - struct osmo_timer_list fbsb_timer; - bool fbsb_conf_sent; - - /* Shutdown callback */ - void (*shutdown_cb)(struct l1ctl_link *l1l); }; struct l1ctl_link *l1ctl_link_init(void *tall_ctx, const char *sock_path); diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 6cec162..986f423 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -29,6 +29,10 @@ /* L1/L2 interfaces */ struct trx_instance *trx; struct l1ctl_link *l1l; + + /* TODO: implement this as an FSM state with timeout */ + struct osmo_timer_list fbsb_timer; + bool fbsb_conf_sent; }; struct trxcon_inst *trxcon_inst_alloc(void *ctx); diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index da66f35..def7414 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -167,6 +167,7 @@ int l1ctl_tx_fbsb_conf(struct l1ctl_link *l1l, uint8_t result, const struct l1ctl_info_dl *dl_info, uint8_t bsic) { + struct trxcon_inst *trxcon = l1l->priv; struct l1ctl_fbsb_conf *conf; struct msgb *msg; @@ -182,11 +183,11 @@ conf->initial_freq_err = 0; /* Ask SCH handler not to send L1CTL_FBSB_CONF anymore */ - l1l->fbsb_conf_sent = true; + trxcon->fbsb_conf_sent = true; /* Abort FBSB expire timer */ - if (osmo_timer_pending(&l1l->fbsb_timer)) - osmo_timer_del(&l1l->fbsb_timer); + if (osmo_timer_pending(&trxcon->fbsb_timer)) + osmo_timer_del(&trxcon->fbsb_timer); return l1ctl_link_send(l1l, msg); } @@ -316,7 +317,7 @@ fbsb_conf_make(msg, 255, 0); /* Ask SCH handler not to send L1CTL_FBSB_CONF anymore */ - l1l->fbsb_conf_sent = true; + trxcon->fbsb_conf_sent = true; l1ctl_link_send(l1l, msg); } @@ -353,7 +354,7 @@ l1sched_configure_ts(trxcon->sched, 0, ch_config); /* Ask SCH handler to send L1CTL_FBSB_CONF */ - l1l->fbsb_conf_sent = false; + trxcon->fbsb_conf_sent = false; /* Only if current ARFCN differs */ if (trxcon->trx->band_arfcn != band_arfcn) { @@ -371,10 +372,10 @@ trx_if_cmd_poweron(trxcon->trx); /* Start FBSB expire timer */ - l1l->fbsb_timer.data = l1l; - l1l->fbsb_timer.cb = fbsb_timer_cb; + trxcon->fbsb_timer.data = l1l; + trxcon->fbsb_timer.cb = fbsb_timer_cb; LOGP(DL1C, LOGL_INFO, "Starting FBSB timer %u ms\n", timeout * GSM_TDMA_FN_DURATION_uS / 1000); - osmo_timer_schedule(&l1l->fbsb_timer, 0, + osmo_timer_schedule(&trxcon->fbsb_timer, 0, timeout * GSM_TDMA_FN_DURATION_uS); exit: @@ -902,10 +903,3 @@ return -EINVAL; } } - -void l1ctl_shutdown_cb(struct l1ctl_link *l1l) -{ - /* Abort FBSB expire timer */ - if (osmo_timer_pending(&l1l->fbsb_timer)) - osmo_timer_del(&l1l->fbsb_timer); -} diff --git a/src/host/trxcon/src/l1ctl_link.c b/src/host/trxcon/src/l1ctl_link.c index 294ed6f..672991c 100644 --- a/src/host/trxcon/src/l1ctl_link.c +++ b/src/host/trxcon/src/l1ctl_link.c @@ -265,9 +265,6 @@ return NULL; } - /* Bind shutdown handler */ - l1l->shutdown_cb = l1ctl_shutdown_cb; - /** * To be able to accept first connection and * drop others, it should be set to -1 @@ -287,10 +284,6 @@ LOGP(DL1C, LOGL_NOTICE, "Shutdown L1CTL link\n"); - /* Call shutdown callback */ - if (l1l->shutdown_cb != NULL) - l1l->shutdown_cb(l1l); - listen_bfd = &l1l->listen_bfd; /* Check if we have an established connection */ diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 96b4cd1..60d8cf0 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -164,7 +164,7 @@ break; case L1SCHED_DT_OTHER: if (lchan->type == L1SCHED_SCH) { - if (trxcon->l1l->fbsb_conf_sent) + if (trxcon->fbsb_conf_sent) return 0; rc = l1ctl_tx_fbsb_conf(trxcon->l1l, 0, &dl_hdr, sched->bsic); break; @@ -372,6 +372,9 @@ if (trxcon->trx != NULL) trx_if_close(trxcon->trx); + if (osmo_timer_pending(&trxcon->fbsb_timer)) + osmo_timer_del(&trxcon->fbsb_timer); + if (trxcon->fi != NULL) osmo_fsm_inst_free(trxcon->fi); talloc_free(trxcon); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I92b50cf1bb36886fbe3d6460af3c0b1c57256ae8 Gerrit-Change-Number: 28668 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022