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

Change in osmocom-bb[master]: mobile: do not enforce RTP format for Uplink TCH frames

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30483 ) Change subject: mobile: do not enforce RTP format for Uplink TCH frames ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: So, checking the TI specific TCH frame format isn't feasible / useful here? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6113ba443e65ddaae091b643af54c873b7da4de8 Gerrit-Change-Number: 30483 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:31:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: support RTP and TI specific TCH frame I/O formats

by osmith

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30455 ) Change subject: mobile: support RTP and TI specific TCH frame I/O formats ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib41f8c39c82c243b62a76433f59a2b98e175f894 Gerrit-Change-Number: 30455 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:27:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trxcon_fsm: permit direct DCH/PDCH transitions

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30319 ) Change subject: trxcon: trxcon_fsm: permit direct DCH/PDCH transitions ...................................................................... trxcon: trxcon_fsm: permit direct DCH/PDCH transitions It may happen that the MS needs to go directly from a PDCH to a TCH or SDCCH, e.g. in case of a Mobile Terminated call. I don't know if the opposite transition is needed on practice, but let's simply allow direct transitions for both TRXCON_ST_{DEDICATED,PACKET_DATA}. Change-Id: I1a854e4683f102c40f1c174a291b6dc638f49b5c Related: OS#5599 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 264ba20..47da0bd 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -611,7 +611,8 @@ .name = "DEDICATED", .out_state_mask = S(TRXCON_ST_RESET) | S(TRXCON_ST_FBSB_SEARCH) - | S(TRXCON_ST_DEDICATED), + | S(TRXCON_ST_DEDICATED) + | S(TRXCON_ST_PACKET_DATA), .in_event_mask = S(TRXCON_EV_DCH_REL_REQ) | S(TRXCON_EV_DCH_EST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) @@ -627,6 +628,7 @@ .name = "PACKET_DATA", .out_state_mask = S(TRXCON_ST_RESET) | S(TRXCON_ST_FBSB_SEARCH) + | S(TRXCON_ST_DEDICATED) | S(TRXCON_ST_PACKET_DATA), .in_event_mask = S(TRXCON_EV_DCH_REL_REQ) | S(TRXCON_EV_DCH_EST_REQ) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1a854e4683f102c40f1c174a291b6dc638f49b5c Gerrit-Change-Number: 30319 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trxcon_fsm: separate handling of TRXCON_EV_DCH_EST_REQ

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30317 ) Change subject: trxcon: trxcon_fsm: separate handling of TRXCON_EV_DCH_EST_REQ ...................................................................... trxcon: trxcon_fsm: separate handling of TRXCON_EV_DCH_EST_REQ This new function will be re-used in a follow up patch implementing handling of TRXCON_EV_DCH_EST_REQ in TRXCON_ST_{DEDICATED,PACKET_DATA}. Change-Id: I8db93fcdace7aaa8bc3876b14e441304349a36d5 Related: OS#5599 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 70 insertions(+), 66 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 2beb819..875a9f5 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -289,12 +289,78 @@ LOGPFSML(fi, LOGL_ERROR, "Failed to enqueue a prim\n"); } +static void handle_dch_est_req(struct osmo_fsm_inst *fi, + const struct trxcon_param_dch_est_req *req) +{ + struct trxcon_inst *trxcon = fi->priv; + enum gsm_phys_chan_config config; + struct l1sched_ts *ts; + int rc; + + config = l1sched_chan_nr2pchan_config(req->chan_nr); + if (config == GSM_PCHAN_NONE) { + LOGPFSML(fi, LOGL_ERROR, "Failed to determine channel config\n"); + return; + } + + if (req->hopping) { + const struct trxcon_phyif_cmd phycmd = { + .type = TRXCON_PHYIF_CMDT_SETFREQ_H1, + .param.setfreq_h1 = { + .hsn = req->h1.hsn, + .maio = req->h1.maio, + .ma = &req->h1.ma[0], + .ma_len = req->h1.n, + }, + }; + + /* Apply the freq. hopping parameters */ + if (trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd) != 0) + return; + + /* Set current ARFCN to an invalid value */ + trxcon->l1p.band_arfcn = 0xffff; + } else { + const struct trxcon_phyif_cmd phycmd = { + .type = TRXCON_PHYIF_CMDT_SETFREQ_H0, + .param.setfreq_h0 = { + .band_arfcn = req->h0.band_arfcn, + }, + }; + + /* Tune transceiver to required ARFCN */ + if (trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd) != 0) + return; + + /* Update current ARFCN */ + trxcon->l1p.band_arfcn = req->h0.band_arfcn; + } + + rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); + if (rc) + return; + ts = trxcon->sched->ts[req->chan_nr & 0x07]; + OSMO_ASSERT(ts != NULL); + + l1sched_deactivate_all_lchans(ts); + + /* Activate only requested lchans */ + rc = l1sched_set_lchans(ts, req->chan_nr, 1, req->tch_mode, req->tsc); + if (rc) { + LOGPFSML(fi, LOGL_ERROR, "Failed to activate requested lchans\n"); + return; + } + + if (config == GSM_PCHAN_PDCH) + osmo_fsm_inst_state_chg(fi, TRXCON_ST_PACKET_DATA, 0, 0); + else + osmo_fsm_inst_state_chg(fi, TRXCON_ST_DEDICATED, 0, 0); +} + static void trxcon_st_bcch_ccch_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct trxcon_inst *trxcon = fi->priv; - struct l1sched_ts *ts; - int rc; switch (event) { case TRXCON_EV_TX_ACCESS_BURST_REQ: @@ -307,9 +373,9 @@ { struct trxcon_param_set_ccch_tch_mode_req *req = data; enum gsm_phys_chan_config chan_config = req->mode; + struct l1sched_ts *ts = trxcon->sched->ts[0]; /* Make sure that TS0 is allocated and configured */ - ts = trxcon->sched->ts[0]; if (ts == NULL || ts->mf_layout == NULL) { LOGPFSML(fi, LOGL_ERROR, "TS0 is not configured\n"); return; @@ -322,70 +388,8 @@ break; } case TRXCON_EV_DCH_EST_REQ: - { - const struct trxcon_param_dch_est_req *req = data; - enum gsm_phys_chan_config config; - - config = l1sched_chan_nr2pchan_config(req->chan_nr); - if (config == GSM_PCHAN_NONE) { - LOGPFSML(fi, LOGL_ERROR, "Failed to determine channel config\n"); - return; - } - - if (req->hopping) { - const struct trxcon_phyif_cmd phycmd = { - .type = TRXCON_PHYIF_CMDT_SETFREQ_H1, - .param.setfreq_h1 = { - .hsn = req->h1.hsn, - .maio = req->h1.maio, - .ma = &req->h1.ma[0], - .ma_len = req->h1.n, - }, - }; - - /* Apply the freq. hopping parameters */ - if (trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd) != 0) - return; - - /* Set current ARFCN to an invalid value */ - trxcon->l1p.band_arfcn = 0xffff; - } else { - const struct trxcon_phyif_cmd phycmd = { - .type = TRXCON_PHYIF_CMDT_SETFREQ_H0, - .param.setfreq_h0 = { - .band_arfcn = req->h0.band_arfcn, - }, - }; - - /* Tune transceiver to required ARFCN */ - if (trxcon_phyif_handle_cmd(trxcon->phyif, &phycmd) != 0) - return; - - /* Update current ARFCN */ - trxcon->l1p.band_arfcn = req->h0.band_arfcn; - } - - rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); - if (rc) - return; - ts = trxcon->sched->ts[req->chan_nr & 0x07]; - OSMO_ASSERT(ts != NULL); - - l1sched_deactivate_all_lchans(ts); - - /* Activate only requested lchans */ - rc = l1sched_set_lchans(ts, req->chan_nr, 1, req->tch_mode, req->tsc); - if (rc) { - LOGPFSML(fi, LOGL_ERROR, "Failed to activate requested lchans\n"); - return; - } - - if (config == GSM_PCHAN_PDCH) - osmo_fsm_inst_state_chg(fi, TRXCON_ST_PACKET_DATA, 0, 0); - else - osmo_fsm_inst_state_chg(fi, TRXCON_ST_DEDICATED, 0, 0); + handle_dch_est_req(fi, (const struct trxcon_param_dch_est_req *)data); break; - } case TRXCON_EV_RX_DATA_IND: l1ctl_tx_dt_ind(trxcon, (const struct trxcon_param_rx_data_ind *)data); break; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8db93fcdace7aaa8bc3876b14e441304349a36d5 Gerrit-Change-Number: 30317 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trxcon_fsm: permit loop [P]DCH transitions

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30318 ) Change subject: trxcon: trxcon_fsm: permit loop [P]DCH transitions ...................................................................... trxcon: trxcon_fsm: permit loop [P]DCH transitions According to 3GPP TS 44.004, Figure 5.1, it's absolutely legal to perform loop transitions in state 'DCH' (i.e. from 'DCH' to 'DCH'). This kind of transition is needed in the following cases: * on reciept of RR FREQUENCY REDEFINITION, * on reciept of RR ASSIGNMENT REQUEST, * on reciept of RR HANDOVER REQUEST, when going back from state 'DCH' to state 'BCH' is not required nor actually desired. In context of the trxcon_fsm, this applies to both TRXCON_ST_DEDICATED and TRXCON_ST_PACKET_DATA, as they both represent what's defined as 'DCH' in the Figure 5.1. Change-Id: I3b402ec84610a5df744d9b06e5f7dab7a9a3ddad Related: OS#5599 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 875a9f5..264ba20 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -336,6 +336,9 @@ trxcon->l1p.band_arfcn = req->h0.band_arfcn; } + /* Remove all active timeslots */ + l1sched_reset(trxcon->sched, false); + rc = l1sched_configure_ts(trxcon->sched, req->chan_nr & 0x07, config); if (rc) return; @@ -410,6 +413,9 @@ case TRXCON_EV_TX_ACCESS_BURST_CNF: l1ctl_tx_rach_conf(trxcon, (const struct trxcon_param_tx_access_burst_cnf *)data); break; + case TRXCON_EV_DCH_EST_REQ: + 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); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); @@ -530,6 +536,9 @@ LOGPFSML(fi, LOGL_NOTICE, "Rx PTCCH/D message\n"); break; } + case TRXCON_EV_DCH_EST_REQ: + 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); osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); @@ -601,8 +610,10 @@ [TRXCON_ST_DEDICATED] = { .name = "DEDICATED", .out_state_mask = S(TRXCON_ST_RESET) - | S(TRXCON_ST_FBSB_SEARCH), + | S(TRXCON_ST_FBSB_SEARCH) + | S(TRXCON_ST_DEDICATED), .in_event_mask = S(TRXCON_EV_DCH_REL_REQ) + | S(TRXCON_EV_DCH_EST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_CNF) | S(TRXCON_EV_SET_TCH_MODE_REQ) @@ -615,8 +626,10 @@ [TRXCON_ST_PACKET_DATA] = { .name = "PACKET_DATA", .out_state_mask = S(TRXCON_ST_RESET) - | S(TRXCON_ST_FBSB_SEARCH), + | S(TRXCON_ST_FBSB_SEARCH) + | S(TRXCON_ST_PACKET_DATA), .in_event_mask = S(TRXCON_EV_DCH_REL_REQ) + | S(TRXCON_EV_DCH_EST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_REQ) | S(TRXCON_EV_TX_ACCESS_BURST_CNF) | S(TRXCON_EV_RX_DATA_IND), -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3b402ec84610a5df744d9b06e5f7dab7a9a3ddad Gerrit-Change-Number: 30318 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: add value-string defs for L1CTL Reset / CCCH Mode

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30452 ) Change subject: trxcon: add value-string defs for L1CTL Reset / CCCH Mode ...................................................................... trxcon: add value-string defs for L1CTL Reset / CCCH Mode Change-Id: I045b2c771b24d301570c9556770e97afedc8274a --- M src/host/trxcon/src/l1ctl.c 1 file changed, 24 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 8c9372b..2f4881b 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -33,6 +33,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> +#include <osmocom/core/utils.h> #include <osmocom/gsm/gsm0502.h> #include <osmocom/gsm/gsm_utils.h> @@ -50,6 +51,21 @@ int g_logc_l1c = DLGLOBAL; int g_logc_l1d = DLGLOBAL; +static const struct value_string l1ctl_ccch_mode_names[] = { + { CCCH_MODE_NONE, "NONE" }, + { CCCH_MODE_NON_COMBINED, "NON_COMBINED" }, + { CCCH_MODE_COMBINED, "COMBINED" }, + { CCCH_MODE_COMBINED_CBCH, "COMBINED_CBCH" }, + { 0, NULL }, +}; + +static const struct value_string l1ctl_reset_names[] = { + { L1CTL_RES_T_BOOT, "BOOT" }, + { L1CTL_RES_T_FULL, "FULL" }, + { L1CTL_RES_T_SCHED, "SCHED" }, + { 0, NULL }, +}; + static const char *arfcn2band_name(uint16_t arfcn) { enum gsm_band band; @@ -121,7 +137,8 @@ if (!msg) return -ENOMEM; - LOGPFSMSL(fi, g_logc_l1c, LOGL_DEBUG, "Send Reset Ind (%u)\n", type); + LOGPFSMSL(fi, g_logc_l1c, LOGL_DEBUG, "Send Reset Ind (%s)\n", + get_value_string(l1ctl_reset_names, type)); res = (struct l1ctl_reset *) msgb_put(msg, sizeof(*res)); res->type = type; @@ -139,7 +156,8 @@ if (!msg) return -ENOMEM; - LOGPFSMSL(fi, g_logc_l1c, LOGL_DEBUG, "Send Reset Conf (%u)\n", type); + LOGPFSMSL(fi, g_logc_l1c, LOGL_DEBUG, "Send Reset Conf (%s)\n", + get_value_string(l1ctl_reset_names, type)); res = (struct l1ctl_reset *) msgb_put(msg, sizeof(*res)); res->type = type; @@ -417,7 +435,8 @@ } LOGPFSMSL(fi, g_logc_l1c, LOGL_NOTICE, - "Received reset request (%u)\n", res->type); + "Received reset request (%s)\n", + get_value_string(l1ctl_reset_names, res->type)); switch (res->type) { case L1CTL_RES_T_FULL: @@ -471,8 +490,8 @@ goto exit; } - LOGPFSMSL(fi, g_logc_l1c, LOGL_NOTICE, "Received CCCH mode request (%u)\n", - mode_req->ccch_mode); /* TODO: add value-string for ccch_mode */ + LOGPFSMSL(fi, g_logc_l1c, LOGL_NOTICE, "Received CCCH mode request (%s)\n", + get_value_string(l1ctl_ccch_mode_names, mode_req->ccch_mode)); struct trxcon_param_set_ccch_tch_mode_req req = { /* Choose corresponding channel combination */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I045b2c771b24d301570c9556770e97afedc8274a Gerrit-Change-Number: 30452 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: constify pointers in L1CTL decoding functions

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30451 ) Change subject: trxcon: constify pointers in L1CTL decoding functions ...................................................................... trxcon: constify pointers in L1CTL decoding functions Change-Id: Ife66b3c14f0ee2f29bf934db1f58512d52669b38 --- M src/host/trxcon/src/l1ctl.c 1 file changed, 30 insertions(+), 30 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 989e3c2..8c9372b 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -337,10 +337,10 @@ static int l1ctl_rx_fbsb_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_fbsb_req *fbsb; + const struct l1ctl_fbsb_req *fbsb; int rc = 0; - fbsb = (struct l1ctl_fbsb_req *) msg->l1h; + fbsb = (const struct l1ctl_fbsb_req *)msg->l1h; if (msgb_l1len(msg) < sizeof(*fbsb)) { LOGPFSMSL(fi, g_logc_l1c, LOGL_ERROR, "MSG too short FBSB Req: %u\n", @@ -371,10 +371,10 @@ static int l1ctl_rx_pm_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_pm_req *pmr; + const struct l1ctl_pm_req *pmr; int rc = 0; - pmr = (struct l1ctl_pm_req *) msg->l1h; + pmr = (const struct l1ctl_pm_req *)msg->l1h; if (msgb_l1len(msg) < sizeof(*pmr)) { LOGPFSMSL(fi, g_logc_l1c, LOGL_ERROR, "MSG too short PM Req: %u\n", @@ -404,10 +404,10 @@ static int l1ctl_rx_reset_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_reset *res; + const struct l1ctl_reset *res; int rc = 0; - res = (struct l1ctl_reset *) msg->l1h; + res = (const struct l1ctl_reset *)msg->l1h; if (msgb_l1len(msg) < sizeof(*res)) { LOGPFSMSL(fi, g_logc_l1c, LOGL_ERROR, "MSG too short Reset Req: %u\n", @@ -459,10 +459,10 @@ static int l1ctl_rx_ccch_mode_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_ccch_mode_req *mode_req; + const struct l1ctl_ccch_mode_req *mode_req; int rc; - mode_req = (struct l1ctl_ccch_mode_req *)msg->l1h; + mode_req = (const struct l1ctl_ccch_mode_req *)msg->l1h; if (msgb_l1len(msg) < sizeof(*mode_req)) { LOGPFSMSL(fi, g_logc_l1c, LOGL_ERROR, "MSG too short Reset Req: %u\n", @@ -492,9 +492,9 @@ { struct trxcon_param_tx_access_burst_req req; struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_info_ul *ul; + const struct l1ctl_info_ul *ul; - ul = (struct l1ctl_info_ul *) msg->l1h; + ul = (const struct l1ctl_info_ul *)msg->l1h; if (is_11bit) { const struct l1ctl_ext_rach_req *rr = (void *)ul->payload; @@ -590,12 +590,12 @@ static int l1ctl_rx_dm_est_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_dm_est_req *est_req; - struct l1ctl_info_ul *ul; + const struct l1ctl_dm_est_req *est_req; + const struct l1ctl_info_ul *ul; int rc; - ul = (struct l1ctl_info_ul *) msg->l1h; - est_req = (struct l1ctl_dm_est_req *) ul->payload; + ul = (const struct l1ctl_info_ul *)msg->l1h; + est_req = (const struct l1ctl_dm_est_req *)ul->payload; struct trxcon_param_dch_est_req req = { .chan_nr = ul->chan_nr, @@ -642,11 +642,11 @@ static int l1ctl_rx_dt_req(struct trxcon_inst *trxcon, struct msgb *msg, bool traffic) { struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_info_ul *ul; + const struct l1ctl_info_ul *ul; /* Extract UL frame header */ - ul = (struct l1ctl_info_ul *) msg->l1h; - msg->l2h = ul->payload; + ul = (const struct l1ctl_info_ul *)msg->l1h; + msg->l2h = (uint8_t *)ul->payload; struct trxcon_param_tx_data_req req = { .traffic = traffic, @@ -677,11 +677,11 @@ static int l1ctl_rx_param_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_par_req *par_req; - struct l1ctl_info_ul *ul; + const struct l1ctl_par_req *par_req; + const struct l1ctl_info_ul *ul; - ul = (struct l1ctl_info_ul *) msg->l1h; - par_req = (struct l1ctl_par_req *) ul->payload; + ul = (const struct l1ctl_info_ul *)msg->l1h; + par_req = (const struct l1ctl_par_req *)ul->payload; LOGPFSMSL(fi, g_logc_l1c, LOGL_NOTICE, "Received L1CTL_PARAM_REQ (ta=%d, tx_power=%u)\n", @@ -704,10 +704,10 @@ static int l1ctl_rx_tch_mode_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_tch_mode_req *mode_req; + const struct l1ctl_tch_mode_req *mode_req; int rc; - mode_req = (struct l1ctl_tch_mode_req *)msg->l1h; + mode_req = (const struct l1ctl_tch_mode_req *)msg->l1h; LOGPFSMSL(fi, g_logc_l1c, LOGL_NOTICE, "Received L1CTL_TCH_MODE_REQ (tch_mode=%u, audio_mode=%u)\n", @@ -739,11 +739,11 @@ static int l1ctl_rx_crypto_req(struct trxcon_inst *trxcon, struct msgb *msg) { struct osmo_fsm_inst *fi = trxcon->fi; - struct l1ctl_crypto_req *cr; - struct l1ctl_info_ul *ul; + const struct l1ctl_crypto_req *cr; + const struct l1ctl_info_ul *ul; - ul = (struct l1ctl_info_ul *) msg->l1h; - cr = (struct l1ctl_crypto_req *) ul->payload; + ul = (const struct l1ctl_info_ul *)msg->l1h; + cr = (const struct l1ctl_crypto_req *)ul->payload; struct trxcon_param_crypto_req req = { .chan_nr = ul->chan_nr, @@ -764,10 +764,10 @@ int trxcon_l1ctl_receive(struct trxcon_inst *trxcon, struct msgb *msg) { - struct l1ctl_hdr *l1h; + const struct l1ctl_hdr *l1h; - l1h = (struct l1ctl_hdr *) msg->l1h; - msg->l1h = l1h->data; + l1h = (const struct l1ctl_hdr *)msg->l1h; + msg->l1h = (uint8_t *)l1h->data; switch (l1h->msg_type) { case L1CTL_FBSB_REQ: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ife66b3c14f0ee2f29bf934db1f58512d52669b38 Gerrit-Change-Number: 30451 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: print TCH mode using gsm48_chan_mode_name()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30453 ) Change subject: trxcon: print TCH mode using gsm48_chan_mode_name() ...................................................................... trxcon: print TCH mode using gsm48_chan_mode_name() Change-Id: I6c54ad857b91ef1a32501912ba4c393e1c04eff0 --- M src/host/trxcon/src/l1ctl.c 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 2f4881b..f28bdc8 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -625,8 +625,9 @@ LOGPFSMSL(fi, g_logc_l1c, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ " - "(tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", - req.chan_nr & 0x07, req.chan_nr, req.tsc, req.tch_mode); + "(tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=%s)\n", + req.chan_nr & 0x07, req.chan_nr, req.tsc, + gsm48_chan_mode_name(est_req->tch_mode)); /* Frequency hopping? */ if (est_req->h) @@ -729,8 +730,8 @@ mode_req = (const struct l1ctl_tch_mode_req *)msg->l1h; LOGPFSMSL(fi, g_logc_l1c, LOGL_NOTICE, - "Received L1CTL_TCH_MODE_REQ (tch_mode=%u, audio_mode=%u)\n", - mode_req->tch_mode, mode_req->audio_mode); + "Received L1CTL_TCH_MODE_REQ (tch_mode=%s, audio_mode=%u)\n", + gsm48_chan_mode_name(mode_req->tch_mode), mode_req->audio_mode); /* TODO: do we need to care about audio_mode? */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6c54ad857b91ef1a32501912ba4c393e1c04eff0 Gerrit-Change-Number: 30453 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: clean up GAPK I/O state on channel release

by osmith

Attention is currently required from: laforge, fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30454 ) Change subject: mobile: clean up GAPK I/O state on channel release ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8943ee9bd46afc96e6d7cfd52c95c34fd311ce11 Gerrit-Change-Number: 30454 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:20:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: print TCH mode using gsm48_chan_mode_name()

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30453 ) Change subject: trxcon: print TCH mode using gsm48_chan_mode_name() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6c54ad857b91ef1a32501912ba4c393e1c04eff0 Gerrit-Change-Number: 30453 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Dec 2022 11:17:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022