Merge remote-tracking branch 'origin/CSI-SA' into develop-CSI
# Conflicts: # openair1/PHY/NR_TRANSPORT/nr_dlsch.c # openair1/SCHED_NR_UE/fapi_nr_ue_l1.c # openair1/SIMULATION/NR_PHY/dlsim.c # openair1/SIMULATION/NR_PHY/ulsim.c # openair2/LAYER2/NR_MAC_gNB/config.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c # openair2/RRC/NR/MESSAGES/asn1_msg.c # openair2/RRC/NR/nr_rrc_proto.h # openair2/RRC/NR/rrc_gNB_nsa.c # openair2/RRC/NR/rrc_gNB_reconfig.c
This commit is contained in:
@@ -231,7 +231,6 @@ uint32_t nr_get_code_rate(uint8_t Imcs, uint8_t table_idx) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void get_coreset_rballoc(uint8_t *FreqDomainResource,int *n_rb,int *rb_offset) {
|
||||
|
||||
uint8_t count=0, start=0, start_set=0;
|
||||
@@ -483,6 +482,7 @@ int get_nr_table_idx(int nr_bandP, uint8_t scs_index) {
|
||||
return i;
|
||||
}
|
||||
|
||||
|
||||
int get_subband_size(int NPRB,int size) {
|
||||
// implements table 5.2.1.4-2 from 36.214
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user