maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,607 Commits 5 Branches 0 Tags
3aec9a43eadc0aa76f2d52c22b0cc388e2f36e1c
Commit Graph
3464 Commits
Author SHA1 Message Date
matzakos 906fd2b68f Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS 2021-03-09 15:24:11 +01:00
yoshio.inoue 81c92d226f Define variables according to coding conventions. 2021-03-09 18:14:39 +09:00
Wang He 264af1860f fix build error and core dump error. 2021-03-09 15:43:18 +09:00
masayuki.harada c9906d1a70 Merge remote-tracking branch 'remotes/oai/NR_SA_F1AP_RFSIMULATOR3' into NR_SA_F1AP_RFSIMULATOR3_Lo 
# Conflicts:
#	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
 2021-03-08 13:43:39 +09:00
Xue Song 834d6f1055 Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo 
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_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/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
 2021-03-05 19:07:43 +09:00
wf d6763661be du-cu tested ok 2021-03-04 19:30:49 +08:00
wf 44d40219f2 modify fro comments, no warning now 2021-03-04 16:42:20 +08:00
matzakos 4d685a0036 Proper separation of handling DCCH SRB1 and DTCH LCIDs at MAC gNB 
-Remove redundant calls to mac_rlc_data_ind for DTCH case
 2021-03-02 20:15:46 +01:00
hardy 8d05695722 Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b 2021-02-26 16:09:05 +01:00
matzakos 20805c1314 Remove confusing mixed SRB/DRB functions for SRB addition in RLC 
- SRB addition is now done through add_srb, add_srb_am functions
 2021-02-26 13:01:17 +01:00
matzakos e186134061 Preliminary work for separation of SRB from DRB handling in RLC 
-For the moment SRBs are preconfigured (as was done for DRBs in noS1 mode)
but this should be removed
 2021-02-26 12:11:01 +01: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
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
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
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
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 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
Robert Schmidt ef90d77b0e Reformat nr_initiate_ra_proc() [no other changes] 2021-02-12 20:53:36 +01:00
guhan 0d5f1dfea0 Fixed the index issue 2021-02-12 19:49:42 +05:30
Mahesh f69af6abaf merge MR978 (5G nFAPI) into develop 2021-02-12 16:26:22 +05:30
kn.raju 37d112f511 Check that resources are free for Msg2/RAR 2021-02-12 08:31:35 +01:00
kn.raju 13e719d74a fixes nr_initiate_ra_proc() 2021-02-12 08:31:30 +01:00
kn.raju bf81ea19d3 Check cfra in nr_initiate_ra_proc() 2021-02-12 08:31:28 +01:00
kn.raju 66ffa08a3d Handle individual RAs in nr_generate_Msg2() and nr_add_msg3() 
* add the RA process to handle to command parameters
* Do not create the RAR_pdu into an intermediate array, but directly
  into the nFAPI TX_req
* Slightly restructure nr_generate_Msg2() to first make AssertFatal()
  checks, then proceed allocating
 2021-02-12 08:31:26 +01:00
kn.raju 25a520e4fa find_SSB_and_RO_available() 2021-02-12 08:31:23 +01:00
kn.raju 68b4a6bf28 Fixing association period 2021-02-12 08:31:17 +01:00
kn.raju 054934c4f8 Do nr_schedule_RA() for all RA processes 2021-02-12 08:31:13 +01:00
kn.raju baba8d69be nr_initiate_ra_proc(): check in all RA processes, check beam_index 2021-02-12 08:31:11 +01:00
kn.raju 4dacea921c New UE: check for free RA and copy preamble list 2021-02-12 08:31:07 +01:00
Mahesh 7f4ffe29c8 Fix whitespaces 2021-02-12 01:25:09 +05:30
Mahesh eb19e02cf3 Merging MR978 with develop 2021-02-11 22:50:25 +05:30
Xue Song e1a92eadba Merge branch 'master' into develop_SA_rfsim_for_F1 
Conflicts:
	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/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-10 15:56:50 +09:00
He Shanyun 01999cfcc7 fix build error of enb and ittisim 2021-02-10 01:07:02 +00:00
Robert Schmidt 54a2d698db Fix build: test for slot from within preprocessor 2021-02-09 16:46:44 +01:00
Florian Kaltenberger 04a4a6f451 Merge remote-tracking branch 'origin/develop' into benetel_driver_update 2021-02-09 11:13:01 +01:00
yincong c416e545e2 fix problems about rfsim noS1 2021-02-09 19:01:34 +09:00
hardy 665688681b Merge remote-tracking branch 'origin/ue-fixes' into integration_2021_wk06_b 2021-02-09 10:54:58 +01:00
Sakthivel Velumani 8902902706 Merge branch 'develop' into ue-fixes 2021-02-08 15:06:17 +01:00
Mahesh 0e6f1e6ad6 Merge conflicts resolved 2021-02-08 18:05:29 +05:30
Sakthivel Velumani 3380f1a455 send data from MAC to PHY when NDI toggles 2021-02-08 12:49:32 +01:00
Robert Schmidt b86fdaf59b Revert "Lower UE log level" 
This reverts commit 71e297de9d.
 2021-02-08 11:20:23 +01:00
Robert Schmidt 9b77575af2 Use the MAX_BWP_SIZE macro everywhere 2021-02-07 10:45:57 +01:00
Robert Schmidt 318c4e0fd7 Skip DL HARQ feedbacks if the timing does not match 
As the precedent commit, this commit deals with the realtime problems
that we currently have on the CI bench.

For DL HARQ feedback, nFAPI does not give us the HARQ process ID.
Instead, we have to figure this out "from timing", i.e., if we trigger
PUCCH reception, we will get a message with HARQ if we instructed the
PHY to do so. If we have real-time problems, it seems (I cannot verify:
don't have real time problems) that we do not get the nFAPI message with
HARQ feedback. Thus, we need to skip the HARQ processes that should have
been processed in the past, which happens in this commit.
 2021-02-07 10:45:57 +01:00
Robert Schmidt f23890e0b9 Search correct UL HARQ, don't assert on late slot 
At the time of this commit, the CI has realtime issues. This can mean
that the HARQ result is delivered in a delayed fashion. Before this
commit, we were asserting on whether the slot corresponds to the HARQ
process's expected feedback slot, but a particular feedback might be
delayed under realtime issues, and we actually don't care about the
timing since we get the HARQ process ID.

Instead, we loop through the HARQ processes for which we wait for a
feedback in the beginning until we have the right process (which did not
seem to cause a problem till now, but who knows.
 2021-02-07 10:45:57 +01:00