maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
matzakos
2020-08-05 15:45:39 +02:00
parent 1326f6daf7
commit e6f20804b9
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+28 -19
View File
@@ -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,25 +220,33 @@ 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,
NULL);
} else {
LOG_E(MAC, "[UE %d] Frame %d : unknown LCID %d (gNB %d)\n", module_idP, frameP, rx_lcid, module_idP);
}
} }
else{
mac_rlc_data_ind(module_idP,
rnti,
module_idP,
frameP,
ENB_FLAG_YES,
MBMS_FLAG_NO,
rx_lcid,
(char *) (pdu_ptr + mac_subheader_len),
mac_sdu_len,
1,
NULL);
}
break; break;
@@ -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
+1
View File
@@ -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,