Skip to content

O
OpenXG-RAN
Commit e6f20804 authored by matzakos's avatar matzakos
Browse files
Options

Remove dependency from noS1 mode to forward received UL traffic from MAC to RLC

parent 1326f6da
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 19 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @ e6f20804
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
void nr_process_mac_pdu( void nr_process_mac_pdu(
module_id_t module_idP, module_id_t module_idP,
rnti_t rnti,
uint8_t CC_id, uint8_t CC_id,
frame_t frameP, frame_t frameP,
uint8_t *pduP, uint8_t *pduP,
...@@ -219,26 +220,34 @@ void nr_process_mac_pdu( ...@@ -219,26 +220,34 @@ void nr_process_mac_pdu(
LOG_T(MAC, "\n"); LOG_T(MAC, "\n");
#endif #endif
if(IS_SOFTMODEM_NOS1){
if (IS_SOFTMODEM_NOS1){ mac_rlc_data_ind(module_idP,
if (rx_lcid < NB_RB_MAX && rx_lcid >= UL_SCH_LCID_DTCH) { 0x1234,
module_idP,
mac_rlc_data_ind(module_idP, frameP,
0x1234, ENB_FLAG_YES,
module_idP, MBMS_FLAG_NO,
frameP, rx_lcid,
ENB_FLAG_YES, (char *) (pdu_ptr + mac_subheader_len),
MBMS_FLAG_NO, mac_sdu_len,
rx_lcid, 1,
(char *) (pdu_ptr + mac_subheader_len), NULL);
mac_sdu_len, }
1, else{
NULL); mac_rlc_data_ind(module_idP,
} else { rnti,
LOG_E(MAC, "[UE %d] Frame %d : unknown LCID %d (gNB %d)\n", module_idP, frameP, rx_lcid, module_idP); module_idP,
} frameP,
ENB_FLAG_YES,
MBMS_FLAG_NO,
rx_lcid,
(char *) (pdu_ptr + mac_subheader_len),
mac_sdu_len,
1,
NULL);
} }
break; break;
default: default:
...@@ -303,7 +312,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP, ...@@ -303,7 +312,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
if (sduP != NULL){ if (sduP != NULL){
UE_scheduling_control->ta_update = timing_advance; UE_scheduling_control->ta_update = timing_advance;
LOG_D(MAC, "Received PDU at MAC gNB \n"); LOG_D(MAC, "Received PDU at MAC gNB \n");
nr_process_mac_pdu(gnb_mod_idP, CC_idP, frameP, sduP, sdu_lenP); nr_process_mac_pdu(gnb_mod_idP, current_rnti, CC_idP, frameP, sduP, sdu_lenP);
} }
} }
else { else {
......
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @ e6f20804
...@@ -297,6 +297,7 @@ void schedule_fapi_ul_pdu(int Mod_idP, ...@@ -297,6 +297,7 @@ void schedule_fapi_ul_pdu(int Mod_idP,
void nr_process_mac_pdu( void nr_process_mac_pdu(
module_id_t module_idP, module_id_t module_idP,
rnti_t rnti,
uint8_t CC_id, uint8_t CC_id,
frame_t frameP, frame_t frameP,
uint8_t *pduP, uint8_t *pduP,
......
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