5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding RRC logic to receive all SIBs

Browse Source
master
Paul Sutton 7 years ago committed by Ismael Gomez
parent d428760b20
commit 5b46174b5b
2 changed files with 133 additions and 75 deletions
Show Stats Download Patch File Download Diff File

17
srsue/hdr/upper/rrc.h
Unescape Escape View File

@ -196,9 +196,13 @@ private:
float rsrp; float rsrp;
bool has_valid_sib1; bool has_valid_sib1;
bool has_valid_sib2; bool has_valid_sib2;
bool has_valid_sib3;
bool has_valid_sib13;
bool in_sync; bool in_sync;
LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_1_STRUCT sib1; LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_1_STRUCT sib1;
LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_2_STRUCT sib2; LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_2_STRUCT sib2;
LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_3_STRUCT sib3;
LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_13_STRUCT sib13;
} cell_t; } cell_t;
std::vector<cell_t> known_cells; std::vector<cell_t> known_cells;
@ -212,8 +216,9 @@ private:
si_acquire_state_t si_acquire_state; si_acquire_state_t si_acquire_state;
void run_si_acquisition_procedure(); void run_si_acquisition_procedure();
uint32_t sib_start_tti(uint32_t tti, uint32_t period, uint32_t x); uint32_t sib_start_tti(uint32_t tti, uint32_t period, uint32_t offset, uint32_t sf);
uint32_t nof_sib1_trials; uint32_t nof_sib1_trials;
uint16_t sysinfo_index;
uint32_t last_win_start; uint32_t last_win_start;
void select_next_cell_in_plmn(); void select_next_cell_in_plmn();
@ -365,10 +370,16 @@ private:
void rrc_connection_release(); void rrc_connection_release();
void con_restablish_cell_reselected(); void con_restablish_cell_reselected();
void radio_link_failure(); void radio_link_failure();
static void* start_sib_thread(void *rrc_); static void* start_sib_thread(void *rrc_);
void sib_search(); void sib_search();
void apply_rr_config_common_dl(LIBLTE_RRC_RR_CONFIG_COMMON_STRUCT *config); void apply_rr_config_common_dl(LIBLTE_RRC_RR_CONFIG_COMMON_STRUCT *config);
void apply_rr_config_common_ul(LIBLTE_RRC_RR_CONFIG_COMMON_STRUCT *config); void apply_rr_config_common_ul(LIBLTE_RRC_RR_CONFIG_COMMON_STRUCT *config);
void handle_sib1();
void handle_sib2();
void handle_sib3();
void handle_sib13();
void apply_sib2_configs(LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_2_STRUCT *sib2); void apply_sib2_configs(LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_2_STRUCT *sib2);
void handle_con_setup(LIBLTE_RRC_CONNECTION_SETUP_STRUCT *setup); void handle_con_setup(LIBLTE_RRC_CONNECTION_SETUP_STRUCT *setup);
void handle_con_reest(LIBLTE_RRC_CONNECTION_REESTABLISHMENT_STRUCT *setup); void handle_con_reest(LIBLTE_RRC_CONNECTION_REESTABLISHMENT_STRUCT *setup);

191
srsue/src/upper/rrc.cc
Unescape Escape View File

@ -47,6 +47,7 @@ namespace srsue {
rrc::rrc() rrc::rrc()
:state(RRC_STATE_IDLE) :state(RRC_STATE_IDLE)
,drb_up(false) ,drb_up(false)
,sysinfo_index(0)
{ {
sync_reset_cnt = 0; sync_reset_cnt = 0;
n310_cnt = 0; n310_cnt = 0;
@ -204,12 +205,7 @@ void rrc::run_thread() {
if (phy->sync_status()) { if (phy->sync_status()) {
if (!current_cell->has_valid_sib1) { if (!current_cell->has_valid_sib1) {
si_acquire_state = SI_ACQUIRE_SIB1; si_acquire_state = SI_ACQUIRE_SIB1;
} else if (!current_cell->has_valid_sib2) { sysinfo_index = 0;
si_acquire_state = SI_ACQUIRE_SIB2;
} else {
apply_sib2_configs(&current_cell->sib2);
si_acquire_state = SI_ACQUIRE_IDLE;
state = RRC_STATE_CELL_SELECTED;
} }
} }
select_cell_timeout++; select_cell_timeout++;
@ -289,8 +285,8 @@ void rrc::run_thread() {
// Determine SI messages scheduling as in 36.331 5.2.3 Acquisition of an SI message // Determine SI messages scheduling as in 36.331 5.2.3 Acquisition of an SI message
uint32_t rrc::sib_start_tti(uint32_t tti, uint32_t period, uint32_t x) { uint32_t rrc::sib_start_tti(uint32_t tti, uint32_t period, uint32_t offset, uint32_t sf) {
return (period * 10 * (1 + tti / (period * 10)) + x) % 10240; // the 1 means next opportunity return (period*10*(1+tti/(period*10))+(offset*10)+sf)%10240; // the 1 means next opportunity
} }
void rrc::run_si_acquisition_procedure() void rrc::run_si_acquisition_procedure()
@ -298,13 +294,14 @@ void rrc::run_si_acquisition_procedure()
uint32_t tti; uint32_t tti;
uint32_t si_win_start=0, si_win_len=0; uint32_t si_win_start=0, si_win_len=0;
uint16_t period; uint16_t period;
uint32_t x, sf, offset;
const int SIB1_SEARCH_TIMEOUT = 30; const int SIB1_SEARCH_TIMEOUT = 30;
switch (si_acquire_state) { switch (si_acquire_state) {
case SI_ACQUIRE_SIB1: case SI_ACQUIRE_SIB1:
// Instruct MAC to look for SIB1 // Instruct MAC to look for SIB1
tti = mac->get_current_tti(); tti = mac->get_current_tti();
si_win_start = sib_start_tti(tti, 2, 5); si_win_start = sib_start_tti(tti, 2, 0, 5);
if (tti > last_win_start + 10) { if (tti > last_win_start + 10) {
last_win_start = si_win_start; last_win_start = si_win_start;
mac->bcch_start_rx(si_win_start, 1); mac->bcch_start_rx(si_win_start, 1);
@ -323,17 +320,30 @@ void rrc::run_si_acquisition_procedure()
} }
break; break;
case SI_ACQUIRE_SIB2: case SI_ACQUIRE_SIB2:
// Instruct MAC to look for SIB2 only when selecting a cell // Instruct MAC to look for next SIB
tti = mac->get_current_tti(); if(sysinfo_index < current_cell->sib1.N_sched_info) {
period = liblte_rrc_si_periodicity_num[current_cell->sib1.sched_info[0].si_periodicity]; si_win_len = liblte_rrc_si_window_length_num[current_cell->sib1.si_window_length];
si_win_start = sib_start_tti(tti, period, 0); x = sysinfo_index*si_win_len;
if (tti > last_win_start + 10) { sf = x%10;
last_win_start = si_win_start; offset = x/10;
si_win_len = liblte_rrc_si_window_length_num[current_cell->sib1.si_window_length];
tti = mac->get_current_tti();
period = liblte_rrc_si_periodicity_num[current_cell->sib1.sched_info[sysinfo_index].si_periodicity];
si_win_start = sib_start_tti(tti, period, offset, sf);
if (tti > last_win_start + 10) {
last_win_start = si_win_start;
si_win_len = liblte_rrc_si_window_length_num[current_cell->sib1.si_window_length];
mac->bcch_start_rx(si_win_start, si_win_len);
rrc_log->debug("Instructed MAC to search for system info, win_start=%d, win_len=%d\n",
si_win_start, si_win_len);
}
mac->bcch_start_rx(si_win_start, si_win_len); } else {
rrc_log->debug("Instructed MAC to search for SIB2, win_start=%d, win_len=%d\n", // We've received all SIBs, move on to connection request
si_win_start, si_win_len); si_acquire_state = SI_ACQUIRE_IDLE;
state = RRC_STATE_CELL_SELECTED;
} }
break; break;
default: default:
@ -984,6 +994,8 @@ void rrc::write_pdu_bcch_bch(byte_buffer_t *pdu) {
} }
void rrc::write_pdu_bcch_dlsch(byte_buffer_t *pdu) { void rrc::write_pdu_bcch_dlsch(byte_buffer_t *pdu) {
mac->bcch_stop_rx();
rrc_log->info_hex(pdu->msg, pdu->N_bytes, "BCCH DLSCH message received."); rrc_log->info_hex(pdu->msg, pdu->N_bytes, "BCCH DLSCH message received.");
rrc_log->info("BCCH DLSCH message Stack latency: %ld us\n", pdu->get_latency_us()); rrc_log->info("BCCH DLSCH message Stack latency: %ld us\n", pdu->get_latency_us());
LIBLTE_RRC_BCCH_DLSCH_MSG_STRUCT dlsch_msg; LIBLTE_RRC_BCCH_DLSCH_MSG_STRUCT dlsch_msg;
@ -992,74 +1004,104 @@ void rrc::write_pdu_bcch_dlsch(byte_buffer_t *pdu) {
pool->deallocate(pdu); pool->deallocate(pdu);
liblte_rrc_unpack_bcch_dlsch_msg((LIBLTE_BIT_MSG_STRUCT *) &bit_buf, &dlsch_msg); liblte_rrc_unpack_bcch_dlsch_msg((LIBLTE_BIT_MSG_STRUCT *) &bit_buf, &dlsch_msg);
if (dlsch_msg.N_sibs > 0) { for(uint32_t i=0; i<dlsch_msg.N_sibs; i++) {
if (LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_1 == dlsch_msg.sibs[0].sib_type && SI_ACQUIRE_SIB1 == si_acquire_state) { rrc_log->info("Processing SIB: %d\n", liblte_rrc_sys_info_block_type_num[dlsch_msg.sibs[i].sib_type]);
mac->bcch_stop_rx();
// Handle SIB1
memcpy(&current_cell->sib1, &dlsch_msg.sibs[0].sib.sib1, sizeof(LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_1_STRUCT));
rrc_log->info("SIB1 received, CellID=%d, si_window=%d, sib2_period=%d\n", if (LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_1 == dlsch_msg.sibs[i].sib_type && SI_ACQUIRE_SIB1 == si_acquire_state) {
current_cell->sib1.cell_id & 0xfff, memcpy(&current_cell->sib1, &dlsch_msg.sibs[i].sib.sib1, sizeof(LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_1_STRUCT));
liblte_rrc_si_window_length_num[current_cell->sib1.si_window_length], current_cell->has_valid_sib1 = true;
liblte_rrc_si_periodicity_num[current_cell->sib1.sched_info[0].si_periodicity]); handle_sib1();
} else if (LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_2 == dlsch_msg.sibs[i].sib_type && !current_cell->has_valid_sib2) {
memcpy(&current_cell->sib2, &dlsch_msg.sibs[i].sib.sib2, sizeof(LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_2_STRUCT));
current_cell->has_valid_sib2 = true;
handle_sib2();
} else if (LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_3 == dlsch_msg.sibs[i].sib_type && !current_cell->has_valid_sib3) {
memcpy(&current_cell->sib3, &dlsch_msg.sibs[i].sib.sib3, sizeof(LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_3_STRUCT));
current_cell->has_valid_sib3 = true;
handle_sib3();
}else if (LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_13 == dlsch_msg.sibs[i].sib_type && !current_cell->has_valid_sib13) {
memcpy(&current_cell->sib13, &dlsch_msg.sibs[0].sib.sib13, sizeof(LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_13_STRUCT));
current_cell->has_valid_sib13 = true;
handle_sib13();
}
}
if(current_cell->has_valid_sib2) {
sysinfo_index++;
}
}
void rrc::handle_sib1()
{
rrc_log->info("SIB1 received, CellID=%d, si_window=%d, sib2_period=%d\n",
current_cell->sib1.cell_id&0xfff,
liblte_rrc_si_window_length_num[current_cell->sib1.si_window_length],
liblte_rrc_si_periodicity_num[current_cell->sib1.sched_info[0].si_periodicity]);
// Print SIB scheduling info
uint32_t i,j;
for(i=0;i<current_cell->sib1.N_sched_info;i++){
for(j=0;j<current_cell->sib1.sched_info[i].N_sib_mapping_info;j++){
LIBLTE_RRC_SIB_TYPE_ENUM t = current_cell->sib1.sched_info[i].sib_mapping_info[j].sib_type;
LIBLTE_RRC_SI_PERIODICITY_ENUM p = current_cell->sib1.sched_info[i].si_periodicity;
rrc_log->debug("SIB scheduling info, sib_type=%d, si_periodicity=%d\n",
liblte_rrc_sib_type_num[t],
liblte_rrc_si_periodicity_num[p]);
}
}
// Set TDD Config // Set TDD Config
if (current_cell->sib1.tdd) { if(current_cell->sib1.tdd) {
phy->set_config_tdd(&current_cell->sib1.tdd_cnfg); phy->set_config_tdd(&current_cell->sib1.tdd_cnfg);
} }
current_cell->has_valid_sib1 = true; current_cell->has_valid_sib1 = true;
// Send PLMN and TAC to NAS // Send PLMN and TAC to NAS
std::stringstream ss; std::stringstream ss;
for (uint32_t i = 0; i < current_cell->sib1.N_plmn_ids; i++) { for (uint32_t i = 0; i < current_cell->sib1.N_plmn_ids; i++) {
nas->plmn_found(current_cell->sib1.plmn_id[i].id, current_cell->sib1.tracking_area_code); nas->plmn_found(current_cell->sib1.plmn_id[i].id, current_cell->sib1.tracking_area_code);
} }
// Jump to next state // Jump to next state
switch(state) { switch(state) {
case RRC_STATE_CELL_SELECTING: case RRC_STATE_CELL_SELECTING:
si_acquire_state = SI_ACQUIRE_SIB2; si_acquire_state = SI_ACQUIRE_SIB2;
break; break;
case RRC_STATE_PLMN_SELECTION: case RRC_STATE_PLMN_SELECTION:
si_acquire_state = SI_ACQUIRE_IDLE; si_acquire_state = SI_ACQUIRE_IDLE;
rrc_log->info("SI Acquisition done. Searching next cell...\n"); rrc_log->info("SI Acquisition done. Searching next cell...\n");
usleep(5000); usleep(5000);
phy->cell_search_next(); phy->cell_search_next();
break; break;
default: default:
si_acquire_state = SI_ACQUIRE_IDLE; si_acquire_state = SI_ACQUIRE_IDLE;
} }
}
} else if (LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_2 == dlsch_msg.sibs[0].sib_type && void rrc::handle_sib2()
SI_ACQUIRE_SIB2 == si_acquire_state) { {
mac->bcch_stop_rx(); rrc_log->info("SIB2 received\n");
// Handle SIB2 apply_sib2_configs(&current_cell->sib2);
memcpy(&current_cell->sib2, &dlsch_msg.sibs[0].sib.sib2, sizeof(LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_2_STRUCT)); }
rrc_log->info("SIB2 received\n");
apply_sib2_configs(&current_cell->sib2); void rrc::handle_sib3()
{
rrc_log->info("SIB3 received\n");
}
current_cell->has_valid_sib2 = true; void rrc::handle_sib13()
{
rrc_log->info("SIB13 received\n");
// Jump to next state // mac->set_config_mbsfn_sib13(&current_cell->sib13.mbsfn_area_info_list_r9[0],
switch(state) { // current_cell->sib13.mbsfn_area_info_list_r9_size,
case RRC_STATE_CELL_SELECTING: // &current_cell->sib13.mbsfn_notification_config);
si_acquire_state = SI_ACQUIRE_IDLE;
state = RRC_STATE_CELL_SELECTED;
break;
default:
si_acquire_state = SI_ACQUIRE_IDLE;
}
}
}
} }
/******************************************************************************* /*******************************************************************************
* *
* *
@ -1449,6 +1491,11 @@ void rrc::apply_sib2_configs(LIBLTE_RRC_SYS_INFO_BLOCK_TYPE_2_STRUCT *sib2) {
memcpy(&cfg.rach, &sib2->rr_config_common_sib.rach_cnfg, sizeof(LIBLTE_RRC_RACH_CONFIG_COMMON_STRUCT)); memcpy(&cfg.rach, &sib2->rr_config_common_sib.rach_cnfg, sizeof(LIBLTE_RRC_RACH_CONFIG_COMMON_STRUCT));
cfg.prach_config_index = sib2->rr_config_common_sib.prach_cnfg.root_sequence_index; cfg.prach_config_index = sib2->rr_config_common_sib.prach_cnfg.root_sequence_index;
cfg.ul_harq_params.max_harq_msg3_tx = cfg.rach.max_harq_msg3_tx; cfg.ul_harq_params.max_harq_msg3_tx = cfg.rach.max_harq_msg3_tx;
// Apply MBSFN configuration
// cfg.mbsfn_subfr_cnfg_list_size = sib2->mbsfn_subfr_cnfg_list_size;
// for(uint8_t i=0;i<sib2->mbsfn_subfr_cnfg_list_size;i++) {
// memcpy(&cfg.mbsfn_subfr_cnfg_list[i], &sib2->mbsfn_subfr_cnfg_list[i], sizeof(LIBLTE_RRC_MBSFN_SUBFRAME_CONFIG_STRUCT));
// }
mac->set_config(&cfg); mac->set_config(&cfg);

Write Preview
Loading…
Cancel
Save