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
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
Laurent Thomas
abea2ef926
protect nrscope when thread starts before end of init
2021-02-18 22:36:45 +01:00
Mahesh
7ea8211b85
Code fixes for NSA test
2021-02-18 16:19:12 +05:30
Cedric Roux
3cfa2c266b
hack: fix NR prachsim compilation
...
Dirty!
2021-02-15 15:25:52 +01:00
Cedric Roux
778e487323
hack: fix NR ulsim compilation
...
Dirty.
2021-02-15 15:25:52 +01:00
Cedric Roux
67b9cd1892
hack: fix NR dlsim compilation
...
Dirty...
2021-02-15 15:25:52 +01:00
Mahesh
f69af6abaf
merge MR978 (5G nFAPI) into develop
2021-02-12 16:26:22 +05:30
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
dir
3efdb2775e
NR SCFDMA changes for higher RB sizes (RB Sizes until 100Mhz)
2021-02-09 11:07:53 +01: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
Robert Schmidt
8bd3ec7602
Fix whitespace issues (review request)
2021-02-07 10:45:57 +01:00
Robert Schmidt
71fd526e12
Remove unused variables
2021-02-07 10:45:57 +01:00
Robert Schmidt
77203ee989
Fix nr_dlschsim unitary simulator
2021-02-07 10:45:57 +01:00
Raymond Knopp
0496c15d27
Remove PHY HARQ round_trials logs
2021-02-07 10:39:40 +01:00
Robert Schmidt
4ddd45f813
Implement DL HARQ using NR_list_t
2021-02-07 10:39:39 +01:00
Raymond Knopp
a3867df5f3
cleanup after removing harq state in L0
2021-02-07 10:39:39 +01:00
Raymond Knopp
ee2ce7670d
made L1 DLSCH encoding stateless. harq_pid/round information are not kept in PHY. Full channel encoding is performed for each transmission of a transport block.
...
Still to be done: test, then cleanup data structures and fix unitary simulations.
2021-02-07 10:39:39 +01:00
Robert Schmidt
338d8debae
Bugfix OAI UE: reset slot_for_feedback_ack to initial value
2021-02-07 10:39:39 +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
Robert Schmidt
7879e6ad32
Remove (unnecessary) num_slots_per_tdd in DLSCH sched
2021-02-07 10:39:39 +01:00
Robert Schmidt
171f7842bc
Rewrite PUCCH allocation (simplified, restricted)
...
- No dynamic allocation of PUCCH structures
- Use first PUCCH for HARQ (can only allocate for up to two slots in
single PUCCH, simplistic nr_acknack_scheduling!)
- Use second PUCCH for CSI, do not multiplex!
2021-02-06 20:50:28 +01:00
Francesco Mani
868f55513f
rnti in pucch 0 indication
2021-02-06 20:50:28 +01:00
hardy
663dd1251c
Merge remote-tracking branch 'origin/NR_RA_cleanup' into integration_2021_wk05
2021-02-05 12:00:38 +01:00
hardy
5d832308c6
Merge remote-tracking branch 'origin/NR_SA_itti_sim_wk48' into integration_2021_wk05
2021-02-05 11:43:54 +01:00
Xue Song
52edf0c123
Merge branch 'master' into develop_SA_rfsim_for_F1
...
Conflicts:
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair2/F1AP/f1ap_cu_interface_management.c
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
openair2/F1AP/f1ap_cu_task.c
openair2/F1AP/f1ap_du_interface_management.c
openair2/F1AP/f1ap_du_task.c
openair2/GNB_APP/gnb_app.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
openair2/RRC/NR/L2_nr_interface.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/L2_interface_ue.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
2021-02-04 18:16:37 +09:00
Xue Song
6a3b7b40a5
Merge branch 'master' into develop_SA_L3
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
2021-02-03 14:58:07 +09:00
hardy
c00b44028b
Merge remote-tracking branch 'origin/develop-sib1-update' into integration_2021_wk05
2021-02-02 15:40:22 +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
Thomas Schlichter
bca9f74e66
Merge remote-tracking branch 'develop' into NR_RA_cleanup
2021-01-29 18:52:37 +01:00
Sakthivel Velumani
0eb2e06725
Moved pusch thread parameter to L1 in config file
2021-01-29 13:14:14 +01:00
cig
5a9014e960
Review of MR 1025
...
- bugfix in nr_ue_dci_configuration
- cleanup of irrelevant RA-related data structure members in UE
- moved msg1 init condition to MAC
- minor fixes concerning init_ra function
2021-01-29 12:44:28 +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
hardy
6e12f8f8d3
Merge remote-tracking branch 'origin/nr_ul_scfdma' into integration_2021_wk04_b
2021-01-29 07:40:42 +01:00
hardy
9c810b311d
Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b
2021-01-29 07:40:07 +01:00
Xue Song
cf3694be28
modify the f1 establishment process
2021-01-28 16:35:10 +09:00
Sakthivel Velumani
e913e2ebc8
disabling logs
2021-01-25 17:05:16 +01:00
Thomas Schlichter
729adbcd4e
fix nr_prachsim phy-simulator
2021-01-25 14:28:50 +01:00
Thomas Schlichter
aafe94c556
move definitions from defs_nr_UE.h back to nr-ue.c to fix compilation of LTE UE
2021-01-25 13:59:21 +01:00
Sakthivel Velumani
f6a502ada2
fixes
...
some more fixes that are missed out in previous commits
2021-01-25 11:03:37 +01:00
luis_pereira87
583d2cc0d4
Fix for NR_MAX_PDCCH_AGG_LEVEL
2021-01-24 12:14:48 +00:00
rmagueta
094f21a165
Fix REG to CCE mapping at UE
2021-01-23 18:40:30 +00:00
rmagueta
e2df86be88
Fix PDCCH extract RBs
2021-01-23 15:54:16 +00:00
rmagueta
70938bb907
Fix REG to CCE mapping at gNB
2021-01-22 17:18:37 +00:00