debugging of DCI indication and UE-FAPI interface

cmake_targets/CMakeLists.txt

@@ -2559,7 +2559,7 @@ add_executable(nr_pbchsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURC
 target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
 
 add_executable(nr_dlsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c ${T_SOURCE})   
-target_link_libraries(nr_dlsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+target_link_libraries(nr_dlsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR RRC_LIB NR_RRC_LIB CONFIG_LIB L2_NR -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
 
 
 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)

cmake_targets/phy_simulators/CMakeLists.txt

@@ -3,11 +3,11 @@ set(PACKAGE_NAME "unitary_tests_simulators")
 set(PHYSIM True)
 set(RF_BOARD None)
 set(XFORMS True)
-set(ENABLE_ITTI False)
+set(ENABLE_ITTI True)
 set(DEBUG_PHY False)
 set(MU_RECIEVER False)
 set(NAS_UE False)
 set(MESSAGE_CHART_GENERATOR False)
-set(RRC_ASN1_VERSION "Rel14")
+set(RRC_ASN1_VERSION "Rel15")
 set(T_TRACER True)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -53,6 +53,7 @@
 #include "NR_PHY_INTERFACE/NR_IF_Module.h"
 #include "NR_UE_PHY_INTERFACE/NR_IF_Module.h"
 
+
 PHY_VARS_gNB *gNB;
 PHY_VARS_NR_UE *UE;
 RAN_CONTEXT_t RC;
@@ -105,6 +106,7 @@ void config_common(int Mod_idP,
                    uint32_t dl_BandwidthP
 		   );
 
+
 // needed for some functions
 PHY_VARS_NR_UE ***PHY_vars_UE_g;
 uint16_t conjugate[8]__attribute__((aligned(32))) = {-1,1,-1,1,-1,1,-1,1};
@@ -475,7 +477,7 @@ int main(int argc, char **argv)
   memcpy(&UE->frame_parms,frame_parms,sizeof(NR_DL_FRAME_PARMS));
 
   if (run_initial_sync==1)  UE->is_synchronized = 0;
-  else                      UE->is_synchronized = 1;
+  else                      {UE->is_synchronized = 1; UE->UE_mode[0]=PUSCH;}
                       
   UE->perfect_ce = 0;
 
@@ -500,7 +502,7 @@ int main(int argc, char **argv)
   UE->if_inst = nr_ue_if_module_init(0);
   UE->if_inst->scheduled_response = nr_ue_scheduled_response;
   UE->if_inst->phy_config_request = nr_ue_phy_config_request;
-  UE->if_inst->dl_indication = dummy_nr_ue_dl_indication;
+  UE->if_inst->dl_indication = nr_ue_dl_indication;
   UE->if_inst->ul_indication = dummy_nr_ue_ul_indication;
   
 
@@ -582,6 +584,13 @@ int main(int argc, char **argv)
 
 
   //Configure UE
+  rrc_gNB_carrier_data_t carrier;
+  uint32_t pdcch_ConfigSIB1     = 0;
+  uint32_t ssb_SubcarrierOffset = 0;
+  carrier.MIB = (uint8_t*) malloc(4);
+  carrier.sizeof_MIB = do_MIB_NR(&carrier,0,ssb_SubcarrierOffset,pdcch_ConfigSIB1,30,2);
+
+  nr_rrc_mac_config_req_ue(0,0,0,carrier.mib.message.choice.mib,NULL,NULL,NULL);
   fapi_nr_dl_config_request_t dl_config; 
   //  Type0 PDCCH search space
   dl_config.number_pdus =  1;

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -62,13 +62,14 @@ int handle_bcch_dlsch(module_id_t module_id, int cc_id, unsigned int gNB_index,
 //  L2 Abstraction Layer
 int handle_dci(module_id_t module_id, int cc_id, unsigned int gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type){
 
+  printf("handle_dci: rnti %x,dci_type %d\n",rnti,dci_type);
   return nr_ue_process_dci(module_id, cc_id, gNB_index, dci, rnti, dci_type);
 
 }
 //  L2 Abstraction Layer
 int8_t handle_dlsch (module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_indication_t *dci_ind, uint8_t *pduP, uint32_t pdu_len){
 
-//    return 0;
+  //    return 0;
   return nr_ue_process_dlsch( module_id,
 			      cc_id,
 			      gNB_index,
@@ -131,7 +132,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
   if(dl_info->dci_ind != NULL){
     printf("[L2][IF MODULE][DL INDICATION][DCI_IND]\n");
     for(i=0; i<dl_info->dci_ind->number_of_dcis; ++i){
-			//printf(">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n",i,dl_info->dci_ind->number_of_dcis);
+      printf(">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n",i,dl_info->dci_ind->number_of_dcis);
       fapi_nr_dci_pdu_rel15_t *dci = &dl_info->dci_ind->dci_list[i].dci;
 
       ret_mask |= (handle_dci(
@@ -209,7 +210,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
 				       (dl_info->rx_ind->rx_indication_body+i)->sib_pdu.pdu_length )) << FAPI_NR_RX_PDU_TYPE_SIB;
 	break;
       case FAPI_NR_RX_PDU_TYPE_DLSCH:
-//                    ret_mask |= (0) << FAPI_NR_RX_PDU_TYPE_DLSCH;
+	//                    ret_mask |= (0) << FAPI_NR_RX_PDU_TYPE_DLSCH;
 	ret_mask |= (handle_dlsch(dl_info->module_id, dl_info->cc_id, dl_info->gNB_index, &dl_info->dci_ind,
 				  (dl_info->rx_ind->rx_indication_body+i)->pdsch_pdu.pdu,
 				  (dl_info->rx_ind->rx_indication_body+i)->pdsch_pdu.pdu_length)) << FAPI_NR_RX_PDU_TYPE_DLSCH;

openair2/RRC/LTE/MESSAGES/asn1_msg.c

@@ -39,7 +39,7 @@
 #include <asn_application.h>
 #include <asn_internal.h> /* for _ASN_DEFAULT_STACK_MAX */
 #include <per_encoder.h>
-
+//#include "COMMON/messages_types.h"
 #include "assertions.h"
 #include "RRCConnectionRequest.h"
 #include "UL-CCCH-Message.h"

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -42,7 +42,6 @@
 
 #include "asn1_msg.h"
 #include "RRC/NR/nr_rrc_extern.h"
-
 #if defined(NR_Rel15)
 #include "NR_SCS-SpecificCarrier.h"
 #include "NR_TDD-UL-DL-ConfigCommon.h"