Commit 24edd58f authored by Fang-WANG's avatar Fang-WANG

100M--rfsim ok

parent 9af8daef
...@@ -946,7 +946,7 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra ...@@ -946,7 +946,7 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
i = 0; i = 0;
} }
} }
LOG_I(MAC, "rar: frame %d, %d, bwpstart %d, bwpsize %d\n", frameP, slotP, BWPStart, BWPSize );
if (rbStart > (BWPSize - rbSize)) { if (rbStart > (BWPSize - rbSize)) {
LOG_E(NR_MAC, "%s(): cannot find free vrb_map for RA RNTI %04x!\n", __func__, ra->RA_rnti); LOG_E(NR_MAC, "%s(): cannot find free vrb_map for RA RNTI %04x!\n", __func__, ra->RA_rnti);
return; return;
...@@ -1621,7 +1621,7 @@ void nr_fill_rar(uint8_t Mod_idP, ...@@ -1621,7 +1621,7 @@ void nr_fill_rar(uint8_t Mod_idP,
bwp_size = pusch_pdu->bwp_size; bwp_size = pusch_pdu->bwp_size;
prb_alloc = PRBalloc_to_locationandbandwidth0(ra->msg3_nb_rb, ra->msg3_first_rb, bwp_size); prb_alloc = PRBalloc_to_locationandbandwidth0(ra->msg3_nb_rb, ra->msg3_first_rb, bwp_size);
if (bwp_size>180) { if (bwp_size>180) {
AssertFatal(1==0,"Initial UBWP larger than 180 currently not supported"); // AssertFatal(1==0,"Initial UBWP larger than 180 currently not supported");
} }
else { else {
valid_bits = (uint8_t)ceil(log2(bwp_size*(bwp_size+1)>>1)); valid_bits = (uint8_t)ceil(log2(bwp_size*(bwp_size+1)>>1));
......
...@@ -353,7 +353,7 @@ void schedule_control_sib1(module_id_t module_id, ...@@ -353,7 +353,7 @@ void schedule_control_sib1(module_id_t module_id,
const uint16_t bwpSize = type0_PDCCH_CSS_config->num_rbs; const uint16_t bwpSize = type0_PDCCH_CSS_config->num_rbs;
int rbStart = 0; //type0_PDCCH_CSS_config->cset_start_rb; int rbStart = 0; //type0_PDCCH_CSS_config->cset_start_rb;
LOG_D(PHY, "cset_start_rb is %d\n", type0_PDCCH_CSS_config->cset_start_rb); LOG_I(PHY, "cset_start_rb is %d, ccdindex %d\n", type0_PDCCH_CSS_config->cset_start_rb, gNB_mac->sched_ctrlCommon->cce_index);
int startSymbolIndex = 0; int startSymbolIndex = 0;
int nrOfSymbols = 0; int nrOfSymbols = 0;
...@@ -585,7 +585,7 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP) ...@@ -585,7 +585,7 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
(type0_PDCCH_CSS_config->num_rbs > 0) && (type0_PDCCH_CSS_config->num_rbs > 0) &&
(type0_PDCCH_CSS_config->active == true)) { (type0_PDCCH_CSS_config->active == true)) {
LOG_D(NR_MAC,"(%d.%d) SIB1 transmission: ssb_index %d\n", frameP, slotP, type0_PDCCH_CSS_config->ssb_index); LOG_I(NR_MAC,"(%d.%d) SIB1 transmission: ssb_index %d\n", frameP, slotP, type0_PDCCH_CSS_config->ssb_index);
// Get SIB1 // Get SIB1
uint8_t sib1_payload[NR_MAX_SIB_LENGTH/8]; uint8_t sib1_payload[NR_MAX_SIB_LENGTH/8];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment