francescomani
166aae35ab
fixes to get 100MHz working with 2 layers
2022-08-16 11:18:00 +02:00
luis_pereira87
b7b6e8a60f
Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
2022-07-28 16:50:04 +01:00
Robert Schmidt
57c545d4b3
Merge remote-tracking branch 'origin/use-ubsan' into integration_2022_wk30
2022-07-28 09:45:10 +02:00
Roberto Louro Magueta
1f818b4178
RSRP computation at UE based on CSI-RS
2022-07-26 12:45:30 +01:00
Roberto Louro Magueta
6ba60eb181
Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements
...
# Conflicts:
# openair2/RRC/NR/nr_rrc_config.h
2022-07-20 19:59:34 +01:00
laurent
017fd225bc
fix ubsan detected errors
2022-07-20 10:40:32 +02:00
Roberto Louro Magueta
0c2b3a1eeb
Remove some variables from nr_csi_rs_info_t
2022-07-06 20:18:44 +01:00
Roberto Louro Magueta
8c577ff253
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2022-06-09 00:56:55 +01:00
rmagueta
628a11cde5
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/GNB_APP/MACRLC_nr_paramdef.h
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2022-05-27 11:38:32 +01:00
rmagueta
2f3079b808
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/nr_rrc_config.c
2022-05-27 11:13:02 +01:00
rmagueta
6bca31c7e3
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2022-05-27 10:18:13 +01:00
Roberto Louro Magueta
01c6129ee1
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-05-23 10:43:50 +01:00
Roberto Louro Magueta
9887982e00
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-05-19 13:21:00 +01:00
francescomani
1f49b73eac
Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv
2022-05-18 08:55:40 +02:00
Roberto Louro Magueta
8ac68929bc
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-05-17 19:13:38 +01:00
luis_pereira87
486e9e2381
Merge remote-tracking branch 'origin/Dedicated-BWPs' into integration_2022_wk19b
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-13 15:58:56 +01:00
francescomani
c4c93cc498
Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv
2022-05-12 08:56:45 +02:00
luis_pereira87
3c4ba50281
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-11 14:49:59 +01:00
Roberto Louro Magueta
0ddd8c2586
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_config.h
2022-05-11 14:36:21 +01:00
Roberto Louro Magueta
5c754f2300
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-05-11 14:19:33 +01:00
Roberto Louro Magueta
4c1b432718
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
...
# Conflicts:
# openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
2022-05-11 13:45:56 +01:00
Roberto Louro Magueta
1c9ef67384
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_config.c
# openair2/RRC/NR/nr_rrc_config.h
2022-05-11 13:27:21 +01:00
rmagueta
b8cd9ef167
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/rrc_gNB_nsa.c
2022-05-06 15:41:10 +01:00
francescomani
020c4c52ec
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
2022-05-06 15:27:20 +02:00
Roberto Louro Magueta
05fffa4916
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2022-05-06 13:39:45 +01:00
Roberto Louro Magueta
87e79e5eb8
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
# targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2022-05-06 11:32:36 +01:00
luis_pereira87
a8e6bf9bd5
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/GNB_APP/gnb_config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# openair2/RRC/NR/nr_rrc_defs.h
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-06 11:29:55 +01:00
Roberto Louro Magueta
dce83a0508
Add comments in FAPI for SRS indication
2022-05-05 19:49:06 +01:00
Roberto Louro Magueta
f2974b431b
Revert transformPrecoder to transform_precoding
2022-05-03 19:25:14 +01:00
luis_pereira87
a39c310bd4
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-04-19 10:21:57 +01:00
rmagueta
04b234c878
Send CSI-RS measurements from PHY to MAC at UE
2022-04-12 19:06:02 +01:00
rmagueta
1d86347587
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_TRANSPORT/nr_dci.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-04-12 14:48:08 +01:00
rmagueta
d5421a9c87
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/NR_REFSIG/nr_refsig.h
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
2022-04-12 14:02:43 +01:00
francescomani
e6913e5d33
Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv
2022-04-12 10:41:20 +02:00
francescomani
02b66061b1
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-12 10:14:21 +02:00
francescomani
8927c648d4
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
2022-04-12 09:55:57 +02:00
francescomani
4452308184
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
2022-04-12 09:40:52 +02:00
luis_pereira87
940abc3587
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
2022-04-11 13:49:40 +01:00
Raymond Knopp
86b5b9db3d
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-09 19:44:26 +02:00
Robert Schmidt
9151666960
Merge remote-tracking branch 'origin/nr_gold_init_improv' into integration_2022_wk15
2022-04-09 13:09:50 +02:00
rmagueta
3969079fcd
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair2/GNB_APP/gnb_paramdef.h
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2022-04-08 19:49:40 +01:00
rmagueta
8c056ceefc
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-04-08 18:19:06 +01:00
francescomani
680c605e32
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
2022-04-08 17:02:35 +02:00
francescomani
1ab64d26aa
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-08 16:50:02 +02:00
francescomani
c6b4f97d19
coderate according to SCF and get tbs,qm,R only at MAC
2022-03-26 13:37:34 +01:00
francescomani
65d0318504
using tbslbrm at mac also for ulsch as in scf spec
2022-03-25 17:52:44 +01:00
Melissa Elkadi
3e6f957a63
Several nfapi bug fixes for RX ind and SR ind
...
The SR ind was not properly being packed and unpacked.
The RX inidcation was not properly being allocated
prior to unpacking.
The freq_shift field was declared as a uint16_t but
push/pulled as a uint8_t.
Added MSG_TRUNC in the nfapi VNF recvfrom.
2022-03-23 10:03:08 -07:00
rmagueta
a47861628b
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_REFSIG/nr_gold.c
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/config.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_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2022-03-22 17:18:22 +00:00
Melissa Elkadi
d1cd5b771b
Clean up to nFAPI and error checking UL_TTI_REQ n_pdus
...
We seprarated out the large if block in the push/pull
of the UL_TTI_REQ fields to make it easier to read
and debug. Furthermore, we add in AsserFatals before
indexing in UL_TTI_REQ PDU list to ensure we are not
indexing past the end of the array.
2022-03-08 07:47:44 -08:00
luis_pereira87
a87e99ad69
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair1/PHY/TOOLS/lte_ue_scope.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-03-08 14:21:00 +00:00