maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop-CSI

Browse Source 
# 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
This commit is contained in:
rmagueta
2022-04-12 14:02:43 +01:00
parent 8c056ceefc ef6ea331cf
commit d5421a9c87
47 changed files with 599 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+2 -1
View File
@@ -464,7 +464,8 @@ typedef struct {
uint8_t nEpreRatioOfPDSCHToPTRS;
/// MCS table for this DLSCH
uint8_t mcs_table;
uint8_t nscid;
uint16_t dlDmrsScramblingId;
uint16_t pduBitmap;
} fapi_nr_dl_config_dlsch_pdu_rel15_t;