Michael Cook
39fbe322aa
Fix #include
2021-03-14 10:59:05 -04:00
Michael Cook
092caec8ca
Merge branch 'episys-merge' into episys/trial-merge-to-master
2021-03-14 10:58:46 -04:00
Melissa Elkadi
e50de8be02
Demoting logs and removing duplicate #define
...
Commented out an abort(); used for debugging.
An incoming merge request will properly handle
the issue of multiple CQIs.
2021-03-06 12:22:52 -08:00
Melissa Elkadi
9fe1167f29
Remove cppcheck-suppressions that were prev added
...
These cppcheck errors are occuring in code
that is untouched by this merge request.
2021-03-02 13:10:09 -08:00
Melissa Elkadi
15905c746d
Fixing cppcheck issues
2021-03-01 15:13:50 -08:00
Melissa Elkadi
8b2b78e477
Fixed remote_addr.sin_port
...
For some reason the htons invocation got deleted which broke
the VNF P7 interface.
Also fixed some build issues, not sure how these got onto the
develop branch to begin with.
2021-02-26 15:57:35 -08:00
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
Melissa Elkadi
4dcb32c180
Removed unused memcpy functions and references
2021-02-24 09:12:00 -08: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
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
Mahesh
b681d67d7f
Cleanup
2021-02-12 16:36:58 +05:30
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
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
Mahesh
ae422aca1f
Merge conficts resolved
2021-02-02 09:36:49 +05:30
Sakthivel Velumani
c9dcff3d7e
Merge branch 'develop' into ue-fixes
2021-02-01 16:07:58 +01:00
hardy
5db5657df7
Merge remote-tracking branch 'origin/lte_uplink_improvement' into integration_2021_wk04_b
2021-01-29 07:41:47 +01:00
Sakthivel Velumani
f6a502ada2
fixes
...
some more fixes that are missed out in previous commits
2021-01-25 11:03:37 +01:00
Mahesh
35692639d7
Code cleanup
2021-01-19 10:45:19 +05:30
Mahesh
b1a760a61d
Addressed some minor issues
2021-01-18 15:42:53 +05:30
Mahesh
868e40e19b
Resolved errors due to merge
2021-01-15 19:30:41 +05:30
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
Michael Cook
ee86a66722
Merge commit '0b40edef2adc45965dcfe2071b0c4170389ae8b5' into episys/master
2021-01-12 18:11:10 -05:00
Melissa Elkadi
42ae8207ee
NFAPI_MODE logic to include standalone mode
...
Every if statement that includes a check for
the NFAPI_MODE that did not check for the new
PNF_STANDALONE_MODE now has been updated. Also
changed the tx_req and dl_config_req logs
when they are received at the OAI UE to be
info logs instead of error logs.
2021-01-12 06:54:16 -08: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
He Shanyun
8c9753ca3c
fix issue about error locking mutex_rxtx of L2 sim
2020-12-11 16:28:03 +09:00
Mahesh
7eb016675d
Resolved errors in building phy-simulator
2020-12-08 12:28:16 +05:30
masayuki.harada
0555b108db
Merge remote-tracking branch 'remotes/oai/develop' into lte_uplink_improvement
2020-12-07 21:17:59 +09:00
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
masayuki.harada
cb927c7f9a
Add statistics logs.
...
(cherry picked from commit cf8f14edf4a261e1df72579423786d39ba6d97f9)
2020-11-27 17:06:11 +09: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
Melissa
4fe4f6cd60
dl_config_Req and tx_reqs are queued together
...
Additionally, combined many of the individual
dl_config_req and tx_req handle functions.
Also removed some unused functions we added.
Futhermore, removed our additions to the
dl_config_req and tx_req memcpy functions.
2020-11-20 16:04:14 -08:00
Mahesh
87105d77cf
Merged latest develop to nfapi
2020-11-19 22:33:39 +05:30
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
hardy
e9fff748c6
Merge remote-tracking branch 'origin/NR_UE_MAC_scheduler' into integration_2020_wk46
2020-11-10 17:23:36 +01:00
Parminder Singh
443f1817e5
Merge remote-tracking branch 'origin/develop' into fhg_shp_phase_noise_est
2020-11-08 18:47:29 +01:00