rmagueta
cf70265ba6
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2021-02-25 13:03:06 +00:00
francescomani
9afb19858a
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-25 12:04:24 +01:00
Raymond Knopp
6b5a47081f
filling in some missing information in F1-Setup-Request
2021-02-25 11:54:38 +01:00
Xue Song
b6febe214f
add GTPV1U_GNB_TUNNEL_DATA_REQ and UDP_DATA_IND
...
if the UE is running with noS1, u-plane for rfsim with Free5GC + CU/DU is OK
2021-02-25 14:00:14 +09:00
Raymond Knopp
32b74d2f38
nr-softmodem compilation after merge with develop
2021-02-25 01:00:34 +01:00
Raymond Knopp
4d9ebf0ac0
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-softmodem.c
executables/nr-uesoftmodem.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-24 23:00:04 +01:00
Raymond Knopp
11c3a26414
Merge remote-tracking branch 'origin/develop' into oairu
...
Conflicts:
openair2/RRC/LTE/rrc_eNB.c
2021-02-24 21:52:14 +01:00
rmagueta
d1ba40cc56
Fix RA-Msg2 to Initial BWP
2021-02-24 19:34:53 +00:00
rmagueta
2060cf45bb
Fix RA-Msg4 to Initial BWP
2021-02-24 18:49:00 +00:00
rmagueta
aacf75b298
Transmission and reception of a fake RA-Msg4
2021-02-24 02:54:53 +00:00
rmagueta
48811d0f34
Merge branch 'develop' into develop-SA-CBRA
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:29:53 +00:00
rmagueta
910154c7af
Merge branch 'develop' into develop-SA-RA
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:04:01 +00:00
Raymond Knopp
a6e16e7c8a
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-23 11:51:29 +01:00
hardy
88ce69608c
Merge remote-tracking branch 'origin/NR_MAC_Multi_Rach_GlobalEdge' into integration_2021_wk08
2021-02-23 10:29:50 +01:00
hardy
30bede544c
Merge remote-tracking branch 'origin/nr-bsr-fix' into integration_2021_wk08
2021-02-23 09:31:22 +01:00
hardy
accae67113
Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08
2021-02-23 09:31:05 +01:00
hardy
3199b81584
Merge remote-tracking branch 'origin/enhance-rfsim' into integration_2021_wk08
2021-02-23 09:30:42 +01:00
hardy
90d6a57a3c
Merge remote-tracking branch 'origin/NR_UL_SCFDMA_100MHz' into integration_2021_wk08
2021-02-23 09:30:22 +01:00
rmagueta
31cf9ab847
Fix ra->rnti
2021-02-23 02:22:27 +00:00
rmagueta
495ba8920d
Merge branch 'develop-SA-RA' into develop-SA-CBRA
2021-02-22 16:35:06 +00:00
rmagueta
bed43a2a79
Address review comments
2021-02-22 16:31:13 +00:00
francescomani
465529ce45
adapting scheduling csirs for multi UE (to be verified)
2021-02-22 17:04:40 +01:00
rmagueta
4ea560f291
Address review comments
2021-02-22 16:01:05 +00:00
francescomani
ba02f61f28
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-02-22 16:30:49 +01:00
rmagueta
a613617737
Fix preamble shift at gNB for RA works with all preambles
2021-02-21 04:05:29 +00:00
Robert Schmidt
305902da42
Correctly allocate memory for NR measurement array
2021-02-20 15:43:02 +01:00
Raymond Knopp
f8e6e1fd85
bugfix in PHR, addition of configuration parameters for MAC scheduler
2021-02-19 21:57:54 +01:00
luis_pereira87
22fa28e7fe
Merge remote-tracking branch 'origin/enhance-rfsim' into develop-SA-CBRA
2021-02-19 16:18:22 +00:00
Florian Kaltenberger
a51e3defa8
when PRACH config 4 is used (Benetel RRU) we only schedule UL slots 8 and 9
2021-02-19 11:15:59 +01:00
Florian Kaltenberger
670c807a56
Merge remote-tracking branch 'origin/develop' into benetel_driver_update
2021-02-19 11:46:41 +01:00
guhan
e893ee8a16
Fixed the issue w.r.t looping of configured preamble list
2021-02-19 11:47:55 +05:30
Francesco Mani
80cac226fc
fixed a warning in gNB_scheduler_ulsch.c
2021-02-18 08:50:45 +01:00
rmagueta
edccb98691
First draft implementation of CBRA
2021-02-17 20:16:03 +00:00
Robert Schmidt
a3b1216b23
Fixup sched_ul_bytes logic
...
1) Only count new transmission as scheduled bytes (which is then
compared against the BSR)
2) When subtracting scheduled bytes after successful reception, subtract
TBsize from correct HARQ process
2021-02-17 10:17:59 +01:00
cig
c89d349300
Bugfix in nr_ue_prach_scheduler
...
- scheduled_response was called regardless of the UL config in the PRACH slot
this was leading to wrong behaviour since it was interfering with the
UL config of PUSCH
2021-02-16 15:25:48 +01:00
Xue Song
bd765c7505
C-plane for rfsim with Free5GC + CU/DU separation is OK
2021-02-16 14:14:55 +09:00
Xue Song
5918c03cd4
add nrue nas task
2021-02-16 14:14:46 +09:00
francescomani
eef684d91a
adding 24 PRB to X2AP function
2021-02-15 16:25:30 +01:00
Cedric Roux
21ff70e84f
hack: put back a hack that seems necessary for NR rfsim tests in the CI
...
go figure...
2021-02-15 15:25:52 +01:00
Cedric Roux
73f3a458cf
NSA: finalize nea2 security for gNB
...
- a new section in the configuration file to select security algorithms,
with new code to deal with it
- cleanup CG-ConfigInfo: specs seem to indicate that we must not
add mcg_RB_Config; the gNB has to deal with that
- as a consequence, modify fill_default_rbconfig() that is called in
every cases and needs security and bearer parameters
The new section in the configuration file looks like:
security = {
# preferred ciphering algorithms
# the first one of the list that an UE supports in chosen
# valid values: nea0, nea1, nea2, nea3
ciphering_algorithms = ( "nea0", "nea2" );
# preferred integrity algorithms
# the first one of the list that an UE supports in chosen
# valid values: nia0, nia1, nia2, nia3
integrity_algorithms = ( "nia0" );
};
2021-02-15 15:25:52 +01:00
Cedric Roux
cb589c211c
minor trivial bugfix
2021-02-15 15:25:52 +01:00
Cedric Roux
10e021e96d
NSA: first draft of nea2 security for gNB
...
The code is forced to use nea2, no matter what the UE supports.
After 2^18 PDCP packets, it will fail to work (we don't use HFN yet).
These limitations will be fixed in later commits.
The existing security function was not reused, because it does too
much memory allocation and initializes the security context at each
ciphering. So here comes nr_pdcp_security_nea2_cipher(). And also
the ciphering is done inplace. To be changed if necessary.
2021-02-15 15:25:47 +01:00
Laurent Thomas
abfa103247
fix re-reading and end marker code
2021-02-15 10:54:35 +01:00
Raymond Knopp
d77f9ad096
build oairu ok
2021-02-15 08:13:15 +01:00
Raymond Knopp
a135f261b2
adjust includes for oairu target. Now test X-Ysoftmodem on another machine
2021-02-14 17:59:28 +01:00
Raymond Knopp
7b4c1eae33
Merge branch 'oairu' of https://gitlab.eurecom.fr/oai/openairinterface5g into oairu
2021-02-14 14:06:18 +01:00
Raymond Knopp
b67a3502b8
commit before merge
2021-02-14 14:06:05 +01:00
Raymond Knopp
5b865df202
fixed for oairu target after merge with develop
2021-02-14 14:05:16 +01:00
Raymond Knopp
5ed79a27de
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-14 07:18:13 +01:00
rmagueta
e7fb928758
Fix dlsch_config_pdu for DCI with format 1.1
2021-02-12 21:40:04 +00:00