Commit 5ec5be71 authored by wf's avatar wf

reserve slot correct

parent 93361605
No preview for this file type
......@@ -791,10 +791,12 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
radio_tx_burst_flag_t flags_burst = TX_BURST_INVALID;
radio_tx_gpio_flag_t flags_gpio = 0;
if (cfg->cell_config.frame_duplex_type.value == TDD && !get_softmodem_params()->continuous_tx) {
int slot_type = nr_slot_select(cfg,frame,slot%fp->slots_per_frame);
if(slot_type == NR_MIXED_SLOT) {
int txsymb = 0;
return;
for(int symbol_count = 0; symbol_count<NR_NUMBER_OF_SYMBOLS_PER_SLOT; symbol_count++) {
if (cfg->tdd_table.max_tdd_periodicity_list[slot].max_num_of_symbol_per_slot_list[symbol_count].slot_config.value == 0)
......@@ -828,6 +830,11 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
} else {
flags_burst = proc->first_tx == 1 ? TX_BURST_START : TX_BURST_MIDDLE;
}
if (((slot % 10)==0)||((slot%10)==5))
{
siglen -= (fp->ofdm_symbol_size + fp->nb_prefix_samples);
}
}
} else { // FDD
flags_burst = proc->first_tx == 1 ? TX_BURST_START : TX_BURST_MIDDLE;
......
......@@ -239,7 +239,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frame, sub_frame_
// This schedules SIB1
if (get_softmodem_params()->sa == 1)
schedule_nr_sib1(module_idP, frame, slot, &sched_info->DL_req, &sched_info->TX_req);
schedule_nr_sib1(module_idP, frame, slot, &sched_info->DL_req, &sched_info->TX_req);
// This schedule PRACH if we are not in phy_test mode
if (get_softmodem_params()->phy_test == 0) {
......@@ -266,7 +266,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frame, sub_frame_
// This schedule RA procedure if not in phy_test mode
// Otherwise consider 5G already connected
if (get_softmodem_params()->phy_test == 0) {
if (slot != 10)
if ((slot != 10) &&((slot%10) != 7))
nr_schedule_RA(module_idP, frame, slot, &sched_info->UL_dci_req, &sched_info->DL_req, &sched_info->TX_req);
}
......
......@@ -207,7 +207,7 @@ L1s = (
prach_dtx_threshold = 220;
pucch0_dtx_threshold = 250;
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
tx_amp_backoff_dB = 12; //12
tx_amp_backoff_dB = 10; //12
}
);
......
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