October 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: ansible: known_hosts: update
by osmith 16 Oct '23

16 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34767?usp=email ) Change subject: ansible: known_hosts: update ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/34767/comment/4023ad5d_c65b8e78 PS1, Line 9: After deploying with ansible to the jenkins nodes, these entries were > not sure what you mean here. […] These are the VPN IPs of the raspberry pis from the hosts file. The entries in known_hosts are generated when connecting to them the first time via SSH. The idea is to do trust on first use. It's not that useful when connecting to them via VPN anyway, but it makes more sense for the hosts above in the file where we don't do that. I've committed the changes so it doesn't show up as diff in git after running ansible. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3e3841d9f1f5581067b7dd90cdfcaf8337700e6f Gerrit-Change-Number: 34767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Oct 2023 11:20:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ansible: ttcn3: install netcat-openbsd
by osmith 16 Oct '23

16 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34765?usp=email ) Change subject: ansible: ttcn3: install netcat-openbsd ...................................................................... ansible: ttcn3: install netcat-openbsd Make nc available on jenkins nodes running ttcn3 tests, as it is now used by ttcn3-hss-test-ogs. Related: docker-playground Iebeefd9689ae2efa54678b99ff929ca255ec64d1 Change-Id: I397d4fe33813b083b61cdabb1d00ab4ea63a456b --- M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml index 67717fc..bae3d77 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml @@ -1,4 +1,11 @@ --- +- name: install programs used in jenkins.sh + apt: + name: + - netcat-openbsd + cache_valid_time: 3600 + update_cache: yes + install_recommends: no - name: ensure jenkins folder exists become: yes -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34765?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I397d4fe33813b083b61cdabb1d00ab4ea63a456b Gerrit-Change-Number: 34765 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmocom-bb[master]: mobile: clean up call related VTY commands
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34761?usp=email ) Change subject: mobile: clean up call related VTY commands ...................................................................... mobile: clean up call related VTY commands Change-Id: I8bccdf776ad541932ad4a6d6a68426a6ab856e08 Related: OS#4396 --- M src/host/layer23/src/mobile/vty_interface.c 1 file changed, 37 insertions(+), 14 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index b8f2692..28f8a1b 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -488,10 +488,16 @@ return CMD_SUCCESS; } -DEFUN(call_num, call_num_cmd, "call MS_NAME NUMBER", - "Make a call\nName of MS (see \"show ms\")\n" - "Phone number to call " - "(Use digits '0123456789*#abc', and '+' to dial international)\n") +#define CALL_CMD "call MS_NAME" +#define CALL_CMD_DESC \ + "Call related commands\n" \ + "Name of MS (see \"show ms\")\n" + +DEFUN(call_num, call_num_cmd, + CALL_CMD " NUMBER", + CALL_CMD_DESC + "Phone number to call " + "(Use digits '0123456789*#abc', and '+' to dial international)\n") { struct osmocom_ms *ms; struct gsm_settings *set; @@ -526,10 +532,13 @@ return CMD_SUCCESS; } -DEFUN(call, call_cmd, "call MS_NAME (emergency|answer|hangup|hold)", - "Make a call\nName of MS (see \"show ms\")\n" - "Make an emergency call\nAnswer an incoming call\nHangup a call\n" - "Hold current active call\n") +DEFUN(call, call_cmd, + CALL_CMD " (emergency|answer|hangup|hold)", + CALL_CMD_DESC + "Make an emergency call\n" + "Answer an incoming call\n" + "Hangup a call\n" + "Hold current active call\n") { struct osmocom_ms *ms; struct gsm_settings *set; @@ -561,9 +570,11 @@ return CMD_SUCCESS; } -DEFUN(call_retr, call_retr_cmd, "call MS_NAME retrieve [NUMBER]", - "Make a call\nName of MS (see \"show ms\")\n" - "Retrieve call on hold\nNumber of call to retrieve") +DEFUN(call_retr, call_retr_cmd, + CALL_CMD " retrieve [NUMBER]", + CALL_CMD_DESC + "Retrieve call on hold\n" + "Number of call to retrieve\n") { struct osmocom_ms *ms; @@ -576,9 +587,11 @@ return CMD_SUCCESS; } -DEFUN(call_dtmf, call_dtmf_cmd, "call MS_NAME dtmf DIGITS", - "Make a call\nName of MS (see \"show ms\")\n" - "One or more DTMF digits to transmit") +DEFUN(call_dtmf, call_dtmf_cmd, + CALL_CMD " dtmf DIGITS", + CALL_CMD_DESC + "Send DTMF (Dual-Tone Multi-Frequency) tones\n" + "One or more DTMF digits to transmit\n") { struct osmocom_ms *ms; struct gsm_settings *set; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34761?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8bccdf776ad541932ad4a6d6a68426a6ab856e08 Gerrit-Change-Number: 34761 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: mobile: mncc_call(): make *number argument const
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34759?usp=email ) Change subject: mobile: mncc_call(): make *number argument const ...................................................................... mobile: mncc_call(): make *number argument const Change-Id: I4558ce1313b8e9aadd73474a6514c136aa512de3 --- M src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h index 49ce1a4..705c681 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h @@ -1,6 +1,6 @@ #pragma once -int mncc_call(struct osmocom_ms *ms, char *number); +int mncc_call(struct osmocom_ms *ms, const char *number); int mncc_hangup(struct osmocom_ms *ms); int mncc_answer(struct osmocom_ms *ms); int mncc_hold(struct osmocom_ms *ms); diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 6add5d5..a068ee9 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -533,7 +533,7 @@ return 0; } -int mncc_call(struct osmocom_ms *ms, char *number) +int mncc_call(struct osmocom_ms *ms, const char *number) { struct gsm_call *call; struct gsm_mncc setup; diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 2a09608..ea355b3 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -497,7 +497,7 @@ struct osmocom_ms *ms; struct gsm_settings *set; struct gsm_settings_abbrev *abbrev; - char *number; + const char *number; ms = l23_vty_get_ms(argv[0], vty); if (!ms) @@ -510,7 +510,7 @@ return CMD_WARNING; } - number = (char *)argv[1]; + number = argv[1]; if (!strcmp(number, "emergency")) mncc_call(ms, number); else if (!strcmp(number, "answer")) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4558ce1313b8e9aadd73474a6514c136aa512de3 Gerrit-Change-Number: 34759 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: mobile: mncc_recv_internal(): make struct gsm_mncc ptr const
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34758?usp=email ) Change subject: mobile: mncc_recv_internal(): make struct gsm_mncc ptr const ...................................................................... mobile: mncc_recv_internal(): make struct gsm_mncc ptr const Change-Id: I0a5522b7df112bfaefc684c872a618c1e9118e61 --- M src/host/layer23/src/mobile/mnccms.c 1 file changed, 14 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 60d2e55..6add5d5 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -34,7 +34,8 @@ static uint32_t new_callref = 1; static LLIST_HEAD(call_list); -static int dtmf_statemachine(struct gsm_call *call, struct gsm_mncc *mncc); +static int dtmf_statemachine(struct gsm_call *call, + const struct gsm_mncc *mncc); static void timeout_dtmf(void *arg); /* @@ -258,7 +259,7 @@ int mncc_recv_internal(struct osmocom_ms *ms, int msg_type, void *arg) { struct gsm_settings *set = &ms->settings; - struct gsm_mncc *data = arg; + const struct gsm_mncc *data = arg; struct gsm_call *call = get_call_ref(data->callref); struct gsm_mncc mncc; uint8_t cause; @@ -727,7 +728,8 @@ * DTMF */ -static int dtmf_statemachine(struct gsm_call *call, struct gsm_mncc *mncc) +static int dtmf_statemachine(struct gsm_call *call, + const struct gsm_mncc *mncc) { struct osmocom_ms *ms = call->ms; struct gsm_mncc dtmf; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34758?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0a5522b7df112bfaefc684c872a618c1e9118e61 Gerrit-Change-Number: 34758 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmocom-bb[master]: mobile: separate 'call MS_NAME NUMBER' command
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34760?usp=email ) Change subject: mobile: separate 'call MS_NAME NUMBER' command ...................................................................... mobile: separate 'call MS_NAME NUMBER' command This will allow us adding an optional switch for data calls. Change-Id: I5d2332df09a81cb0747ecd9d95351ab59f99358e Related: OS#4396 --- M src/host/layer23/src/mobile/vty_interface.c 1 file changed, 55 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index ea355b3..b8f2692 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -488,15 +488,51 @@ return CMD_SUCCESS; } -DEFUN(call, call_cmd, "call MS_NAME (NUMBER|emergency|answer|hangup|hold)", - "Make a call\nName of MS (see \"show ms\")\nPhone number to call " - "(Use digits '0123456789*#abc', and '+' to dial international)\n" +DEFUN(call_num, call_num_cmd, "call MS_NAME NUMBER", + "Make a call\nName of MS (see \"show ms\")\n" + "Phone number to call " + "(Use digits '0123456789*#abc', and '+' to dial international)\n") +{ + struct osmocom_ms *ms; + struct gsm_settings *set; + struct gsm_settings_abbrev *abbrev; + const char *number; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + set = &ms->settings; + + if (set->ch_cap == GSM_CAP_SDCCH) { + vty_out(vty, "Basic call is not supported for SDCCH only " + "mobile%s", VTY_NEWLINE); + return CMD_WARNING; + } + + number = argv[1]; + llist_for_each_entry(abbrev, &set->abbrev, list) { + if (!strcmp(number, abbrev->abbrev)) { + number = abbrev->number; + vty_out(vty, "Dialing number '%s'%s", number, + VTY_NEWLINE); + break; + } + } + + if (vty_check_number(vty, number)) + return CMD_WARNING; + mncc_call(ms, number); + + return CMD_SUCCESS; +} + +DEFUN(call, call_cmd, "call MS_NAME (emergency|answer|hangup|hold)", + "Make a call\nName of MS (see \"show ms\")\n" "Make an emergency call\nAnswer an incoming call\nHangup a call\n" "Hold current active call\n") { struct osmocom_ms *ms; struct gsm_settings *set; - struct gsm_settings_abbrev *abbrev; const char *number; ms = l23_vty_get_ms(argv[0], vty); @@ -519,19 +555,8 @@ mncc_hangup(ms); else if (!strcmp(number, "hold")) mncc_hold(ms); - else { - llist_for_each_entry(abbrev, &set->abbrev, list) { - if (!strcmp(number, abbrev->abbrev)) { - number = abbrev->number; - vty_out(vty, "Dialing number '%s'%s", number, - VTY_NEWLINE); - break; - } - } - if (vty_check_number(vty, number)) - return CMD_WARNING; - mncc_call(ms, number); - } + else /* shall not happen */ + OSMO_ASSERT(0); return CMD_SUCCESS; } @@ -2506,6 +2531,7 @@ install_element(ENABLE_NODE, &network_search_cmd); install_element(ENABLE_NODE, &network_show_cmd); install_element(ENABLE_NODE, &network_select_cmd); + install_element(ENABLE_NODE, &call_num_cmd); install_element(ENABLE_NODE, &call_cmd); install_element(ENABLE_NODE, &call_retr_cmd); install_element(ENABLE_NODE, &call_dtmf_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5d2332df09a81cb0747ecd9d95351ab59f99358e Gerrit-Change-Number: 34760 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmocom-bb[master]: firmware/layer1: clean up l1s_tch_resp()
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34753?usp=email ) Change subject: firmware/layer1: clean up l1s_tch_resp() ...................................................................... firmware/layer1: clean up l1s_tch_resp() * Reset both A_DD_0 and A_DD_1 headers, like in the case of FACCH. * Reduce nesting, fix minor coding style issues. * Add a FIXME for proper B_BFI checking. Change-Id: Ie4faf386f54720888e73171bee26f93dfa0562d5 Related: OS#4396 --- M src/target/firmware/layer1/prim_tch.c 1 file changed, 44 insertions(+), 27 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 0c8745d..73cdc02 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -296,42 +296,45 @@ if (traffic_rx_now) { volatile uint16_t *traffic_buf; + struct l1ctl_info_dl *dl; + struct l1ctl_traffic_ind *ti; + struct msgb *msg; traffic_buf = tch_sub ? dsp_api.ndb->a_dd_1 : dsp_api.ndb->a_dd_0; - if (traffic_buf[0] & (1<<B_BLUD)) { - /* Send the data to upper layers (if interested and good frame) */ - if ((l1s.audio_mode & AUDIO_RX_TRAFFIC_IND) && - !(dsp_api.ndb->a_dd_0[0] & (1<<B_BFI))) { - struct msgb *msg; - struct l1ctl_info_dl *dl; - struct l1ctl_traffic_ind *ti; - uint8_t *payload; + /* Send the data to upper layers (if interested and good frame) */ + if (~l1s.audio_mode & AUDIO_RX_TRAFFIC_IND) + goto skip_rx_traffic; + if (~traffic_buf[0] & (1 << B_BLUD)) + goto skip_rx_traffic; + if (~dsp_api.ndb->a_dd_0[0] & (1 << B_BFI)) /* FIXME: use traffic_buf[] */ + goto skip_rx_traffic; - /* Allocate msgb */ - /* FIXME: we actually want all allocation out of L1S! */ - msg = l1ctl_msgb_alloc(L1CTL_TRAFFIC_IND); - if(!msg) { - printf("TCH traffic: unable to allocate msgb\n"); - goto skip_rx_traffic; - } + /* Allocate msgb */ + /* FIXME: we actually want all allocation out of L1S! */ + msg = l1ctl_msgb_alloc(L1CTL_TRAFFIC_IND); + if (!msg) { + printf("TCH traffic: unable to allocate msgb\n"); + goto skip_rx_traffic; + } - dl = (struct l1ctl_info_dl *) msgb_put(msg, sizeof(*dl)); - ti = (struct l1ctl_traffic_ind *) msgb_put(msg, sizeof(*ti)); - payload = (uint8_t *) msgb_put(msg, 33); + dl = (struct l1ctl_info_dl *) msgb_put(msg, sizeof(*dl)); + ti = (struct l1ctl_traffic_ind *) msgb_put(msg, sizeof(*ti)); - /* Copy actual data, skipping the information block [0,1,2] */ - dsp_memcpy_from_api(payload, &traffic_buf[3], 33, 1); + /* Copy actual data, skipping the information block [0,1,2] */ + dsp_memcpy_from_api(msgb_put(msg, 33), &traffic_buf[3], 33, 1); - /* Give message to up layer */ - l1_queue_for_l2(msg); - } + /* Give message to up layer */ + l1_queue_for_l2(msg); skip_rx_traffic: - /* Reset traffic buffer header in NDB (needed by DSP) */ - traffic_buf[0] = 0; - traffic_buf[2] = 0xffff; - } + /* Reset A_DD_0 header in NDB (needed by DSP) */ + dsp_api.ndb->a_dd_0[0] = 0; + dsp_api.ndb->a_dd_0[2] = 0xffff; + + /* Reset A_DD_1 header in NDB (needed by DSP) */ + dsp_api.ndb->a_dd_1[0] = 0; + dsp_api.ndb->a_dd_1[2] = 0xffff; } /* mark READ page as being used */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34753?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie4faf386f54720888e73171bee26f93dfa0562d5 Gerrit-Change-Number: 34753 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: firmware/layer1: fix l1s_tch_resp(): use the right A_DD header
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34754?usp=email ) Change subject: firmware/layer1: fix l1s_tch_resp(): use the right A_DD header ...................................................................... firmware/layer1: fix l1s_tch_resp(): use the right A_DD header Change-Id: Idd48438e47ac3ef1172621e77688d094cdcdbf34 Related: OS#4396 --- M src/target/firmware/layer1/prim_tch.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 73cdc02..38b74a3 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -307,7 +307,7 @@ goto skip_rx_traffic; if (~traffic_buf[0] & (1 << B_BLUD)) goto skip_rx_traffic; - if (~dsp_api.ndb->a_dd_0[0] & (1 << B_BFI)) /* FIXME: use traffic_buf[] */ + if (~traffic_buf[0] & (1 << B_BFI)) goto skip_rx_traffic; /* Allocate msgb */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34754?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd48438e47ac3ef1172621e77688d094cdcdbf34 Gerrit-Change-Number: 34754 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmocom-bb[master]: firmware/layer1: fill-in DL info for L1CTL TRAFFIC.ind
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34755?usp=email ) Change subject: firmware/layer1: fill-in DL info for L1CTL TRAFFIC.ind ...................................................................... firmware/layer1: fill-in DL info for L1CTL TRAFFIC.ind Change-Id: I1c9727b183214f3d1a4f9a48489479f8435a4c5a Related: OS#4396 --- M src/target/firmware/layer1/prim_tch.c 1 file changed, 56 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 38b74a3..fb7ebf4 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -156,14 +156,30 @@ #define FACCH_MEAS_HIST 8 /* Up to 8 bursts history */ struct l1s_rx_tch_state { struct l1s_meas_hdr meas[FACCH_MEAS_HIST]; + uint8_t meas_id; }; static struct l1s_rx_tch_state rx_tch; +static inline void l1s_tch_meas_avg(struct l1ctl_info_dl *dl, + unsigned int meas_num) +{ + uint32_t avg_snr = 0; + int32_t avg_dbm8 = 0; + + for (unsigned int i = 0; i < meas_num; i++) { + int j = (rx_tch.meas_id + FACCH_MEAS_HIST - i) % FACCH_MEAS_HIST; + avg_snr += rx_tch.meas[j].snr; + avg_dbm8 += rx_tch.meas[j].pm_dbm8; + } + + dl->snr = avg_snr / meas_num; + dl->rx_level = dbm2rxlev(avg_dbm8 / (8 * meas_num)); +} + static int l1s_tch_resp(__unused uint8_t p1, __unused uint8_t p2, uint16_t p3) { - static uint8_t meas_id = 0; uint8_t mf_task_id = p3 & 0xff; struct gsm_time rx_time; uint8_t chan_nr; @@ -179,27 +195,27 @@ chan_nr = mframe_task2chan_nr(mf_task_id, tn); tch_get_params(&rx_time, chan_nr, &fn_report, &tch_f_hn, &tch_sub, NULL); - meas_id = (meas_id + 1) % FACCH_MEAS_HIST; /* absolute value doesn't matter */ + rx_tch.meas_id = (rx_tch.meas_id + 1) % FACCH_MEAS_HIST; /* absolute value doesn't matter */ /* Collect measurements */ - rx_tch.meas[meas_id].toa_qbit = dsp_api.db_r->a_serv_demod[D_TOA]; - rx_tch.meas[meas_id].pm_dbm8 = + rx_tch.meas[rx_tch.meas_id].toa_qbit = dsp_api.db_r->a_serv_demod[D_TOA]; + rx_tch.meas[rx_tch.meas_id].pm_dbm8 = agc_inp_dbm8_by_pm(dsp_api.db_r->a_serv_demod[D_PM] >> 3); - rx_tch.meas[meas_id].freq_err = + rx_tch.meas[rx_tch.meas_id].freq_err = ANGLE_TO_FREQ(dsp_api.db_r->a_serv_demod[D_ANGLE]); - rx_tch.meas[meas_id].snr = dsp_api.db_r->a_serv_demod[D_SNR]; + rx_tch.meas[rx_tch.meas_id].snr = dsp_api.db_r->a_serv_demod[D_SNR]; /* feed computed frequency error into AFC loop */ - if (rx_tch.meas[meas_id].snr > AFC_SNR_THRESHOLD) - afc_input(rx_tch.meas[meas_id].freq_err, arfcn, 1); + if (rx_tch.meas[rx_tch.meas_id].snr > AFC_SNR_THRESHOLD) + afc_input(rx_tch.meas[rx_tch.meas_id].freq_err, arfcn, 1); else - afc_input(rx_tch.meas[meas_id].freq_err, arfcn, 0); + afc_input(rx_tch.meas[rx_tch.meas_id].freq_err, arfcn, 0); /* feed computed TOA into TA loop */ - toa_input(rx_tch.meas[meas_id].toa_qbit << 2, rx_tch.meas[meas_id].snr); + toa_input(rx_tch.meas[rx_tch.meas_id].toa_qbit << 2, rx_tch.meas[rx_tch.meas_id].snr); /* Tell the RF frontend to set the gain appropriately */ - rffe_compute_gain(rx_tch.meas[meas_id].pm_dbm8 / 8, + rffe_compute_gain(rx_tch.meas[rx_tch.meas_id].pm_dbm8 / 8, CAL_DSP_TGT_BB_LVL); /* FACCH Block end ? */ @@ -219,9 +235,6 @@ struct l1ctl_info_dl *dl; struct l1ctl_data_ind *di; uint16_t num_biterr; - uint32_t avg_snr = 0; - int32_t avg_dbm8 = 0; - int i, n; /* Allocate msgb */ /* FIXME: we actually want all allocation out of L1S! */ @@ -241,15 +254,7 @@ dl->frame_nr = htonl(rx_time.fn); /* Average SNR & RX level */ - n = tch_f_hn ? 8 : 6; - for (i=0; i<n; i++) { - int j = (meas_id + FACCH_MEAS_HIST - i) % FACCH_MEAS_HIST; - avg_snr += rx_tch.meas[j].snr; - avg_dbm8 += rx_tch.meas[j].pm_dbm8; - } - - dl->snr = avg_snr / n; - dl->rx_level = dbm2rxlev(avg_dbm8 / (8*n)); + l1s_tch_meas_avg(dl, tch_f_hn ? 8 : 6); /* Errors & CRC status */ num_biterr = dsp_api.ndb->a_fd[2] & 0xffff; @@ -299,6 +304,7 @@ struct l1ctl_info_dl *dl; struct l1ctl_traffic_ind *ti; struct msgb *msg; + uint16_t num_biterr; traffic_buf = tch_sub ? dsp_api.ndb->a_dd_1 : dsp_api.ndb->a_dd_0; @@ -321,6 +327,23 @@ dl = (struct l1ctl_info_dl *) msgb_put(msg, sizeof(*dl)); ti = (struct l1ctl_traffic_ind *) msgb_put(msg, sizeof(*ti)); + dl->chan_nr = chan_nr; + dl->band_arfcn = htons(arfcn); + dl->frame_nr = htonl(rx_time.fn); + + /* Average SNR & RX level */ + l1s_tch_meas_avg(dl, tch_f_hn ? 8 : 4); + + /* Errors & CRC status */ + num_biterr = traffic_buf[2] & 0xffff; + if (num_biterr > 0xff) + dl->num_biterr = 0xff; + else + dl->num_biterr = num_biterr; + + /* Update rx level for pm report */ + pu_update_rx_level(dl->rx_level); + /* Copy actual data, skipping the information block [0,1,2] */ dsp_memcpy_from_api(msgb_put(msg, 33), &traffic_buf[3], 33, 1); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34755?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1c9727b183214f3d1a4f9a48489479f8435a4c5a Gerrit-Change-Number: 34755 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: firmware/layer1: emit TRAFFIC.ind even if B_BFI is set
by fixeria 16 Oct '23

16 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34756?usp=email ) Change subject: firmware/layer1: emit TRAFFIC.ind even if B_BFI is set ...................................................................... firmware/layer1: emit TRAFFIC.ind even if B_BFI is set Even if the DSP marks a traffic frame as bad (B_BFI), we still want to deliver something to the upper layers, just like we do for FACCH. Change-Id: I559793a3506089b1c1758ee7022cceb7753afb30 Related: OS#4396 --- M src/target/firmware/layer1/prim_tch.c 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index fb7ebf4..c6fbddd 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -313,8 +313,6 @@ goto skip_rx_traffic; if (~traffic_buf[0] & (1 << B_BLUD)) goto skip_rx_traffic; - if (~traffic_buf[0] & (1 << B_BFI)) - goto skip_rx_traffic; /* Allocate msgb */ /* FIXME: we actually want all allocation out of L1S! */ @@ -341,6 +339,8 @@ else dl->num_biterr = num_biterr; + dl->fire_crc = ((traffic_buf[0] & 0xffff) & ((1 << B_FIRE1) | (1 << B_FIRE0))) >> B_FIRE0; + /* Update rx level for pm report */ pu_update_rx_level(dl->rx_level); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34756?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I559793a3506089b1c1758ee7022cceb7753afb30 Gerrit-Change-Number: 34756 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0