Melissa Elkadi
98c8ddb673
Merge remote-tracking branch 'origin/develop' into episys-merge
...
Removing references to memcpy_dl_config_req and
memcpy_tx_req because these functions are leaking
memory. For our standalone mode we have created
new/modified memcpy_dl/tx_req functions.
2021-02-24 11:49:17 -08: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
Raymond Knopp
5b865df202
fixed for oairu target after merge with develop
2021-02-14 14:05:16 +01:00
Raymond Knopp
a446eb0ebc
Merge branch 'episys/master' into episys-merge
...
Conflicts:
common/utils/LOG/log.h
common/utils/ocp_itti/intertask_interface.cpp
nfapi/oai_integration/nfapi_vnf.c
nfapi/open-nFAPI/nfapi/src/nfapi.c
openair2/LAYER2/MAC/main_ue.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair3/NAS/UE/ESM/esm_ebr_context.c
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2021-02-13 22:52:33 +01:00
Melissa
3a5912a00a
Updated non-blocking PDCP socket
...
More accurately, we changed the do/while infinite
loop to be an infinite for loop for the read command of
the socket. The socket file descriptor choice is more clear now.
2021-02-12 08:59:00 -08:00
kn.raju
eaadda1f5d
Update FAPI nfapi_nr_tx_precoding_and_beamforming_t
2021-02-12 08:31:01 +01:00
Mahesh
eb19e02cf3
Merging MR978 with develop
2021-02-11 22:50:25 +05:30
francescomani
cb296fa050
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-11 18:15:12 +01:00
Melissa
9fa09f530f
Updated non-blocking PDCP socket
...
More accurately, we changed the do/while infinite
loop to be an infinite for loop for the read command of
the socket. The socket file descriptor choice is more clear now.
2021-02-09 14:09:39 -08:00
hardy
665688681b
Merge remote-tracking branch 'origin/ue-fixes' into integration_2021_wk06_b
2021-02-09 10:54:58 +01:00
Robert Schmidt
0d90ecfd62
Make dci_pdu in PDCCH PDU an array
...
SCF222 says that dci_pdu in PDCCH PDU
(nfapi_nr_dl_tti_pdcch_pdu_rel15_t) should be an array, and not its
members.
2021-02-07 10:39:39 +01:00
Sakthivel Velumani
f6a502ada2
fixes
...
some more fixes that are missed out in previous commits
2021-01-25 11:03:37 +01:00
Sakthivel Velumani
b8795d3824
Merge branch 'develop' into NR_FAPI_beamindex_SSB_RO
...
Fixed merge conflicts.
2021-01-19 20:58:10 +01:00
Sakthivel Velumani
af4242b508
UE writes to USRP only on tx slots
...
Removed the hardcoding of fixed tdd and replaced with tdd config from mac configuration
2021-01-19 16:20:50 +01:00
Mahesh
185fcbf7fe
Merged latest commit(MR957)
2021-01-15 18:53:02 +05:30
Mahesh
d7ccdbe6b0
Resolved build warnings(25+) and 5G nFAPI downlink errors(future_ul_tti_request)
2021-01-14 12:28:45 +05:30
francescomani
dcc1a46286
pdusize type to accomodate new beamforming and precoding structures
2021-01-13 11:03:55 +01:00
Melissa Elkadi
a288e502f0
Cleanup before merge
...
The clean up includes removing white space changes, adding logs,
adding comments to make various changes more obvious, etc.
2021-01-08 14:31:13 -08:00
Mahesh
402c05eb6b
nr_ulsim and nr_dlsim working
2020-12-21 23:18:27 +05:30
Mahesh
79e792443f
L2 nfapi test(noS1) working
2020-12-16 16:17:32 +05:30
Francesco Mani
f87c979465
new mac array for tdd-beam association in FR2
2020-12-11 17:48:33 +01:00
Florian Kaltenberger
373cd5fc1d
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2020-12-10 14:50:23 +01:00
Mahesh
7eb016675d
Resolved errors in building phy-simulator
2020-12-08 12:28:16 +05:30
Mahesh
e174ebdc30
Resolved merge conflicts with nfapi_nr_develop
2020-12-02 16:28:18 +05:30
Mahesh
190fe54306
Warnings in gNB build resolved
2020-11-30 18:21:19 +05:30
rmagueta
a3b633d26c
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
...
Conflicts:
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2020-11-27 17:37:15 +00:00
hardy
2855970763
Merge remote-tracking branch 'origin/NR_UE_stability_fixes' into integration_2020_wk48_2
2020-11-25 12:25:45 +01:00
Thomas Schlichter
6803e78ceb
Merge remote-tracking branch 'develop'
...
Conflicts:
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair2/RRC/NR/nr_rrc_proto.h
2020-11-24 16:58:58 +01:00
Mahesh
56db8f4915
RESOLVED build errors
2020-11-24 18:49:41 +05:30
Shweta Shrivastava
a6e15d4436
Fix TransformPrecoding values to be consistent with FAPI spec
2020-11-24 00:59:08 -06:00
Mahesh
87105d77cf
Merged latest develop to nfapi
2020-11-19 22:33:39 +05:30
Florian Kaltenberger
53d5189073
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2020-11-19 16:26:42 +01:00
rmagueta
749d6af42e
Merge develop-sib1 into this branch
2020-11-19 02:22:47 +00:00
Mahesh
41438a1968
PDSCH decoded at UE
2020-11-18 16:13:42 +05:30
Parminder Singh
6c2fbb361d
Merge remote-tracking branch 'origin/develop' into fhg_shp_phase_noise_est
2020-11-16 09:47:46 +01:00
Mahesh
e6bf90e2dd
LTE and NR NFAPI integration
2020-11-11 15:10:32 +05:30
Florian Kaltenberger
174372ede0
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2020-11-10 21:46:52 +01:00
hardy
e9fff748c6
Merge remote-tracking branch 'origin/NR_UE_MAC_scheduler' into integration_2020_wk46
2020-11-10 17:23:36 +01:00
Mahesh
643fc632d6
PBCH working
2020-11-06 19:48:34 +05:30
Parminder Singh
0ce350d1cf
Merge remote-tracking branch 'origin/develop' into fhg-shp-dl-ptrs
2020-11-04 16:20:50 +01:00
Shweta Shrivastava
c0d123b9f7
Support for multiple PDUs in a UL slot
2020-10-28 20:54:18 -05:00
Mario Hudon
bddd86b77a
Merge remote-tracking branch 'oai-eurecom/develop' into NR_MAC_SSB_RO_UE_IDCC
2020-10-28 08:23:29 -04:00
Parminder Singh
3651107f81
Added PTRS parameters in UE nFAPI interface
...
- PTRSPortIndex, PTRSTimeDensity, PTRSFreqDensity, PTRSReOffset, nEpreRatioOfPDSCHToPTRS
- mcs_table : to calculate MCS table in MAC layer and pass tp PHY
- pduBitmap : same as used in DL FAPI interface, to enable or disable PTRS processing
2020-10-26 10:06:33 +01:00
Francesco Mani
76abeaf30e
Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting
2020-10-22 09:26:51 +02:00
Mario Hudon
b61b591e42
Merge remote-tracking branch 'oai-eurecom/develop' into NR_MAC_SSB_RO_UE_IDCC
2020-10-21 18:51:03 -04:00
Florian Kaltenberger
60062cecfb
adding beamforming support to FAPI: MAC fills ssb_beam_id_list in ssb config. PHY uses this info to fill new beam_id field. This is further copied to RU and applied there. Nothing is tested so far.
2020-10-19 13:36:00 +02:00
hardy
03e5b461a3
Merge remote-tracking branch 'origin/NR_MAC_SSB_RO_GlobalEdge' into integration_2020_wk42
...
Solved Conflicts in:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.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
2020-10-19 11:18:30 +02:00
Florian Kaltenberger
d4c1e25079
fixing beamforming in FAPI. Adding beam_id to FAPI in SSB and msg2 scheduling.
2020-10-18 21:22:33 +02:00
Florian Kaltenberger
18ae5acc98
Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge
2020-10-13 21:47:21 +02:00