fix sched test check for ConRes DCI format.

srsenb/src/stack/mac/sched_ue.cc

@@ -507,7 +507,7 @@ int sched_ue::generate_format1(uint32_t                          pid,
     uint32_t     RB_start = prb_int.start();
     dci->type2_alloc.riv  = srslte_ra_type2_to_riv(L_crb, RB_start, cell.nof_prb);
     dci->format           = SRSLTE_DCI_FORMAT1A;
-    if (L_crb != cell_nof_rbg_to_prb(user_mask.size())) {
+    if (L_crb != count_prb_per_tb(user_mask)) {
       // This happens if Type0 was using distributed allocation
       Warning("SCHED: Can't use distributed RA due to DCI size ambiguity\n");
     }

srsenb/test/mac/sched_ue_ded_test_suite.cc

@@ -292,7 +292,9 @@ int test_ra(const sim_enb_ctxt_t& enb_ctxt, const sf_output_res_t& sf_out)
             for (uint32_t j = 0; j < dl_cc_res.data[i].nof_pdu_elems[0]; ++j) {
               if (dl_cc_res.data[i].pdu[0][j].lcid == (uint32_t)srslte::dl_sch_lcid::CON_RES_ID) {
                 // ConRes found
-                CONDERROR(dl_cc_res.data[i].dci.format != SRSLTE_DCI_FORMAT1, "ConRes must be format1\n");
+                CONDERROR(dl_cc_res.data[i].dci.format != SRSLTE_DCI_FORMAT1 and
+                              dl_cc_res.data[i].dci.format != SRSLTE_DCI_FORMAT1A,
+                          "ConRes must be format1/1a\n");
                 msg4_count++;
               }
             }