fixed bugs in pucch and scheduled more slots

openair1/PHY/NR_TRANSPORT/pucch_rx.c

@@ -67,7 +67,7 @@ int nr_find_pucch(uint16_t rnti,
   AssertFatal(gNB!=NULL,"gNB is null\n");
   int index = -1;
 
-  for (int i=0; i<NUMBER_OF_NR_ULSCH_MAX; i++) {
+  for (int i=0; i<NUMBER_OF_NR_PUCCH_MAX; i++) {
     AssertFatal(gNB->pucch[i]!=NULL,"gNB->pucch[%d] is null\n",i);
     if ((gNB->pucch[i]->active >0) &&
         (gNB->pucch[i]->pucch_pdu.rnti==rnti) &&

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -477,7 +477,7 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
 	  (pucch->frame == frame_rx) &&
 	  (pucch->slot == slot_rx) ) {
 
-        nfapi_nr_pucch_pdu_t  *pucch_pdu = &pucch[i].pucch_pdu;
+        nfapi_nr_pucch_pdu_t  *pucch_pdu = &pucch->pucch_pdu;
         uint16_t num_ucis;
 
         switch (pucch_pdu->format_type) {

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -447,14 +447,21 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   ulsch_in_slot_bitmap = &RC.nrmac[module_idP]->UE_list.UE_sched_ctrl[UE_id].ulsch_in_slot_bitmap;  // static bitmap signaling which slot in a tdd period contains ulsch
 
   // hardcoding dlsch to be in slot 1
-  if (!(slot%num_slots_per_tdd)) {
-    if(slot==0) {
-      *dlsch_in_slot_bitmap = 0x02;
-      *ulsch_in_slot_bitmap = 0x100;
+  if (get_softmodem_params()->phy_test) {
+    if (slot==0) {
+      *dlsch_in_slot_bitmap = 0x1FC3E; // 1 to 6 & 10 to 16
+      *ulsch_in_slot_bitmap = 0xC0300; // 8,9,18,19
     }
-    else {
-      *dlsch_in_slot_bitmap = 0x00;
-      *ulsch_in_slot_bitmap = 0x00;
+  } else {
+    if (!(slot%num_slots_per_tdd)) {
+      if(slot==0) {
+        *dlsch_in_slot_bitmap = 0x02;
+        *ulsch_in_slot_bitmap = 0x100;
+      }
+      else {
+        *dlsch_in_slot_bitmap = 0x00;
+        *ulsch_in_slot_bitmap = 0x00;
+      }
     }
   }