chenges to test 2 symbol pdcch

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -417,6 +417,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   if (is_nr_DL_slot(cc->ServingCellConfigCommon,slot_txP)) {
     memset(RC.nrmac[module_idP]->cce_list[bwp_id][0],0,MAX_NUM_CCE*sizeof(int)); // coreset0
     memset(RC.nrmac[module_idP]->cce_list[bwp_id][1],0,MAX_NUM_CCE*sizeof(int)); // coresetid 1
+    memset(RC.nrmac[module_idP]->cce_list[bwp_id][2],0,MAX_NUM_CCE*sizeof(int)); // coresetid 2
     for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
       //mbsfn_status[CC_id] = 0;
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -331,7 +331,7 @@ int configure_fapi_dl_pdu(int Mod_idP,
   pdsch_pdu_rel15->VRBtoPRBMapping = 1; // non-interleaved, check if this is ok for initialBWP
     // choose shortest PDSCH
   int startSymbolAndLength=0;
-  int time_domain_assignment=2;
+  int time_domain_assignment=1;
   int StartSymbolIndex,NrOfSymbols;
 
   AssertFatal(time_domain_assignment<bwp->bwp_Common->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list.count,"time_domain_assignment %d>=%d\n",time_domain_assignment,bwp->bwp_Common->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list.count);
@@ -407,7 +407,7 @@ int configure_fapi_dl_pdu(int Mod_idP,
     ss=bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList->list.array[i];
     AssertFatal(ss->controlResourceSetId != NULL,"ss->controlResourceSetId is null\n");
     AssertFatal(ss->searchSpaceType != NULL,"ss->searchSpaceType is null\n");
-    if (ss->searchSpaceType->present == target_ss) {
+    if (ss->searchSpaceId==3) {
       found=1;
       break;
     }

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -446,7 +446,7 @@ int nr_configure_pdcch(gNB_MAC_INST *nr_mac,
       if(coreset==NULL)
         AssertFatal(1==0,"Couldn't find coreset with id %ld\n",coresetid);
     }
-    
+
     pdcch_pdu->BWPSize  = NRRIV2BW(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
     pdcch_pdu->BWPStart = NRRIV2PRBOFFSET(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
     pdcch_pdu->SubcarrierSpacing = bwp->bwp_Common->genericParameters.subcarrierSpacing;

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -531,6 +531,36 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
  ASN_SEQUENCE_ADD(&bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list,
 		  coreset);
 
+ NR_ControlResourceSet_t *coreset2 = calloc(1,sizeof(*coreset));
+ coreset2->controlResourceSetId=2;
+ // frequencyDomainResources '11111111 11111111 00000000 00000000 00000000 00000'B,
+ coreset2->frequencyDomainResources.buf = calloc(1,6);
+ coreset2->frequencyDomainResources.buf[0] = 0xff;
+ coreset2->frequencyDomainResources.buf[1] = 0xff;
+ coreset2->frequencyDomainResources.buf[2] = 0;
+ coreset2->frequencyDomainResources.buf[3] = 0;
+ coreset2->frequencyDomainResources.buf[4] = 0;
+ coreset2->frequencyDomainResources.buf[5] = 0;
+ coreset2->frequencyDomainResources.size = 6;
+ coreset2->frequencyDomainResources.bits_unused = 3;
+ coreset2->duration=2;
+ coreset2->cce_REG_MappingType.present = NR_ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved;
+ coreset2->precoderGranularity = NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle;
+
+ coreset2->tci_StatesPDCCH_ToAddList=calloc(1,sizeof(*coreset2->tci_StatesPDCCH_ToAddList));
+ NR_TCI_StateId_t *tci2[8];
+ for (int i=0;i<8;i++) {
+   tci2[i]=calloc(1,sizeof(*tci[i]));
+   *tci2[i] = i;
+   ASN_SEQUENCE_ADD(&coreset2->tci_StatesPDCCH_ToAddList->list,tci2[i]);
+ }
+ coreset2->tci_StatesPDCCH_ToReleaseList = NULL;
+ coreset2->tci_PresentInDCI = NULL;
+ coreset2->pdcch_DMRS_ScramblingID = NULL;
+
+ ASN_SEQUENCE_ADD(&bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list,
+		  coreset2);
+
  bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList = calloc(1,sizeof(*bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList));
 
  NR_SearchSpace_t *ss2 = calloc(1,sizeof(*ss2));
@@ -562,6 +592,34 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
  ASN_SEQUENCE_ADD(&bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList->list,
 		  ss2);
 
+ NR_SearchSpace_t *ss3 = calloc(1,sizeof(*ss2));
+ ss3->searchSpaceId=3;
+ ss3->controlResourceSetId=calloc(1,sizeof(*ss2->controlResourceSetId));
+ *ss3->controlResourceSetId=2;
+ ss3->monitoringSlotPeriodicityAndOffset=calloc(1,sizeof(*ss2->monitoringSlotPeriodicityAndOffset));
+ ss3->monitoringSlotPeriodicityAndOffset->present = NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
+ ss3->monitoringSlotPeriodicityAndOffset->choice.sl1=(NULL_t)0;
+ ss3->duration=NULL;
+ ss3->monitoringSymbolsWithinSlot = calloc(1,sizeof(*ss2->monitoringSymbolsWithinSlot));
+ ss3->monitoringSymbolsWithinSlot->buf = calloc(1,2);
+ ss3->monitoringSymbolsWithinSlot->size = 2;
+ ss3->monitoringSymbolsWithinSlot->bits_unused = 2;
+ ss3->monitoringSymbolsWithinSlot->buf[0]=0xc0;
+ ss3->monitoringSymbolsWithinSlot->buf[1]=0x0;
+ ss3->nrofCandidates=calloc(1,sizeof(*ss2->nrofCandidates));
+ ss3->nrofCandidates->aggregationLevel1 = NR_SearchSpace__nrofCandidates__aggregationLevel1_n0;
+ ss3->nrofCandidates->aggregationLevel2 = NR_SearchSpace__nrofCandidates__aggregationLevel2_n0;
+ ss3->nrofCandidates->aggregationLevel4 = NR_SearchSpace__nrofCandidates__aggregationLevel4_n4;
+ ss3->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel8_n0;
+ ss3->nrofCandidates->aggregationLevel16 = NR_SearchSpace__nrofCandidates__aggregationLevel16_n0;
+ ss3->searchSpaceType=calloc(1,sizeof(*ss2->searchSpaceType));
+ ss3->searchSpaceType->present = NR_SearchSpace__searchSpaceType_PR_ue_Specific;
+ ss3->searchSpaceType->choice.ue_Specific = calloc(1,sizeof(*ss2->searchSpaceType->choice.ue_Specific));
+ ss3->searchSpaceType->choice.ue_Specific->dci_Formats=NR_SearchSpace__searchSpaceType__ue_Specific__dci_Formats_formats0_1_And_1_1;
+
+ ASN_SEQUENCE_ADD(&bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList->list,
+		  ss3);
+
 
  bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToReleaseList = NULL;