UE: Add DCI_IND in phy_procedures_nr_ue. Fill type0-pdcch in scheduled_response

nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_constants.h

@@ -34,6 +34,9 @@
 
 
 /// DL_CONFIG_REQ
+
+#define FAPI_NR_DL_CONFIG_LIST_NUM 10
+
 #define FAPI_NR_DL_CONFIG_TYPE_DCI 0x01
 #define FAPI_NR_DL_CONFIG_TYPE_DLSCH 0x02
 
@@ -44,5 +47,7 @@
 #define PRECODER_GRANULARITY_ALL_CONTIGUOUS_RBS 0x02
 
 /// UL_CONFIG_REQ
+#define FAPI_NR_UL_CONFIG_LIST_NUM 10
+
 
 #endif
\ No newline at end of file

openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c

@@ -713,30 +713,6 @@ int nr_rx_pbch( PHY_VARS_NR_UE *ue,
 
     ue->if_inst->dl_indication(&ue->dl_indication);
 
-//  dci reception part, should be put into dci_nr.c ? TBD
-#if 0
-    ue->dl_indication.dci_ind = &ue->dci_ind; //  hang on rx_ind instance
-    //ue->dci_ind.sfn_slot = 0;  //should be set by higher-1-layer, i.e. clean_and_set_if_instance()
-    uint32_t num_dci = 1;
-    uint32_t ii;
-
-    ue->dci_ind.number_of_dcis = num_dci;
-    ue->dci_ind.dci_list = (fapi_nr_dci_indication_pdu_t *)malloc(num_dci * sizeof(fapi_nr_dci_indication_pdu_t));
-    
-    for(ii=0; ii<num_dci; ++ii){
-        //TODO check this part
-        (ue->dci_ind.dci_list+ii)->rnti = 0x0000;
-        (ue->dci_ind.dci_list+ii)->dci_type = 0;
-        
-        //  TODO to be fill with TCL
-        //ue->dci_ind.dci_list[ii]->dci.
-
-    }
-
-    ue->if_inst->dl_indication(&ue->dl_indication);
-#endif 
-
-
     return 0;    
 }
 

openair1/PHY/defs_nr_UE.h

@@ -921,6 +921,8 @@ typedef struct {
   // SEARCHSPACE structure, where maximum number of SEARCHSPACEs to be handled is 10 (according to 38.331 V15.1.0)
   // Each SearchSpace is associated with one ControlResourceSet 
   NR_UE_PDCCH_SEARCHSPACE searchSpace[NR_NBR_SEARCHSPACE_ACT_BWP];
+
+  uint32_t nb_search_space;
   #endif
 } NR_UE_PDCCH;
 

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -41,61 +41,109 @@ extern PHY_VARS_NR_UE ***PHY_vars_UE_g;
 
 int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
 
-	if(scheduled_response != NULL){
-		if(scheduled_response->dl_config != NULL){
-
-		}
-
-		if(scheduled_response->ul_config != NULL){
-
-		}
-
-		if(scheduled_response->tx_request != NULL){
-
-		}
-	}
-
-	return 0;
+    /// module id
+    module_id_t module_id = scheduled_response->module_id; 
+    /// component carrier id
+    uint8_t cc_id = scheduled_response->CC_id;
+    uint32_t i;
+
+    if(scheduled_response != NULL){
+        if(scheduled_response->dl_config != NULL){
+            fapi_nr_dl_config_request_t *dl_config = scheduled_response->dl_config;
+
+
+            for(i=0; i<dl_config->number_pdus; ++i){
+                if(dl_config->dl_config_list[i].pdu_type == FAPI_NR_DL_CONFIG_TYPE_DCI){
+                    PHY_vars_UE_g[module_id][cc_id]->nb_search_space = PHY_vars_UE_g[module_id][cc_id]->nb_search_space + 1;
+                    fapi_nr_dl_config_dci_dl_pdu_rel15_t *dci_config = &dl_config->dl_config_list[i].dci_config_pdu.dci_config_rel15;
+                    
+                    pdcch_vars2->searchSpace[i].monitoringSymbolWithinSlot = dci_config.monitoring_symbols_within_slot;
+                    
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel1  = dci_config.number_of_candidates[0];
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel2  = dci_config.number_of_candidates[1];
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel4  = dci_config.number_of_candidates[2];
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel8  = dci_config.number_of_candidates[3];
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel16 = dci_config.number_of_candidates[4];
+
+                    pdcch_vars2->coreset[i].duration = dci_config.coreset.duration;
+                    //pdcch_vars2->coreset[i].frequencyDomainResources;
+                    //dci_config.coreset.rb_start;
+                    //dci_config.coreset.rb_end;
+
+                    if(dci_config.cce_reg_mapping_type == CCE_REG_MAPPING_TYPE_INTERLEAVED){
+                        pdcch_vars2->coreset[i].cce_reg_mappingType.shiftIndex = cce_reg_interleaved_shift_index;
+                        pdcch_vars2->coreset[i].cce_reg_mappingType.reg_bundlesize = cce_reg_interleaved_reg_bundle_size;
+                        pdcch_vars2->coreset[i].cce_reg_mappingType.interleaversize = cce_reg_interleaved_interleaver_size;
+                    }else{
+                        ;
+                    }
+                    
+                    pdcch_vars2->coreset[i].precoderGranularity = dci_config.precoder_granularity;
+                    //pdcch_vars2->coreset[i].tciStatesPDCCH;
+                    //pdcch_vars2->coreset[i].tciPresentInDCI;
+                    pdcch_vars2->coreset[i].pdcchDMRSScramblingID = dci_config.pdcch_dmrs_scrambling_id;
+                }else{  //FAPI_NR_DL_CONFIG_TYPE_DLSCH
+                    //  dlsch config pdu
+                }
+            }
+        }else{
+            PHY_vars_UE_g[module_id][cc_id]->nb_search_space = 0;
+        }
+
+        if(scheduled_response->ul_config != NULL){
+
+        }else{
+            
+        }
+
+        if(scheduled_response->tx_request != NULL){
+
+        }else{
+            
+        }
+    }
+
+    return 0;
 }
 
 
 int8_t nr_ue_phy_config_request(nr_phy_config_t *phy_config){
 
-	if(phy_config != NULL){
-		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_PBCH){
-			printf("[L1][IF module][PHY CONFIG]\n");
-			printf("subcarrier spacing:          %d\n", phy_config->config_req.pbch_config.subcarrier_spacing_common);
-			printf("ssb carrier offset:          %d\n", phy_config->config_req.pbch_config.ssb_subcarrier_offset);
-			printf("dmrs type A position:        %d\n", phy_config->config_req.pbch_config.dmrs_type_a_position);
-			printf("pdcch config sib1:           %d\n", phy_config->config_req.pbch_config.pdcch_config_sib1);
-			printf("cell barred:                 %d\n", phy_config->config_req.pbch_config.cell_barred);
-			printf("intra frequcney reselection: %d\n", phy_config->config_req.pbch_config.intra_frequency_reselection);
-			printf("system frame number:         %d\n", phy_config->config_req.pbch_config.system_frame_number);
-			printf("ssb index:                   %d\n", phy_config->config_req.pbch_config.ssb_index);
-			printf("half frame bit:              %d\n", phy_config->config_req.pbch_config.half_frame_bit);
-			printf("-------------------------------\n");
-
-			PHY_vars_UE_g[0][0]->proc.proc_rxtx[0].frame_rx = phy_config->config_req.pbch_config.system_frame_number;
-		}
-		
-		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_DL_BWP_COMMON){
-			
-		}
-
-		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_UL_BWP_COMMON){
-			
-		}
-
-		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_DL_BWP_DEDICATED){
-			
-		}
-
-		if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_UL_BWP_DEDICATED){
-			
-		}
-	}
-	
-
-
-	return 0;
+    if(phy_config != NULL){
+        if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_PBCH){
+            printf("[L1][IF module][PHY CONFIG]\n");
+            printf("subcarrier spacing:          %d\n", phy_config->config_req.pbch_config.subcarrier_spacing_common);
+            printf("ssb carrier offset:          %d\n", phy_config->config_req.pbch_config.ssb_subcarrier_offset);
+            printf("dmrs type A position:        %d\n", phy_config->config_req.pbch_config.dmrs_type_a_position);
+            printf("pdcch config sib1:           %d\n", phy_config->config_req.pbch_config.pdcch_config_sib1);
+            printf("cell barred:                 %d\n", phy_config->config_req.pbch_config.cell_barred);
+            printf("intra frequcney reselection: %d\n", phy_config->config_req.pbch_config.intra_frequency_reselection);
+            printf("system frame number:         %d\n", phy_config->config_req.pbch_config.system_frame_number);
+            printf("ssb index:                   %d\n", phy_config->config_req.pbch_config.ssb_index);
+            printf("half frame bit:              %d\n", phy_config->config_req.pbch_config.half_frame_bit);
+            printf("-------------------------------\n");
+
+            PHY_vars_UE_g[0][0]->proc.proc_rxtx[0].frame_rx = phy_config->config_req.pbch_config.system_frame_number;
+        }
+        
+        if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_DL_BWP_COMMON){
+            
+        }
+
+        if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_UL_BWP_COMMON){
+            
+        }
+
+        if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_DL_BWP_DEDICATED){
+            
+        }
+
+        if(phy_config->config_req.config_mask & FAPI_NR_CONFIG_REQUEST_MASK_UL_BWP_DEDICATED){
+            
+        }
+    }
+    
+
+
+    return 0;
 }

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -3432,6 +3432,9 @@ int nr_ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *
   //emos_dump_UE.dci_cnt[nr_tti_rx] = dci_cnt;
 #endif
 
+      ue->dci_ind.number_of_dcis = dci_cnt;
+      ue->dl_indication.dci_ind = &ue->dci_ind; //  hang on rx_ind instance
+
       for (i=0; i<dci_cnt; i++) {
         /*
          * This is the NR part
@@ -3485,7 +3488,17 @@ int nr_ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *
                                                 n_RB_DLBWP,
                                                 crc_scrambled_values);
 
-
+        //ue->dci_ind.dci_list = (fapi_nr_dci_indication_pdu_t *)malloc(num_dci * sizeof(fapi_nr_dci_indication_pdu_t));
+    
+        ue->dci_ind.dci_list[i].rnti = 0x0000;
+        ue->dci_ind.dci_list[i].dci_type = 0;
+        NR_DCI_INFO_EXTRACTED_t *nr_dci_info_extracted;
+        memcpy(&ue->dci_ind.dci_list[i].dci, nr_dci_info_extracted, sizeof(fapi_nr_dci_pdu_rel15_t) );
+        
+        //  TODO: check where should we send up this message.
+        //ue->if_inst->dl_indication(&ue->dl_indication);
+
+        
 	/*
 	 * This is the LTE part to be removed
 

openair2/LAYER2/NR_MAC_UE/mac.h

@@ -37,9 +37,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define NR_BCCH_DL_SCH 3			// SI
+#define NR_BCCH_DL_SCH 3            // SI
 
-#define NR_BCCH_BCH 5			// MIB
+#define NR_BCCH_BCH 5           // MIB
 
 /*!\brief UE layer 2 status */
 typedef enum {
@@ -49,5 +49,32 @@ typedef enum {
     PHY_HO_PRACH
 } NR_UE_L2_STATE_t;
 
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t F:1;        // octet 1 [6]
+    uint8_t R:1;        // octet 1 [7]
+    uint8_t L:8;        // octet 2 [7:0]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_SHORT;
+
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t F:1;        // octet 1 [6]
+    uint8_t R:1;        // octet 1 [7]
+    uint8_t L1:8;       // octet 2 [7:0]
+    uint8_t L2:8;       // octet 3 [7:0]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_LONG;
+
+typedef struct {
+    uint8_t LCID:5;     // octet 1 [5:0]
+    uint8_t R:2;        // octet 1 [7:6]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_FIXED;
+
+#define DL_SCH_LCID_CCCH 0x0
+#define DL_SCH_LCID_R_BITRATE 0x2f
+#define DL_SCH_LCID_L_DRX 0x3b
+#define DL_SCH_LCID_DRX 0x3c
+#define DL_SCH_LCID_TA 0x3d
+#define DL_SCH_LCID_CONTENTION_RESOLUTION_ID 0x3e
+#define DL_SCH_LCID_PADDING 0x3f
 
 #endif /*__LAYER2_MAC_DEFS_H__ */

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -81,6 +81,7 @@ typedef struct {
     uint32_t type0_pdcch_ss_mux_pattern;
     SFN_C_TYPE type0_pdcch_ss_sfn_c;
     uint32_t type0_pdcch_ss_n_c;
+    uint32_t type0_pdcch_consecutive_slots;
 
     ///     Random access parameter
     uint16_t ra_rnti;

openair2/LAYER2/NR_MAC_UE/mac_extern.h

@@ -80,4 +80,4 @@ extern const float   table_38213_13_12_c1[16];
 extern const int32_t table_38213_13_12_c2[16];
 extern const float   table_38213_13_12_c3[16];
 
-extern const int32_t table_38213_10_1_1_c2[3];
\ No newline at end of file
+extern const int32_t table_38213_10_1_1_c2[5];
\ No newline at end of file

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -113,7 +113,7 @@ uint32_t ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP,
        uint8_t eNB_id, rnti_t rnti, sub_frame_t subframe);
 
 
-int8_t nr_ue_decode_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type);
+int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type);
 
 uint32_t get_ssb_frame(void);
 uint32_t get_ssb_slot(uint32_t ssb_index);

openair2/LAYER2/NR_MAC_UE/mac_vars.c

@@ -88,4 +88,4 @@ const float   table_38213_13_12_c1[16] = { 0, 0, 2.5f, 2.5f, 5, 5, 0, 2.5f, 5, 7
 const int32_t table_38213_13_12_c2[16] = { 1,  2,  1,  2,  1,  2,  2,  2,  2,  1,  2,  2,  1,  1,  reserved,  reserved}; // index 14-15 reserved
 const float   table_38213_13_12_c3[16] = { 1, 0.5f, 1, 0.5f, 1, 0.5f, 0.5f, 0.5f, 0.5f, 1, 0.5f, 0.5f, 1, 1,  reserved,  reserved}; // M, index 14-15 reserved
 
-const int32_t table_38213_10_1_1_c2[3] = { 4, 2, 1 };
\ No newline at end of file
+const int32_t table_38213_10_1_1_c2[5] = { 0, 0, 4, 2, 1 };
\ No newline at end of file

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -401,9 +401,11 @@ const uint32_t num_slot_per_frame = 20;
 
         coreset_duration = num_symbols * number_of_search_space_per_slot;
 
-        mac->type0_pdcch_dci_config.number_of_candidates[2] = table_38213_10_1_1_c2[0];   //  CCE aggregation level = 4
-        mac->type0_pdcch_dci_config.number_of_candidates[3] = table_38213_10_1_1_c2[1];   //  CCE aggregation level = 8
-        mac->type0_pdcch_dci_config.number_of_candidates[4] = table_38213_10_1_1_c2[2];   //  CCE aggregation level = 16
+        mac->type0_pdcch_dci_config.number_of_candidates[0] = table_38213_10_1_1_c2[0];
+        mac->type0_pdcch_dci_config.number_of_candidates[1] = table_38213_10_1_1_c2[1];
+        mac->type0_pdcch_dci_config.number_of_candidates[2] = table_38213_10_1_1_c2[2];   //  CCE aggregation level = 4
+        mac->type0_pdcch_dci_config.number_of_candidates[3] = table_38213_10_1_1_c2[3];   //  CCE aggregation level = 8
+        mac->type0_pdcch_dci_config.number_of_candidates[4] = table_38213_10_1_1_c2[4];   //  CCE aggregation level = 16
         mac->type0_pdcch_dci_config.duration = search_space_duration;
         mac->type0_pdcch_dci_config.coreset.duration = coreset_duration;   //  coreset
         mac->type0_pdcch_dci_config.monitoring_symbols_within_slot = (0x3fff << first_symbol_index) & (0x3fff >> (14-coreset_duration-first_symbol_index)) & 0x3fff;
@@ -462,9 +464,11 @@ NR_UE_L2_STATE_t nr_ue_scheduler(
             //	38.213 chapter 13
             if((mac->type0_pdcch_ss_sfn_c == SFN_C_MOD_2_EQ_0) && !(rx_frame & 0x1) && (rx_slot == mac->type0_pdcch_ss_n_c)){
             	search_space_mask = search_space_mask | type0_pdcch;
+                mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_dci_config.duration;
             }
             if((mac->type0_pdcch_ss_sfn_c == SFN_C_MOD_2_EQ_1) &&  (rx_frame & 0x1) && (rx_slot == mac->type0_pdcch_ss_n_c)){
             	search_space_mask = search_space_mask | type0_pdcch;
+                mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_dci_config.duration;
             }
             //if((mac->type0_pdcch_ss_sfn_c == SFN_C_EQ_SFN_SSB) && ( get_ssb_frame() )){
             //	search_space_mask = search_space_mask | type0_pdcch;
@@ -474,12 +478,14 @@ NR_UE_L2_STATE_t nr_ue_scheduler(
             //	38.213 Table 13-13, 13-14
             if((rx_frame == get_ssb_frame()) && (rx_slot == mac->type0_pdcch_ss_n_c)){
                 search_space_mask = search_space_mask | type0_pdcch;
+                mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_dci_config.duration;
             }
         }
         if(mac->type0_pdcch_ss_mux_pattern == 3){
         	//	38.213 Table 13-15
             if((rx_frame == get_ssb_frame()) && (rx_slot == mac->type0_pdcch_ss_n_c)){
                 search_space_mask = search_space_mask | type0_pdcch;
+                mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_dci_config.duration;
             }
         }
     }
@@ -498,13 +504,14 @@ NR_UE_L2_STATE_t nr_ue_scheduler(
         uint8_t format_2_3_number_of_candidates;
 #endif
     fapi_nr_dl_config_request_t *dl_config = &mac->dl_config_request;
-    if(search_space_mask & type0_pdcch){
+    if((search_space_mask & type0_pdcch) || ( mac->type0_pdcch_consecutive_slots != 0 )){
+        mac->type0_pdcch_consecutive_slots = mac->type0_pdcch_consecutive_slots - 1;
 
-        dl_config->dl_config_request_body[dl_config->number_pdus].dci_pdu.dci_config_rel15 = mac->type0_pdcch_dci_config;
-        dl_config->dl_config_request_body[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DCI;
+        dl_config->dl_config_list[dl_config->number_pdus].dci_pdu.dci_config_rel15 = mac->type0_pdcch_dci_config;
+        dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DCI;
         dl_config->number_pdus = dl_config->number_pdus + 1;
     	
-    	dl_config->dl_config_request_body[dl_config->number_pdus].dci_pdu.dci_config_rel15.rnti = 0xaaaa;	//	to be set
+    	dl_config->dl_config_list[dl_config->number_pdus].dci_pdu.dci_config_rel15.rnti = 0xaaaa;	//	to be set
     }
 
     if(search_space_mask & type0a_pdcch){
@@ -526,7 +533,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(
 	return CONNECTION_OK;
 }
 
-int8_t nr_ue_decode_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type){
+int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type){
 
     NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
 
@@ -550,4 +557,56 @@ int8_t nr_ue_decode_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fap
 int8_t nr_ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP, uint8_t eNB_id, uint16_t rnti, sub_frame_t subframe){
 
     return 0;
-}
\ No newline at end of file
+}
+
+
+
+void nr_ue_process_mac_pdu(
+    module_id_t module_idP,
+    uint8_t CC_id,
+    uint8_t *pduP, 
+    uint16_t pdu_len, 
+    uint8_t eNB_index){
+
+    uint8_t *pdu_ptr = pduP;
+    uint8_t sub_pdu_len;
+
+    //  variable-size MAC CE(known by LCID), padding, MSG3, MAC SDU
+    //  |0|1|2|3|4|5|6|7|  bit-wise
+    //  |R|F|   LCID    |
+    //  |       L       |
+
+    //  variable-size MAC CE(known by LCID), padding, MSG3, MAC SDU
+    //  |0|1|2|3|4|5|6|7|  bit-wise
+    //  |R|F|   LCID    |
+    //  |       L       |
+    //  |       L       |
+
+    //  fixed-size MAC CE(known by LCID), padding, MSG3
+    //  |0|1|2|3|4|5|6|7|  bit-wise
+    //  |R|R|   LCID    |
+
+    //  LCID: The Logical Channel ID field identifies the logical channel instance of the corresponding MAC SDU or the type of the corresponding MAC CE or padding as described in Tables 6.2.1-1 and 6.2.1-2 for the DL-SCH and UL-SCH respectively. There is one LCID field per MAC subheader. The LCID field size is 6 bits;
+    //  L: The Length field indicates the length of the corresponding MAC SDU or variable-sized MAC CE in bytes. There is one L field per MAC subheader except for subheaders corresponding to fixed-sized MAC CEs and padding. The size of the L field is indicated by the F field;
+    //  F: lenght of L is 8 or 16 bits wide
+    //  R: Reserved bit, set to zero.
+
+    
+    while (!done) {
+
+        switch(((NR_MAC_SUBHEADER_FIXED *)pdu_ptr)->LCID){
+            //  Control element
+            case DL_SCH_LCID_PADDING:
+                done = 1;
+                //  end of MAC PDU, there is nothing right after padding
+                break;
+
+            //  MAC SDU
+
+            default:
+                printf("[MAC] get lcid: %d which not support yet\n", ((NR_MAC_SUBHEADER_FIXED *)buf_ptr)->LCID);
+                break;
+        }
+        pdu_ptr += sub_pdu_len;
+    }
+}

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -62,7 +62,7 @@ int8_t handle_bcch_dlsch(module_id_t module_id, int cc_id, uint8_t gNB_index, ui
 //  L2 Abstraction Layer
 int8_t handle_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type){
 
-    return nr_ue_decode_dci(module_id, cc_id, gNB_index, dci, rnti, dci_type);
+    return nr_ue_process_dci(module_id, cc_id, gNB_index, dci, rnti, dci_type);
 
 }
 
@@ -157,10 +157,10 @@ int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
                 
                 case FAPI_NR_DCI_TYPE_1_0:
                     
-                    dl_config->dl_config_request_body[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DLSCH;
+                    dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DLSCH;
 
                     //  mapping into DL_CONFIG_REQ for DL-SCH
-                    fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu = &dl_config->dl_config_request_body[dl_config->number_pdus].dlsch_pdu.dlsch_config_rel15;
+                    fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu = &dl_config->dl_config_list[dl_config->number_pdus].dlsch_pdu.dlsch_config_rel15;
                     dlsch_config_pdu->format_indicator = dci->dci_format;
                     dlsch_config_pdu->frequency_domain_assignment = dci->frequency_domain_resouce_assignment;
                     dlsch_config_pdu->time_domain_assignment = dci->time_domain_resource_assignment;
@@ -174,7 +174,7 @@ int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
                     dlsch_config_pdu->pucch_resource_indicator = dci->pucch_resource_indicator;
                     dlsch_config_pdu->pdsch_to_harq_feedback_timing_indicator = dci->pdsch_to_harq_feedback_timing_indicator;
 
-                    dl_config->dl_config_request_body[dl_config->number_pdus].dlsch_pdu.dlsch_config_rel15.rnti = 0x0000;   //  TX RNTI: UE-spec
+                    dl_config->dl_config_list[dl_config->number_pdus].dlsch_pdu.dlsch_config_rel15.rnti = 0x0000;   //  TX RNTI: UE-spec
                     dl_config->number_pdus = dl_config->number_pdus + 1;
 
                     ret_mask |= (handle_dci(