hardy
a362493cce
Merge remote-tracking branch 'origin/NR_cleanup_PUCCH_resources' into integration_2021_wk20_a
2021-05-16 21:24:38 +02:00
Michael Cook
9ac06d4b3a
Fix warning about log message argument type
2021-05-16 05:44:25 -07:00
Melissa Elkadi
dc2865f3ba
Added logs and updated eNB conf file for EPC if necessary
2021-05-13 15:13:59 -07:00
Melissa Elkadi
bfa5d486e3
Added comments to show MRDC and free() hacks
2021-05-13 13:45:47 -07:00
Melissa Elkadi
bc5677f4c4
Triggering works, not using OAI mechanism
...
gNB is crashing when setting up the tunnel interface
between the NR UE and itself.
2021-05-13 09:30:30 -07:00
Raymond Knopp
4c3b718825
commit before merge
2021-05-13 09:11:34 +02:00
Melissa Elkadi
63ca5f692d
Hack to not free measObjs
...
Also, 12 Frame triggering of MeasurementReport
is still in development and not working.
2021-05-12 16:10:14 -07:00
rmagueta
0ef6ef2b28
Code format improvements in differences for develop
2021-05-12 19:29:10 +01:00
Melissa Elkadi
e455ae22c8
Added MRDC capabilites in a hacky way
2021-05-11 17:03:35 -07:00
Melissa Elkadi
31e51f3663
Processing NR_UE_Capability_info and sending
2021-05-11 15:40:43 -07:00
matzakos
64cb9407ba
Add support for Initial context setup request carrying PDU Session resource setup list
...
-Apply patch from Fujitsu
-Trigger dedicated RRC Reconfiguration with DRB and SRB2 configuration once the PDU session is established
-Validation of control plane sequence with OAI CN and Nokia SA Box
2021-05-11 22:19:55 +02:00
rmagueta
5919b891bb
Fix new cppcheck errors/warnings
2021-05-11 15:00:39 +01:00
Melissa Elkadi
a7cbe98fa7
mbms_create_tasks was calling SCTP task again.
...
This caused the SCTP descriptor to be reset. This
made issues in the X2 interface between gNB and eNB.
Lots of logs added here. Need to fill NR_UE_Capability_Info
properly.
2021-05-10 17:01:12 -07:00
Melissa Elkadi
9009124223
Handling UE_capability_enquiry at NR UE
...
Now, we are able to fill the UE_Capability_Info that
the LTE UE and eNB are expecting. We then are able to
generate a RRC_DCCH_DATA_COPY_IND to trigger the
processing of the UE_Capability_Info (and sending the
info to the eNB). The info being received at eNB has not
been tested yet.
Also some code clean up.
2021-05-10 11:06:45 -07:00
Laurent THOMAS
2508a020ec
fix random crash (uninitialized memory)
2021-05-10 11:31:54 +01:00
Laurent THOMAS
98e3afe7db
fix random crash (uninitialized memory)
2021-05-10 11:52:43 +02:00
Raymond Knopp
83ccc50f18
Merge remote-tracking branch 'origin/develop' into oairu
2021-05-10 00:39:55 +02:00
Raymond Knopp
e2b68a99a9
CU/DU support for most recent changes. UE continues as far as in monolithic mode. Still to apply masterCellGroupConfig in DU from RRCReconfiguration. This has to be detected in DU and applied after decoding the RRC message intended for UE.
2021-05-09 12:44:55 +02:00
Melissa Elkadi
5f2d246a8c
Added comments and cleaned up the code.
...
The encode is still working but now we need to
add in some new functionality to handle NR Capabilites.
2021-05-08 14:52:08 -07:00
Melissa Elkadi
56f2203b1d
WIP: Encoding is succeeding. Hacked phy_id.
2021-05-08 09:30:55 -07:00
Melissa Elkadi
997c2e07ad
Added rsrp/q back into report. ASN debug on.
2021-05-07 15:19:55 -07:00
Melissa Elkadi
1f3b397043
do_nrMeasReport updated for elements eNB expects
...
Also updated the generate_nrMeasReport().
The uper_encode_to_buffer is still not working.
2021-05-06 16:54:01 -07:00
Melissa Elkadi
c4d7e11c1c
Working on do_nrMeasurementReport
2021-05-05 16:42:22 -07:00
Melissa Elkadi
cee317b73f
Removed reportConfig dump funciton
...
Also removed the [eNB_index + 1] saving/writing
in the process_MeasObj function. This indexing
was incorrect. Also cleaned up the code, fixed
ssRSRB -> ssbRSRP. Lastly, added assertFatals
around indexing in process_measObj function.
2021-05-05 10:07:37 -07:00
Melissa Elkadi
842774254b
ReportConfig was being indexed out of bounds
...
Added check and logs. If we change ind = 1 it
crashes the LTE UE so we log for now. Also cleaned
up a lot of the code. Lastly, we set freed vars to NULL.
2021-05-04 16:20:37 -07:00
rmagueta
5916450327
Fix SRB2 warning for NSA
2021-05-04 18:45:05 +01:00
rmagueta
33ba50fd66
Fix SRB2 warning for SA
2021-05-04 16:19:42 +01:00
francescomani
638f1b8203
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-05-04 14:11:29 +02:00
rmagueta
102a76fd56
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
# openair2/GNB_APP/MACRLC_nr_paramdef.h
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/NR_PHY_INTERFACE/NR_IF_Module.c
2021-05-04 11:23:21 +01:00
francescomani
13acbd1d82
Merge remote-tracking branch 'origin/develop' into NR_cleanup_PUCCH_resources
2021-05-04 12:00:19 +02:00
francescomani
64e42cacf2
implementation of handling csi and harq in the same pucch2
2021-05-04 11:47:48 +02:00
Melissa Elkadi
7e339b4610
Currently receiving measurement data from NR UE
...
This commit has several other changes. The changes
include the following:
1. Changed the port numbers for the NRUE<->Proxy
2. Fixed the send to function in the NR UE
(Previously only sending buffer not buffer+msg_type)
3. Updated pack/unpack of the SSB PDU (new RSRB field added)
4. Fixed several NR logs
5. Opening socket with NRUE<->Proxy AFTER receving RRC
measurement request from the LTE UE
2021-05-03 15:31:32 -07:00
rmagueta
48305fd14d
Fix warning after merge
2021-05-03 19:13:32 +01:00
rmagueta
4b5cef595a
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2021-05-03 18:44:54 +01:00
francescomani
ad10ef0dfe
to remove unused PUCCH resources and extend PUSCH tda allocation to 13 symbols
2021-05-03 17:59:08 +02:00
francescomani
d6c70f85d2
sib1 tda from config file
2021-05-03 14:30:58 +02:00
Laurent THOMAS
6882ea7a7b
functional new gtpu, to be tested
2021-05-02 16:06:45 +02:00
Raymond Knopp
85aab6e826
changes in gtpu interface for testing, small changes in L1 for PUSCH signal/noise measurements. SRB2 interfaces.
2021-05-02 09:50:40 +02:00
Melissa Elkadi
34eeae0874
NR SA thread and sockets have been added.
...
This commit also removed MAX_NUM_NEIGH_CELLs and
replaced it with MAX_GNB_CELLS. This was a minor change
OAI added. The standalone sockets for the NR UE correctly
connect to the proxy. We are currently receiving dl_tti
messages from the proxy.
2021-05-01 15:05:04 -07:00
Melissa Elkadi
6cace48013
Added in init function in RRC_NSA_NRUE task creation
2021-05-01 12:47:16 -07:00
Melissa Elkadi
539b1b564a
Removed commented code in nr-softmodem.c
...
Also enabled X2 when we are not using the EPC
Added in the case statement for handling the
dl_dcch_msg from the NR UE. Also added in the
proper decoding of that dl_dcch_msg and freeing
2021-05-01 11:48:21 -07:00
Melissa Elkadi
e50ca02957
Chaging NR functions to be properly named
...
This commit removed all the linking errors
between the NR UE and the LTE UE. This was done by
changing:
- rrc_data_req_ue
+ rrc_data_req_nr_ue
2021-05-01 11:32:26 -07:00
rmagueta
ed0fedc1b6
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-05-01 18:42:28 +01:00
rmagueta
e924caa677
Fix phy-simulators
2021-05-01 18:39:30 +01:00
Raymond Knopp
ab0e14ce8d
logging for debugging DRB/SRB2 establishment at gNodeB
2021-05-01 09:55:00 +02:00
Melissa Elkadi
e1a77b2d82
Add NSA mode to working dl_tti messages from gNB
...
This commit is not currently building, but I wanted
to be able to save the changes that I have added.
2021-04-30 13:36:18 -07:00
Raymond Knopp
fd2ea253be
masterCellGroup in RRCReconfiguration
2021-04-30 22:30:46 +02:00
rmagueta
655c5481e3
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# executables/nr-uesoftmodem.h
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# openair2/RRC/NR_UE/L2_interface_ue.c
2021-04-30 18:00:27 +01:00
Laurent THOMAS
04b28b4518
fixes from testing
2021-04-30 16:47:40 +02:00
rmagueta
fece683445
Fix issues after merge
2021-04-30 12:14:37 +01:00