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

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by pespin

Attention is currently required from: neels, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28819 ) Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... Patch Set 2: (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/1d2905c0_d15986a2 PS2, Line 8: > (same for all patches in this relation chain) I see no need for writing an issue if it's a generic patch simply refactoring/improving some code. It would be more distracting than anything else since there's nothing of interest in the issue regarding this patch. File src/sbcap/sbcap_common.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/ea30c48b_6bc59b3d PS2, Line 162: static char pdu_name[256] = "<unknown>"; > may i suggest the pattern […] I rather have a static buf in the app than using OTC_SELECT. No need to use it more than once per printf, we are not handling several messages in parallel. https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/5db8feb2_5a3833fc PS2, Line 166: OSMO_STRBUF_PRINTF(sb, "%s", sbcap_procedure_code_str(pc)); > are you sure about: sbcap_procedure_code_str() might return NULL If that ever happened, "(null)" would be printed which is not a big issue. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 29 Jul 2022 08:03:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: extended RACH != 11-bit RACH, correct logging messages

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28836 ) Change subject: trxcon: extended RACH != 11-bit RACH, correct logging messages ...................................................................... trxcon: extended RACH != 11-bit RACH, correct logging messages Change-Id: I7f977d5d2b68741a230c706f5b16cf307bc267d1 --- M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_lchan_rach.c 2 files changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/36/28836/1 diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index ad377bb..aadc542 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -474,7 +474,7 @@ return rc; } -static int l1ctl_rx_rach_req(struct l1ctl_client *l1c, struct msgb *msg, bool ext) +static int l1ctl_rx_rach_req(struct l1ctl_client *l1c, struct msgb *msg, bool is_11bit) { struct trxcon_param_tx_access_burst_req req; struct trxcon_inst *trxcon = l1c->priv; @@ -482,8 +482,7 @@ ul = (struct l1ctl_info_ul *) msg->l1h; - /* Is it extended (11-bit) RACH or not? */ - if (ext) { + if (is_11bit) { const struct l1ctl_ext_rach_req *rr = (void *)ul->payload; req = (struct trxcon_param_tx_access_burst_req) { @@ -494,7 +493,7 @@ }; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, - "Received extended (11-bit) RACH request " + "Received 11-bit RACH request " "(offset=%u, synch_seq=%u, ra11=0x%02hx)\n", req.offset, req.synch_seq, req.ra); } else { @@ -506,7 +505,7 @@ }; LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, - "Received regular (8-bit) RACH request " + "Received 8-bit RACH request " "(offset=%u, ra=0x%02x)\n", req.offset, req.ra); } diff --git a/src/host/trxcon/src/sched_lchan_rach.c b/src/host/trxcon/src/sched_lchan_rach.c index e7422b2..8fd7fcc 100644 --- a/src/host/trxcon/src/sched_lchan_rach.c +++ b/src/host/trxcon/src/sched_lchan_rach.c @@ -84,7 +84,6 @@ if (rach->offset-- > 0) return 0; - /* Is it extended (11-bit) RACH or not? */ if (L1SCHED_PRIM_IS_RACH11(lchan->prim)) { /* Check requested synch. sequence */ if (rach->synch_seq >= RACH_SYNCH_SEQ_NUM) { @@ -97,11 +96,11 @@ return -ENOTSUP; } - /* Encode extended (11-bit) payload */ + /* Encode 11-bit payload */ rc = gsm0503_rach_ext_encode(payload, rach->ra, bsic, true); if (rc) { LOGP_LCHAND(lchan, LOGL_ERROR, - "Could not encode extended RACH burst (ra=%u bsic=%u)\n", + "Could not encode 11-bit RACH burst (ra=%u bsic=%u)\n", rach->ra, bsic); /* Forget this primitive */ @@ -111,7 +110,7 @@ } else if (L1SCHED_PRIM_IS_RACH8(lchan->prim)) { rach->synch_seq = RACH_SYNCH_SEQ_TS0; - /* Encode regular (8-bit) payload */ + /* Encode 8-bit payload */ rc = gsm0503_rach_ext_encode(payload, rach->ra, bsic, false); if (rc) { LOGP_LCHAND(lchan, LOGL_ERROR, @@ -147,8 +146,8 @@ memset(burst_ptr, 0, br->burst + GSM_BURST_LEN - burst_ptr); br->burst_len = GSM_BURST_LEN; - LOGP_LCHAND(lchan, LOGL_NOTICE, "Scheduled %s RACH (%s) at fn=%u\n", - L1SCHED_PRIM_IS_RACH11(lchan->prim) ? "extended (11-bit)" : "regular (8-bit)", + LOGP_LCHAND(lchan, LOGL_NOTICE, "Scheduled %s-bit RACH (%s) at fn=%u\n", + L1SCHED_PRIM_IS_RACH11(lchan->prim) ? "11" : "8", get_value_string(rach_synch_seq_names, rach->synch_seq), br->fn); /* Confirm RACH request */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7f977d5d2b68741a230c706f5b16cf307bc267d1 Gerrit-Change-Number: 28836 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: trx_if_close(): power the transceiver off if needed

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28794 to look at the new patch set (#6). Change subject: trxcon: trx_if_close(): power the transceiver off if needed ...................................................................... trxcon: trx_if_close(): power the transceiver off if needed Currently it may happen that the transceiver (e.g. fake_trx.py) remains powered on when we loose a L1CTL client connection. This is going to be fixed in change [1] re-implementing the trxcon_fsm. For now let's ensure that the transceiver is properly powered off by sending "CMD POWEROFF" from trx_if_close(). Change-Id: I9c5178907304b36ec3de0ee31b7f7a9ed2e31c16 Related: [1] Ifaf63ead9dd180181358e771367b2a686ba159ca --- M src/host/trxcon/src/trx_if.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/94/28794/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9c5178907304b36ec3de0ee31b7f7a9ed2e31c16 Gerrit-Change-Number: 28794 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trx_if_close(): power the transceiver off if needed

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28794 to look at the new patch set (#5). Change subject: trxcon: trx_if_close(): power the transceiver off if needed ...................................................................... trxcon: trx_if_close(): power the transceiver off if needed Currently it may happen that the transceiver (e.g. fake_trx.py) remains powered on when we loose a L1CTL client connection. This is going to be fixed in change [1] re-implementing the trxcon_fsm. For now let's ensure that the transceiver is properly powered off by sending "CMD POWEROFF" from trx_if_close(). Change-Id: I9c5178907304b36ec3de0ee31b7f7a9ed2e31c16 Related: [1] Ifaf63ead9dd180181358e771367b2a686ba159ca --- M src/host/trxcon/src/trx_if.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/94/28794/5 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9c5178907304b36ec3de0ee31b7f7a9ed2e31c16 Gerrit-Change-Number: 28794 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: send pending TRXC messages in trx_if_flush_ctrl()

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28793 ) Change subject: trxcon: send pending TRXC messages in trx_if_flush_ctrl() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I16d748b5194d381af0cd5ba9dbd4bfb33fc7d233 Gerrit-Change-Number: 28793 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 11 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Handle each CBSP and SBc-AP on a separate component

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 ) Change subject: cbc: Handle each CBSP and SBc-AP on a separate component ...................................................................... Patch Set 2: (3 comments) File cbc/CBC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830/comment/926512d3_0565… PS2, Line 205: 100 do we really need to sleep that much? File cbc/MME_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830/comment/75cdf6e4_0815… PS2, Line 75: var template (value) SBC_AP_PDU tx; unused https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830/comment/41276142_dc65… PS2, Line 95: var template (value) SBC_AP_PDU tx; unused -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia0300a2ae69bdf604373dbc484537958413c79a2 Gerrit-Change-Number: 28830 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 22:55:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: sbcap: Expect IE Send-Write-Replace-Warning-Indication

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28831 ) Change subject: sbcap: Expect IE Send-Write-Replace-Warning-Indication ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I84e3ae7a532a8a76ac1c26d357da7eaa73f39374 Gerrit-Change-Number: 28831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 22:48:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28835 ) Change subject: trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD ...................................................................... trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD This allows replacing L1CTL and/or TRXC/TRXD with something else. Change-Id: I7282da6dd16216bb4295c4d18f993251defbdf0a Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 35 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/35/28835/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 96be9e3..7d5d6dd 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -1,8 +1,6 @@ #pragma once struct l1sched_state; -struct trx_instance; -struct l1ctl_client; extern struct osmo_fsm trxcon_fsm_def; @@ -130,9 +128,10 @@ /* The L1 scheduler */ struct l1sched_state *sched; - /* L1/L2 interfaces */ - struct trx_instance *trx; - struct l1ctl_client *l1c; + /* PHY interface (e.g. TRXC/TRXD) */ + void *phyif; + /* L2 interface (e.g. L1CTL) */ + void *l2if; /* L1 parameters */ struct { diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index fe3d663..35687d7 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -112,7 +112,7 @@ switch (cr->type) { case L1SCHED_CFG_PCHAN_COMB: - return trx_if_cmd_setslot(trxcon->trx, + return trx_if_cmd_setslot(trxcon->phyif, cr->pchan_comb.tn, cr->pchan_comb.pchan); default: @@ -127,7 +127,7 @@ { struct trxcon_inst *trxcon = sched->priv; - return trx_if_tx_burst(trxcon->trx, br); + return trx_if_tx_burst(trxcon->phyif, br); } /* External L2 API for the scheduler */ @@ -211,12 +211,12 @@ switch (dt) { case L1SCHED_DT_TRAFFIC: case L1SCHED_DT_PACKET_DATA: - rc = l1ctl_tx_dt_conf(trxcon->l1c, &dl_hdr, true); + rc = l1ctl_tx_dt_conf(trxcon->l2if, &dl_hdr, true); data_len = lchan->prim->payload_len; data = lchan->prim->payload; break; case L1SCHED_DT_SIGNALING: - rc = l1ctl_tx_dt_conf(trxcon->l1c, &dl_hdr, false); + rc = l1ctl_tx_dt_conf(trxcon->l2if, &dl_hdr, false); data_len = lchan->prim->payload_len; data = lchan->prim->payload; break; @@ -226,7 +226,7 @@ rach = (struct l1sched_ts_prim_rach *)lchan->prim->payload; - rc = l1ctl_tx_rach_conf(trxcon->l1c, trxcon->l1p.band_arfcn, fn); + rc = l1ctl_tx_rach_conf(trxcon->l2if, trxcon->l1p.band_arfcn, fn); if (lchan->prim->type == L1SCHED_PRIM_RACH11) { ra_buf[0] = (uint8_t)(rach->ra >> 3); ra_buf[1] = (uint8_t)(rach->ra & 0x07); @@ -271,11 +271,11 @@ trxcon->log_prefix = talloc_asprintf(trxcon, "%s: ", osmo_fsm_inst_name(trxcon->fi)); /* Init transceiver interface */ - trxcon->trx = trx_if_open(trxcon, + trxcon->phyif = trx_if_open(trxcon, app_data.trx_bind_ip, app_data.trx_remote_ip, app_data.trx_base_port); - if (trxcon->trx == NULL) { + if (trxcon->phyif == NULL) { trxcon_inst_free(trxcon); return NULL; } @@ -301,10 +301,10 @@ if (trxcon->sched != NULL) l1sched_free(trxcon->sched); /* Close active connections */ - if (trxcon->l1c != NULL) - l1ctl_client_conn_close(trxcon->l1c); - if (trxcon->trx != NULL) - trx_if_close(trxcon->trx); + if (trxcon->l2if != NULL) + l1ctl_client_conn_close(trxcon->l2if); + if (trxcon->phyif != NULL) + trx_if_close(trxcon->phyif); if (trxcon->fi != NULL) osmo_fsm_inst_free(trxcon->fi); @@ -323,7 +323,7 @@ l1c->log_prefix = talloc_strdup(l1c, trxcon->log_prefix); l1c->priv = trxcon; - trxcon->l1c = l1c; + trxcon->l2if = l1c; } static void l1ctl_conn_close_cb(struct l1ctl_client *l1c) @@ -335,8 +335,8 @@ osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_L2IF_FAILURE, NULL); - /* l1c is free()ed by the caller */ - trxcon->l1c = NULL; + /* l2if is free()ed by the caller */ + trxcon->l2if = NULL; trxcon_inst_free(trxcon); } diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 1c220d3..0d1dccb 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -55,8 +55,8 @@ if (fi->state != TRXCON_ST_RESET) osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); l1sched_reset(trxcon->sched, true); - trx_if_cmd_poweroff(trxcon->trx); - trx_if_cmd_echo(trxcon->trx); + trx_if_cmd_poweroff(trxcon->phyif); + trx_if_cmd_echo(trxcon->phyif); break; case TRXCON_EV_RESET_SCHED_REQ: l1sched_reset(trxcon->sched, false); @@ -66,7 +66,7 @@ const struct trxcon_param_set_config_req *req = data; if (trxcon->l1p.ta != req->timing_advance) - trx_if_cmd_setta(trxcon->trx, req->timing_advance); + trx_if_cmd_setta(trxcon->phyif, req->timing_advance); trxcon->l1p.tx_power = req->tx_power; trxcon->l1p.ta = req->timing_advance; break; @@ -82,7 +82,7 @@ switch (fi->state) { case TRXCON_ST_FBSB_SEARCH: - l1ctl_tx_fbsb_fail(trxcon->l1c, trxcon->l1p.band_arfcn); + l1ctl_tx_fbsb_fail(trxcon->l2if, trxcon->l1p.band_arfcn); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); return 0; default: @@ -99,6 +99,7 @@ case TRXCON_EV_FBSB_SEARCH_REQ: { const struct trxcon_param_fbsb_search_req *req = data; + const struct trx_instance *trx = trxcon->phyif; osmo_fsm_inst_state_chg_ms(fi, TRXCON_ST_FBSB_SEARCH, req->timeout_ms, 0); @@ -110,14 +111,14 @@ trxcon->l1p.band_arfcn = req->band_arfcn; /* Tune transceiver to required ARFCN */ - trx_if_cmd_rxtune(trxcon->trx, req->band_arfcn); - trx_if_cmd_txtune(trxcon->trx, req->band_arfcn); + trx_if_cmd_rxtune(trxcon->phyif, req->band_arfcn); + trx_if_cmd_txtune(trxcon->phyif, req->band_arfcn); } /* Transceiver might have been powered on before, e.g. * in case of sending L1CTL_FBSB_REQ due to signal loss. */ - if (!trxcon->trx->powered_up) - trx_if_cmd_poweron(trxcon->trx); + if (!trx->powered_up) + trx_if_cmd_poweron(trxcon->phyif); break; } case TRXCON_EV_FULL_POWER_SCAN_REQ: @@ -125,7 +126,7 @@ const struct trxcon_param_full_power_scan_req *req = data; osmo_fsm_inst_state_chg(fi, TRXCON_ST_FULL_POWER_SCAN, 0, 0); /* TODO: timeout */ - trx_if_cmd_measure(trxcon->trx, req->band_arfcn_start, req->band_arfcn_stop); + trx_if_cmd_measure(trxcon->phyif, req->band_arfcn_start, req->band_arfcn_stop); break; } default: @@ -143,7 +144,7 @@ { const struct trxcon_param_full_power_scan_res *res = data; - l1ctl_tx_pm_conf(trxcon->l1c, res->band_arfcn, res->dbm, res->last_result); + l1ctl_tx_pm_conf(trxcon->l2if, res->band_arfcn, res->dbm, res->last_result); break; } default: @@ -159,7 +160,7 @@ switch (event) { case TRXCON_EV_FBSB_SEARCH_RES: osmo_fsm_inst_state_chg(fi, TRXCON_ST_BCCH_CCCH, 0, 0); - l1ctl_tx_fbsb_conf(trxcon->l1c, + l1ctl_tx_fbsb_conf(trxcon->l2if, trxcon->l1p.band_arfcn, trxcon->sched->bsic); break; @@ -229,7 +230,7 @@ if (req->hopping) { /* Apply the freq. hopping parameters */ - rc = trx_if_cmd_setfh(trxcon->trx, + rc = trx_if_cmd_setfh(trxcon->phyif, req->h1.hsn, req->h1.maio, &req->h1.ma[0], req->h1.n); if (rc) @@ -239,9 +240,9 @@ trxcon->l1p.band_arfcn = 0xffff; } else { /* Tune transceiver to required ARFCN */ - if (trx_if_cmd_rxtune(trxcon->trx, req->h0.band_arfcn)) + if (trx_if_cmd_rxtune(trxcon->phyif, req->h0.band_arfcn)) return; - if (trx_if_cmd_txtune(trxcon->trx, req->h0.band_arfcn)) + if (trx_if_cmd_txtune(trxcon->phyif, req->h0.band_arfcn)) return; /* Update current ARFCN */ @@ -280,7 +281,7 @@ /* TODO: set proper .snr */ }; - l1ctl_tx_dt_ind(trxcon->l1c, &dl_hdr, ind->data, ind->data_len, false); + l1ctl_tx_dt_ind(trxcon->l2if, &dl_hdr, ind->data, ind->data_len, false); break; } default: @@ -374,7 +375,7 @@ /* TODO: set proper .snr */ }; - l1ctl_tx_dt_ind(trxcon->l1c, &dl_hdr, + l1ctl_tx_dt_ind(trxcon->l2if, &dl_hdr, ind->data, ind->data_len, event == TRXCON_EV_RX_TRAFFIC_IND); break; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7282da6dd16216bb4295c4d18f993251defbdf0a Gerrit-Change-Number: 28835 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 L1 params from struct trx_instance to trxcon_inst

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28834 ) Change subject: trxcon: move L1 params from struct trx_instance to trxcon_inst ...................................................................... trxcon: move L1 params from struct trx_instance to trxcon_inst Change-Id: Ifbd9bb17d63ab1d8712d0c8022a62117a48c6384 Related: OS#5599 --- 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/sched_prim.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 23 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/34/28834/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 18d71cc..1faa610 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trx_if.h @@ -39,9 +39,6 @@ /* GSM L1 specific */ uint16_t pm_band_arfcn_start; uint16_t pm_band_arfcn_stop; - uint16_t band_arfcn; - uint8_t tx_power; - int8_t ta; }; struct trx_ctrl_msg { diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 9f20cd7..96be9e3 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -133,6 +133,13 @@ /* L1/L2 interfaces */ struct trx_instance *trx; struct l1ctl_client *l1c; + + /* L1 parameters */ + struct { + uint16_t band_arfcn; + uint8_t tx_power; + int8_t ta; + } l1p; }; struct trxcon_inst *trxcon_inst_alloc(void *ctx, unsigned int id); diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 33d48de..9b6d28d 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -186,7 +186,7 @@ * decide whether to update the cached L1 SACCH header here. */ if (!cached) { -#warning "FIXME: no direct access to trx->{tx_power,ta}" +#warning "FIXME: no direct access to trxcon->l1p.{tx_power,ta}" #if 0 prim->payload[0] = lchan->ts->sched->trx->tx_power; prim->payload[1] = lchan->ts->sched->trx->ta; diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index d4f4214..fe3d663 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -180,7 +180,7 @@ if (data != NULL && data_len > 0) { trxcon_gsmtap_send(lchan_desc, meas->fn, lchan->ts->index, - trxcon->trx->band_arfcn, meas->rssi, 0, + trxcon->l1p.band_arfcn, meas->rssi, 0, data, data_len); } @@ -205,7 +205,7 @@ .chan_nr = lchan_desc->chan_nr | lchan->ts->index, .link_id = lchan_desc->link_id, .frame_nr = htonl(fn), - .band_arfcn = htons(trxcon->trx->band_arfcn), + .band_arfcn = htons(trxcon->l1p.band_arfcn), }; switch (dt) { @@ -226,7 +226,7 @@ rach = (struct l1sched_ts_prim_rach *)lchan->prim->payload; - rc = l1ctl_tx_rach_conf(trxcon->l1c, trxcon->trx->band_arfcn, fn); + rc = l1ctl_tx_rach_conf(trxcon->l1c, trxcon->l1p.band_arfcn, fn); if (lchan->prim->type == L1SCHED_PRIM_RACH11) { ra_buf[0] = (uint8_t)(rach->ra >> 3); ra_buf[1] = (uint8_t)(rach->ra & 0x07); @@ -247,7 +247,7 @@ } trxcon_gsmtap_send(lchan_desc, fn, lchan->ts->index, - trxcon->trx->band_arfcn | ARFCN_UPLINK, + trxcon->l1p.band_arfcn | ARFCN_UPLINK, 0, 0, data, data_len); return rc; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 4145e9f..1c220d3 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -65,10 +65,10 @@ { const struct trxcon_param_set_config_req *req = data; - if (trxcon->trx->ta != req->timing_advance) + if (trxcon->l1p.ta != req->timing_advance) trx_if_cmd_setta(trxcon->trx, req->timing_advance); - trxcon->trx->tx_power = req->tx_power; - trxcon->trx->ta = req->timing_advance; + trxcon->l1p.tx_power = req->tx_power; + trxcon->l1p.ta = req->timing_advance; break; } default: @@ -82,7 +82,7 @@ switch (fi->state) { case TRXCON_ST_FBSB_SEARCH: - l1ctl_tx_fbsb_fail(trxcon->l1c, trxcon->trx->band_arfcn); + l1ctl_tx_fbsb_fail(trxcon->l1c, trxcon->l1p.band_arfcn); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); return 0; default: @@ -105,9 +105,9 @@ l1sched_configure_ts(trxcon->sched, 0, req->pchan_config); /* Only if current ARFCN differs */ - if (trxcon->trx->band_arfcn != req->band_arfcn) { + if (trxcon->l1p.band_arfcn != req->band_arfcn) { /* Update current ARFCN */ - trxcon->trx->band_arfcn = req->band_arfcn; + trxcon->l1p.band_arfcn = req->band_arfcn; /* Tune transceiver to required ARFCN */ trx_if_cmd_rxtune(trxcon->trx, req->band_arfcn); @@ -160,7 +160,7 @@ case TRXCON_EV_FBSB_SEARCH_RES: osmo_fsm_inst_state_chg(fi, TRXCON_ST_BCCH_CCCH, 0, 0); l1ctl_tx_fbsb_conf(trxcon->l1c, - trxcon->trx->band_arfcn, + trxcon->l1p.band_arfcn, trxcon->sched->bsic); break; default: @@ -236,7 +236,7 @@ return; /* Set current ARFCN to an invalid value */ - trxcon->trx->band_arfcn = 0xffff; + trxcon->l1p.band_arfcn = 0xffff; } else { /* Tune transceiver to required ARFCN */ if (trx_if_cmd_rxtune(trxcon->trx, req->h0.band_arfcn)) @@ -245,7 +245,7 @@ return; /* Update current ARFCN */ - trxcon->trx->band_arfcn = req->h0.band_arfcn; + trxcon->l1p.band_arfcn = req->h0.band_arfcn; } rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); @@ -273,7 +273,7 @@ .chan_nr = ind->chan_nr, .link_id = ind->link_id, .frame_nr = htonl(ind->frame_nr), - .band_arfcn = htons(trxcon->trx->band_arfcn), + .band_arfcn = htons(trxcon->l1p.band_arfcn), .fire_crc = ind->data_len > 0 ? 0 : 2, .rx_level = dbm2rxlev(ind->rssi), .num_biterr = ind->n_errors, @@ -367,7 +367,7 @@ .chan_nr = ind->chan_nr, .link_id = ind->link_id, .frame_nr = htonl(ind->frame_nr), - .band_arfcn = htons(trxcon->trx->band_arfcn), + .band_arfcn = htons(trxcon->l1p.band_arfcn), .fire_crc = ind->data_len > 0 ? 0 : 2, .rx_level = dbm2rxlev(ind->rssi), .num_biterr = ind->n_errors, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifbd9bb17d63ab1d8712d0c8022a62117a48c6384 Gerrit-Change-Number: 28834 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 trxcon_fsm, move into a separate file

by fixeria

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 to look at the new patch set (#3). Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... trxcon: rework trxcon_fsm, move into a separate file The original trxcon_fsm I wrote back in 2017 [1] was more like a boolean flag, as there were only two states: IDLE and MANAGED. Not surprising, given that until recently handling of multiple L1CTL connections was not supported. Now that we have this implemented, lifetime of a trxcon_fsm instance is limited by lifetime of a L1CTL connection, what renders the FSM useless. This change removes the old 'boolean' trxcon_fsm and introduces the new one, which will allows us to abstract the L1CTL interface from the TRXC/TRXD interfaces, as well as the scheduler. The new FSM will also simplify development of the RLC/MAC layer for GPRS. Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Related: [1] I7ee6fc891abe5f775f5b7ebbf093181a97950dea Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/Makefile.am M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c A src/host/trxcon/src/trxcon_fsm.c 8 files changed, 766 insertions(+), 401 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/09/28809/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022