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

formatting

Browse Source
This commit is contained in:
francescomani
2021-08-27 12:58:53 +02:00
parent d0c1bc4340
commit e93545bc08
1 changed files with 230 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
-10
View File
@@ -3139,7 +3139,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
LOG_D(MAC, "[UE] LCID %d, PDU length %d\n", rx_lcid, pdu_len); LOG_D(MAC, "[UE] LCID %d, PDU length %d\n", rx_lcid, pdu_len);
switch(rx_lcid){ switch(rx_lcid){
// MAC CE // MAC CE
case DL_SCH_LCID_CCCH: case DL_SCH_LCID_CCCH:
// MSG4 RRC Setup 38.331 // MSG4 RRC Setup 38.331
// variable length // variable length
@@ -3176,7 +3175,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
nr_mac_rrc_data_ind_ue(module_idP, CC_id, gNB_index, frameP, 0, mac->crnti, CCCH, pduP+mac_subheader_len, mac_sdu_len); nr_mac_rrc_data_ind_ue(module_idP, CC_id, gNB_index, frameP, 0, mac->crnti, CCCH, pduP+mac_subheader_len, mac_sdu_len);
} }
break; break;
case DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH: case DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH:
// 38.321 Ch6.1.3.14 // 38.321 Ch6.1.3.14
@@ -3218,7 +3216,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
mac_subheader_len = 3; mac_subheader_len = 3;
} }
break; break;
case DL_SCH_LCID_RECOMMENDED_BITRATE: case DL_SCH_LCID_RECOMMENDED_BITRATE:
// 38.321 Ch6.1.3.20 // 38.321 Ch6.1.3.20
mac_ce_len = 2; mac_ce_len = 2;
@@ -3308,21 +3305,16 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
ra->RA_active = 0; ra->RA_active = 0;
} }
} }
break; break;
case DL_SCH_LCID_PADDING: case DL_SCH_LCID_PADDING:
done = 1; done = 1;
// end of MAC PDU, can ignore the rest. // end of MAC PDU, can ignore the rest.
break; break;
// MAC SDU // MAC SDU
case DL_SCH_LCID_DCCH: case DL_SCH_LCID_DCCH:
// check if LCID is valid at current time. // check if LCID is valid at current time.
case DL_SCH_LCID_DCCH1: case DL_SCH_LCID_DCCH1:
// check if LCID is valid at current time. // check if LCID is valid at current time.
default: default:
// check if LCID is valid at current time. // check if LCID is valid at current time.
if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){ if(((NR_MAC_SUBHEADER_SHORT *)pduP)->F){
@@ -3347,7 +3339,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
LOG_T(MAC, "\n"); LOG_T(MAC, "\n");
#endif #endif
// if (IS_SOFTMODEM_NOS1){
if (rx_lcid < NB_RB_MAX && rx_lcid >= DL_SCH_LCID_DCCH) { if (rx_lcid < NB_RB_MAX && rx_lcid >= DL_SCH_LCID_DCCH) {
mac_rlc_data_ind(module_idP, mac_rlc_data_ind(module_idP,
@@ -3364,7 +3355,6 @@ void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
} else { } else {
LOG_E(MAC, "[UE %d] Frame %d : unknown LCID %d (gNB %d)\n", module_idP, frameP, rx_lcid, gNB_index); LOG_E(MAC, "[UE %d] Frame %d : unknown LCID %d (gNB %d)\n", module_idP, frameP, rx_lcid, gNB_index);
} }
// }
break; break;
} }