Raymond Knopp
f99754a5ea
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-03-05 21:12:32 +01:00
Raymond Knopp
79a5249a72
for testing
2022-03-05 16:18:06 +01:00
Robert Schmidt
bc2246a566
Remove usage of MSC library after last merge
2022-03-04 09:21:02 +01:00
Robert Schmidt
807e5dd71c
Merge remote-tracking branch 'origin/NR_SA_pdu_session_modify_release' into integration_2022_wk09
2022-03-03 18:05:27 +01:00
Robert Schmidt
48f26086d3
Merge remote-tracking branch 'origin/x2-release-req-no-sctp' into integration_2022_wk09
2022-03-01 18:52:52 +01:00
Robert Schmidt
d6dc279439
Merge remote-tracking branch 'origin/NR_UE_CSIRS_scheduling' into integration_2022_wk09
2022-03-01 18:52:33 +01:00
Robert Schmidt
37e09d1ca8
Merge remote-tracking branch 'origin/NR_SA_10MHz' into integration_2022_wk09
2022-02-28 23:43:10 +01:00
Robert Schmidt
2adf56b08a
Lower logging in handle_nr_ulsch()
2022-02-26 16:10:03 +01:00
Robert Schmidt
6d165912f5
Merge remote-tracking branch 'origin/episys-ul-info-cleanup' into integration_2022_wk08_b
2022-02-26 16:10:03 +01:00
Robert Schmidt
2736d0fe16
Merge remote-tracking branch 'origin/repair-f1-5g' into integration_2022_wk08_b
2022-02-25 23:54:04 +01:00
Robert Schmidt
48df6e0ebb
Merge remote-tracking branch 'origin/ci_run_sanitize_and_debug' into integration_2022_wk08_b
2022-02-25 23:53:40 +01:00
Robert Schmidt
af0048c86c
Merge remote-tracking branch 'origin/bugfix-nr-rlc-2022-w08' into integration_2022_wk08_b
2022-02-25 23:37:29 +01:00
Robert Schmidt
8b526c3cb7
Address review comment
2022-02-24 20:52:43 +01:00
francescomani
50d4d3e8aa
addressing review comments
2022-02-24 17:05:59 +01:00
Robert Schmidt
f19ea82f8e
Drop an sgNB release request if no SCTP endpoint available
2022-02-24 12:54:04 +01:00
Robert Schmidt
61e608adb5
Support reconfiguration of number of HARQ processes
...
In F1, the time until the serving cell config comes from CU can be
longer than when we want to schedule a particular UE. Then, if we don't
configure the default number of HARQ processes, we can have a segfault.
In this commit, we initially configure 8 HARQ processes. When we get the
right number from RRC, we reconfigure.
2022-02-23 21:54:03 +01:00
Laurent THOMAS
22d2e9a38f
fix warnings and race cond in polar codec
2022-02-23 18:02:55 +01:00
Melissa Elkadi
4398630da7
Merge branch 'eurecom-develop' into episys-ul-info-cleanup
2022-02-23 08:55:10 -08:00
francescomani
5c56bb21ce
Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz
2022-02-23 15:08:52 +01:00
francescomani
ddfb131f68
Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling
2022-02-23 14:55:33 +01:00
Melissa Elkadi
abbcbe6aa5
Adding fixes for MR from review
...
These include:
- Simplifying VNF code.
- Adding comments to several areas of the code.
- Using free_and_zero macros
- Fixing spelling errors
2022-02-22 09:16:59 -08:00
Robert Schmidt
a5fd5c3e6b
Merge remote-tracking branch 'origin/multiple-ues-min-prbs-bug-fix' into integration_2022_wk08
2022-02-21 20:06:55 +01:00
Melissa Elkadi
7fb509511d
Merge branch 'eurecom-develop' into episys-ul-info-cleanup
2022-02-21 06:19:54 -08:00
francescomani
3b7430a745
Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz
2022-02-21 09:12:21 +01:00
Robert Schmidt
86c4882245
Merge remote-tracking branch 'origin/NR_2port_CSIRS' into integration_2022_wk08
2022-02-20 19:48:34 +01:00
Cedric Roux
78f0c8ff29
nr rlc: harmonize computation of sn_count
...
Functions generate_missing() and missing_size() had different
computations of sn_count. Not sure if it is a problem or not,
but let's do the same in both functions.
Hopefully the computation is correct.
2022-02-20 16:00:54 +01:00
Cedric Roux
7c652df820
nr rlc: bugfix - so_end was used instead of sn_end
2022-02-20 15:56:56 +01:00
Robert Schmidt
72a4ed80da
Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08
2022-02-19 19:43:11 +01:00
Robert Schmidt
21f862641c
Merge remote-tracking branch 'origin/cleanup-20220125' into integration_2022_wk08
2022-02-19 19:34:01 +01:00
Raymond Knopp
6d9d1f0b94
changes for 2.5ms TDD period
2022-02-19 13:07:20 +01:00
francescomani
d0228cf18a
Merge branch 'NR_2port_CSIRS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_2port_CSIRS
2022-02-18 13:39:02 +01:00
francescomani
0a59bffbb1
fix phy-test check
2022-02-18 13:38:45 +01:00
Robert Schmidt
6569fd7614
Do not prematurely overwrite scheduler information
...
Overwriting sched_pusch information at that stage would in particular
lose information on the current frame/slot. Overwriting sched_pusch with
the retInfo structure is already done at the end of
allocate_ul_retransmission(), and is therefore not necessary at this
stage.
2022-02-18 12:52:59 +01:00
Robert Schmidt
63989e8a69
Fix for F1 RFsim fail
...
We compute the preferred DL TDAs when receiving the cellGroup from the
RRC. However, in F1 and the RFsim, it seems that the scheduler tries to
access the preferred DL TDAs before they have been set after receiving
the cellGroup. In this commit, add a simple check to verify the
preferred TDA has been set up.
2022-02-18 12:16:08 +01:00
Robert Schmidt
e890cee31c
Reduce max_num_ue after successful PUCCH alloc
2022-02-17 13:58:27 +01:00
Robert Schmidt
fd40aa2666
Make nr_find_nb_rb() take minimum RBsize
...
Fixes a bug when scheduling multiple UEs
2022-02-17 13:58:24 +01:00
Robert Schmidt
ff0fb53056
Merge remote-tracking branch 'origin/nr-fdd-scheduling' into integration_2022_wk07_c
2022-02-17 09:32:44 +01:00
Robert Schmidt
b97d26cb86
Merge remote-tracking branch 'origin/NR_SA_UID' into integration_2022_wk07_c
2022-02-17 09:02:16 +01:00
Robert Schmidt
9a7154f3d4
Merge remote-tracking branch 'origin/fairRR-sched-debug' into integration_2022_wk07_c
2022-02-16 10:34:36 +01:00
Melissa Elkadi
679816c3c1
Added comment around asn1cCalloc memory leak
2022-02-15 15:05:04 -08:00
Melissa Elkadi
39d9febc0c
Hardcoding TI and UL_CQI in stub function.
...
Also, the allocation of the eNB measurement
report keeps getting commented out becasue
the compiler throws an error. I have un-commented
the allocation of memory (becasue it breaks NSA
mode) and added a memset to ensure we are using
the allocated memory. This gets rid of the
warning and ensures NSA mode still works.
2022-02-15 08:39:55 -08:00
Melissa Elkadi
e461ab51a1
Merge branch 'eurecom-develop' into episys-ul-info-cleanup
2022-02-14 16:16:43 -08:00
Melissa Elkadi
6de93fbb59
Only assigning harq_pid in emulated L1 mode.
2022-02-14 16:15:39 -08:00
francescomani
c645c12db4
using uid also in SA
2022-02-14 20:28:05 +01:00
francescomani
f1260a09e6
some fixes for phy-test mode
2022-02-14 17:40:57 +01:00
francescomani
de88c3f45c
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-14 08:57:52 +01:00
Raymond Knopp
4756c5a167
added configurable "sf_ahead" for NR/LTE in RU section. Tested in NR with sf_ahead=2 (normally 3)
2022-02-13 22:15:48 +01:00
Raymond Knopp
5ba8b83856
Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control
...
Conflicts:
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB_nsa.c
openair2/RRC/NR/rrc_gNB_reconfig.c
targets/ARCH/AW2SORI/oaiori.c
2022-02-13 12:24:45 +01:00
Raymond Knopp
da54df5bb2
Merge remote-tracking branch 'origin/develop' into harq_latency_control
...
Conflicts:
cmake_targets/phy_simulators
openair1/PHY/CODING/crc_byte.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/RRC/NR/rrc_gNB.c
2022-02-13 09:55:01 +01:00
Raymond Knopp
74fd3f029a
changes for AW2S NR support in ORI library
2022-02-13 09:44:15 +01:00