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

SRSUE: Interface stack and PHY for NR-RA procedure

Browse Source
master
Xavier Arteaga 4 years ago committed by David Rupprecht
parent 9a6512f4e8
commit 760ad3a746
6 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File

13
lib/include/srslte/interfaces/ue_nr_interfaces.h
Unescape Escape View File

@ -49,8 +49,12 @@ public:
virtual int sf_indication(const uint32_t tti) = 0; ///< FIXME: rename to slot indication virtual int sf_indication(const uint32_t tti) = 0; ///< FIXME: rename to slot indication
// Query the MAC for the current RNTI to look for // Query the MAC for the current RNTI to look for
virtual uint16_t get_dl_sched_rnti(const uint32_t tti) = 0; struct sched_rnti_t {
virtual uint16_t get_ul_sched_rnti(const uint32_t tti) = 0; uint16_t id;
srslte_rnti_type_t type;
};
virtual sched_rnti_t get_dl_sched_rnti_nr(const uint32_t tti) = 0;
virtual sched_rnti_t get_ul_sched_rnti_nr(const uint32_t tti) = 0;
/// Indicate succussfully received TB to MAC. The TB buffer is allocated in the PHY and handed as unique_ptr to MAC /// Indicate succussfully received TB to MAC. The TB buffer is allocated in the PHY and handed as unique_ptr to MAC
virtual void tb_decoded(const uint32_t cc_idx, mac_nr_grant_dl_t& grant) = 0; virtual void tb_decoded(const uint32_t cc_idx, mac_nr_grant_dl_t& grant) = 0;
@ -126,7 +130,10 @@ public:
virtual int tx_request(const tx_request_t& request) = 0; virtual int tx_request(const tx_request_t& request) = 0;
/// Instruct PHY to send PRACH in the next occasion. /// Instruct PHY to send PRACH in the next occasion.
virtual void send_prach(const uint32_t prach_occasion, const int preamble_index, const float preamble_received_target_power, const float ta_base_sec = 0.0f) = 0; virtual void send_prach(const uint32_t prach_occasion,
const int preamble_index,
const float preamble_received_target_power,
const float ta_base_sec = 0.0f) = 0;
}; };
class phy_interface_rrc_nr class phy_interface_rrc_nr

4
srsue/hdr/stack/mac_nr/mac_nr.h
Unescape Escape View File

@ -47,8 +47,8 @@ public:
void bch_decoded_ok(uint32_t tti, srslte::unique_byte_buffer_t payload); void bch_decoded_ok(uint32_t tti, srslte::unique_byte_buffer_t payload);
/// Interface for PHY /// Interface for PHY
uint16_t get_dl_sched_rnti(const uint32_t tti); sched_rnti_t get_dl_sched_rnti_nr(const uint32_t tti);
uint16_t get_ul_sched_rnti(const uint32_t tti); sched_rnti_t get_ul_sched_rnti_nr(const uint32_t tti);
int sf_indication(const uint32_t tti); int sf_indication(const uint32_t tti);
void tb_decoded(const uint32_t cc_idx, mac_nr_grant_dl_t& grant); void tb_decoded(const uint32_t cc_idx, mac_nr_grant_dl_t& grant);

3
srsue/hdr/stack/ue_stack_lte.h
Unescape Escape View File

@ -88,6 +88,9 @@ public:
uint16_t get_dl_sched_rnti(uint32_t tti) final { return mac.get_dl_sched_rnti(tti); } uint16_t get_dl_sched_rnti(uint32_t tti) final { return mac.get_dl_sched_rnti(tti); }
uint16_t get_ul_sched_rnti(uint32_t tti) final { return mac.get_ul_sched_rnti(tti); } uint16_t get_ul_sched_rnti(uint32_t tti) final { return mac.get_ul_sched_rnti(tti); }
sched_rnti_t get_dl_sched_rnti_nr(uint32_t tti) final { return mac_nr.get_dl_sched_rnti_nr(tti); }
sched_rnti_t get_ul_sched_rnti_nr(uint32_t tti) final { return mac_nr.get_ul_sched_rnti_nr(tti); }
void new_grant_ul(uint32_t cc_idx, mac_grant_ul_t grant, tb_action_ul_t* action) final void new_grant_ul(uint32_t cc_idx, mac_grant_ul_t grant, tb_action_ul_t* action) final
{ {
mac.new_grant_ul(cc_idx, grant, action); mac.new_grant_ul(cc_idx, grant, action);

4
srsue/hdr/stack/ue_stack_nr.h
Unescape Escape View File

@ -74,8 +74,8 @@ public:
void run_tti(uint32_t tti) final; void run_tti(uint32_t tti) final;
// MAC interface for PHY // MAC interface for PHY
uint16_t get_dl_sched_rnti(const uint32_t tti) { return mac->get_dl_sched_rnti(tti); } sched_rnti_t get_dl_sched_rnti_nr(const uint32_t tti) final { return mac->get_dl_sched_rnti_nr(tti); }
uint16_t get_ul_sched_rnti(const uint32_t tti) { return mac->get_ul_sched_rnti(tti); } sched_rnti_t get_ul_sched_rnti_nr(const uint32_t tti) final { return mac->get_ul_sched_rnti_nr(tti); }
int sf_indication(const uint32_t tti) int sf_indication(const uint32_t tti)
{ {
run_tti(tti); run_tti(tti);

41
srsue/src/phy/nr/cc_worker.cc
Unescape Escape View File

@ -129,11 +129,16 @@ uint32_t cc_worker::get_buffer_len()
void cc_worker::decode_pdcch_dl() void cc_worker::decode_pdcch_dl()
{ {
std::array<srslte_dci_dl_nr_t, SRSLTE_SEARCH_SPACE_MAX_NOF_CANDIDATES_NR> dci_rx = {}; std::array<srslte_dci_dl_nr_t, SRSLTE_SEARCH_SPACE_MAX_NOF_CANDIDATES_NR> dci_rx = {};
uint16_t rnti = phy->stack->get_dl_sched_rnti(dl_slot_cfg.idx); srsue::mac_interface_phy_nr::sched_rnti_t rnti = phy->stack->get_dl_sched_rnti_nr(dl_slot_cfg.idx);
// Skip search if no valid RNTI is given
if (rnti.id == SRSLTE_INVALID_RNTI) {
return;
}
// Search for grants // Search for grants
int n_dl = srslte_ue_dl_nr_find_dl_dci( int n_dl =
&ue_dl, &dl_slot_cfg, rnti, srslte_rnti_type_c, dci_rx.data(), (uint32_t)dci_rx.size()); srslte_ue_dl_nr_find_dl_dci(&ue_dl, &dl_slot_cfg, rnti.id, rnti.type, dci_rx.data(), (uint32_t)dci_rx.size());
if (n_dl < SRSLTE_SUCCESS) { if (n_dl < SRSLTE_SUCCESS) {
logger.error("Error decoding DL NR-PDCCH"); logger.error("Error decoding DL NR-PDCCH");
return; return;
@ -156,11 +161,16 @@ void cc_worker::decode_pdcch_dl()
void cc_worker::decode_pdcch_ul() void cc_worker::decode_pdcch_ul()
{ {
std::array<srslte_dci_ul_nr_t, SRSLTE_SEARCH_SPACE_MAX_NOF_CANDIDATES_NR> dci_rx = {}; std::array<srslte_dci_ul_nr_t, SRSLTE_SEARCH_SPACE_MAX_NOF_CANDIDATES_NR> dci_rx = {};
uint16_t rnti = phy->stack->get_ul_sched_rnti(ul_slot_cfg.idx); srsue::mac_interface_phy_nr::sched_rnti_t rnti = phy->stack->get_ul_sched_rnti_nr(ul_slot_cfg.idx);
// Skip search if no valid RNTI is given
if (rnti.id == SRSLTE_INVALID_RNTI) {
return;
}
// Search for grants // Search for grants
int n_dl = srslte_ue_dl_nr_find_ul_dci( int n_dl =
&ue_dl, &dl_slot_cfg, rnti, srslte_rnti_type_c, dci_rx.data(), (uint32_t)dci_rx.size()); srslte_ue_dl_nr_find_ul_dci(&ue_dl, &dl_slot_cfg, rnti.id, rnti.type, dci_rx.data(), (uint32_t)dci_rx.size());
if (n_dl < SRSLTE_SUCCESS) { if (n_dl < SRSLTE_SUCCESS) {
logger.error("Error decoding UL NR-PDCCH"); logger.error("Error decoding UL NR-PDCCH");
return; return;
@ -206,7 +216,7 @@ bool cc_worker::work_dl()
// Initialise PDSCH Result // Initialise PDSCH Result
std::array<srslte_pdsch_res_nr_t, SRSLTE_MAX_CODEWORDS> pdsch_res = {}; std::array<srslte_pdsch_res_nr_t, SRSLTE_MAX_CODEWORDS> pdsch_res = {};
pdsch_res[0].payload = data->buffer; pdsch_res[0].payload = data->msg;
pdsch_cfg.grant.tb[0].softbuffer.rx = &softbuffer_rx; pdsch_cfg.grant.tb[0].softbuffer.rx = &softbuffer_rx;
// Decode actual PDSCH transmission // Decode actual PDSCH transmission
@ -236,6 +246,10 @@ bool cc_worker::work_dl()
mac_nr_grant.rnti = pdsch_cfg.grant.rnti; mac_nr_grant.rnti = pdsch_cfg.grant.rnti;
mac_nr_grant.tti = dl_slot_cfg.idx; mac_nr_grant.tti = dl_slot_cfg.idx;
if (pdsch_cfg.grant.rnti_type == srslte_rnti_type_ra) {
phy->rar_grant_tti = dl_slot_cfg.idx;
}
// Send data to MAC // Send data to MAC
phy->stack->tb_decoded(cc_idx, mac_nr_grant); phy->stack->tb_decoded(cc_idx, mac_nr_grant);
} }
@ -273,14 +287,17 @@ bool cc_worker::work_ul()
mac_ul_grant.rnti = pusch_cfg.grant.rnti; mac_ul_grant.rnti = pusch_cfg.grant.rnti;
mac_ul_grant.tti = ul_slot_cfg.idx; mac_ul_grant.tti = ul_slot_cfg.idx;
mac_ul_grant.tbs = pusch_cfg.grant.tb[0].tbs; mac_ul_grant.tbs = pusch_cfg.grant.tb[0].tbs;
phy->stack->new_grant_ul(0, mac_ul_grant); srslte::unique_byte_buffer_t tx_pdu = srslte::make_byte_buffer();
phy->stack->new_grant_ul(0, mac_ul_grant, tx_pdu.get());
// Provisional reset and assign Tx softbuffer // Provisional reset and assign Tx softbuffer
srslte_softbuffer_tx_reset(&softbuffer_tx); srslte_softbuffer_tx_reset(&softbuffer_tx);
pusch_cfg.grant.tb[0].softbuffer.tx = &softbuffer_tx; pusch_cfg.grant.tb[0].softbuffer.tx = &softbuffer_tx;
// TODO: Use here PDU, after that, remove tx_data attribute
uint8_t* tx_data_ptr = tx_pdu.get()->msg;
// Encode PUSCH transmission // Encode PUSCH transmission
if (srslte_ue_ul_nr_encode_pusch(&ue_ul, &ul_slot_cfg, &pusch_cfg, tx_data.data()) < SRSLTE_SUCCESS) { if (srslte_ue_ul_nr_encode_pusch(&ue_ul, &ul_slot_cfg, &pusch_cfg, tx_data_ptr) < SRSLTE_SUCCESS) {
ERROR("Encoding PUSCH"); ERROR("Encoding PUSCH");
return false; return false;
} }
@ -289,9 +306,9 @@ bool cc_worker::work_ul()
if (logger.info.enabled()) { if (logger.info.enabled()) {
std::array<char, 512> str; std::array<char, 512> str;
srslte_ue_ul_nr_pusch_info(&ue_ul, &pusch_cfg, str.data(), str.size()); srslte_ue_ul_nr_pusch_info(&ue_ul, &pusch_cfg, str.data(), str.size());
logger.info(tx_data.data(), logger.info(tx_data_ptr,
pusch_cfg.grant.tb[0].tbs / 8, pusch_cfg.grant.tb[0].tbs / 8,
"PUSCH: cc=%d, %s, tti_tx=%d", "PUSCH (NR): cc=%d, %s, tti_tx=%d",
cc_idx, cc_idx,
str.data(), str.data(),
ul_slot_cfg.idx); ul_slot_cfg.idx);

25
srsue/src/stack/mac_nr/mac_nr.cc
Unescape Escape View File

@ -73,9 +73,9 @@ void mac_nr::run_tti(const uint32_t tti)
logger.debug("Running MAC tti=%d", tti); logger.debug("Running MAC tti=%d", tti);
} }
uint16_t mac_nr::get_ul_sched_rnti(const uint32_t tti) mac_interface_phy_nr::sched_rnti_t mac_nr::get_ul_sched_rnti_nr(const uint32_t tti)
{ {
return c_rnti; return {c_rnti, srslte_rnti_type_c};
} }
bool mac_nr::is_si_opportunity() bool mac_nr::is_si_opportunity()
@ -89,34 +89,33 @@ bool mac_nr::is_paging_opportunity()
return false; return false;
} }
uint16_t mac_nr::get_dl_sched_rnti(const uint32_t tti) mac_interface_phy_nr::sched_rnti_t mac_nr::get_dl_sched_rnti_nr(const uint32_t tti)
{ {
// Priority: SI-RNTI, P-RNTI, RA-RNTI, Temp-RNTI, CRNTI // Priority: SI-RNTI, P-RNTI, RA-RNTI, Temp-RNTI, CRNTI
if (is_si_opportunity()) { if (is_si_opportunity()) {
return SRSLTE_SIRNTI; return {SRSLTE_SIRNTI, srslte_rnti_type_si};
} }
if (is_paging_opportunity()) { if (is_paging_opportunity()) {
return SRSLTE_PRNTI; return {SRSLTE_PRNTI, srslte_rnti_type_si};
} }
// TODO: add new RA proc shortly if (proc_ra.is_rar_opportunity(tti)) {
#if 0 return {proc_ra.get_rar_rnti(), srslte_rnti_type_ra};
if (proc_ra->is_rar_opportunity()) {
return proc_ra->get_rar_rnti();
} }
if (proc_ra->has_temp_rnti() && has_crnti() == false) { #if 0
if (proc_ra.has_temp_rnti() && has_crnti() == false) {
return proc_ra->get_temp_rnti(); return proc_ra->get_temp_rnti();
} }
#endif #endif
if (has_crnti()) { if (has_crnti()) {
return get_crnti(); return {get_crnti(), srslte_rnti_type_c};
} }
// turn off DCI search for this TTI // turn off DCI search for this TTI
return SRSLTE_INVALID_RNTI; return {SRSLTE_INVALID_RNTI, srslte_rnti_type_c};
} }
bool mac_nr::has_crnti() bool mac_nr::has_crnti()
@ -151,7 +150,7 @@ void mac_nr::prach_sent(const uint32_t tti,
const uint32_t f_id, const uint32_t f_id,
const uint32_t ul_carrier_id) const uint32_t ul_carrier_id)
{ {
// TODO: indicate to RA proc proc_ra.prach_sent(tti, s_id, t_id, f_id, ul_carrier_id);
} }
// This function handles all PCAP writing for a decoded DL TB // This function handles all PCAP writing for a decoded DL TB

Write Preview
Loading…
Cancel
Save