reworking extraction of csi meas report (first version)

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

@@ -1571,8 +1571,7 @@ typedef struct
 {
   uint8_t  csi_part1_crc;
   uint16_t csi_part1_bit_len;
-  //! fixme
-  uint8_t*  csi_part1_payload;//uint8_t[ceil(csiPart1BitLen/8)]
+  uint8_t*  csi_part1_payload;
   
 } nfapi_nr_csi_part1_pdu_t;
 
@@ -1581,8 +1580,7 @@ typedef struct
 {
   uint8_t  csi_part2_crc;
   uint16_t csi_part2_bit_len;
-  //! fixme
-  uint8_t*  csi_part2_payload;//uint8_t[ceil(csiPart2BitLen/8)]
+  uint8_t*  csi_part2_payload;
 } nfapi_nr_csi_part2_pdu_t;
 
 //table 3-63

openair1/SCHED_NR/fapi_nr_l1.c

@@ -137,7 +137,7 @@ void handle_nfapi_nr_csirs_pdu(PHY_VARS_gNB *gNB,
   for (int id=0; id<NUMBER_OF_NR_CSIRS_MAX; id++) {
     NR_gNB_CSIRS_t *csirs = &gNB->csirs_pdu[id];
     if (csirs->active == 0) {
-      LOG_I(PHY,"Frame %d Slot %d CSI_RS with ID %d is now active\n",frame,slot,id);
+      LOG_D(PHY,"Frame %d Slot %d CSI_RS with ID %d is now active\n",frame,slot,id);
       csirs->frame = frame;
       csirs->slot = slot;
       csirs->active = 1;
@@ -219,7 +219,7 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
 
       break;
       case NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE:
-        LOG_I(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
+        LOG_D(PHY,"frame %d, slot %d, Got NFAPI_NR_DL_TTI_CSI_RS_PDU_TYPE for %d.%d\n",frame,slot,DL_req->SFN,DL_req->Slot);
         handle_nfapi_nr_csirs_pdu(gNB,
 				  frame, slot,
 				  &dl_tti_pdu->csi_rs_pdu);

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -387,7 +387,8 @@ struct CRI_RI_LI_PMI_CQI {
   uint8_t li;
   uint8_t pmi_x1;
   uint8_t pmi_x2;
-  uint8_t cqi;
+  uint8_t wb_cqi_1tb;
+  uint8_t wb_cqi_2tb;
 };
 
 typedef struct CRI_SSB_RSRP {