Removed reportConfig dump funciton

Also removed the [eNB_index + 1] saving/writing
in the process_MeasObj function. This indexing
was incorrect. Also cleaned up the code, fixed
ssRSRB -> ssbRSRP. Lastly, added assertFatals
around indexing in process_measObj function.

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

@@ -1007,8 +1007,8 @@ typedef struct {
   /// A value indicating how the BCH payload is generated. This should match the PARAM/CONFIG TLVs. Value: 0: MAC generates the full PBCH payload, see Table 3-41, where bchPayload has 31 bits 1: PHY generates the timing PBCH bits, see Table 3-41, where the bchPayload has 24 bits 2: PHY generates the full PBCH payload
   uint8_t  bchPayloadFlag;
   uint32_t bchPayload;
-  /// A value indicating the channel quality between the gNB and nrUE. Value: 0->255 dBM (ssbRSRP)
-  uint8_t  ssRSRB;
+  /// A value indicating the channel quality between the gNB and nrUE. Value: 0->255 dBM
+  uint8_t  ssbRsrp;
   nfapi_nr_tx_precoding_and_beamforming_t precoding_and_beamforming;
 } nfapi_nr_dl_tti_ssb_pdu_rel15_t;
 

nfapi/open-nFAPI/nfapi/src/nfapi_p7.c

@@ -372,7 +372,7 @@ static uint8_t pack_dl_tti_ssb_pdu_rel15_value(void* tlv, uint8_t **ppWritePacke
 		push16(value->ssbOffsetPointA, ppWritePackedMsg, end) &&
 		push8(value->bchPayloadFlag, ppWritePackedMsg, end) &&
 		push32(value->bchPayload, ppWritePackedMsg, end) &&
-		push8(value->ssRSRB, ppWritePackedMsg, end)
+		push8(value->ssbRsrp, ppWritePackedMsg, end)
 		// TODO: pack precoding_and_beamforming too
 	);
 
@@ -3876,7 +3876,7 @@ static uint8_t unpack_dl_tti_ssb_pdu_rel15_value(void* tlv, uint8_t **ppReadPack
 		pull16(ppReadPackedMsg, &value->ssbOffsetPointA, end) &&
 		pull8(ppReadPackedMsg, &value->bchPayloadFlag, end) &&
 		pull32(ppReadPackedMsg, &value->bchPayload, end) &&
-		pull8(ppReadPackedMsg, &value->ssRSRB, end)
+		pull8(ppReadPackedMsg, &value->ssbRsrp, end)
 		// TODO: pack precoding_and_beamforming too
 	);
 

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -150,8 +150,8 @@ static void save_nr_measurement_info(nfapi_nr_dl_tti_request_t *dl_tti_request)
                 pdu_list->ssb_pdu.ssb_pdu_rel15.SsbBlockIndex,
                 pdu_list->ssb_pdu.ssb_pdu_rel15.SsbSubcarrierOffset,
                 pdu_list->ssb_pdu.ssb_pdu_rel15.bchPayload);
-            pdu_list->ssb_pdu.ssb_pdu_rel15.ssRSRB = 60;
-            LOG_D(NR_RRC, "Setting pdulist[%d].ssRSRB to %d\n", i, pdu_list->ssb_pdu.ssb_pdu_rel15.ssRSRB);
+            pdu_list->ssb_pdu.ssb_pdu_rel15.ssbRsrp = 60;
+            LOG_D(NR_RRC, "Setting pdulist[%d].ssbRsrp to %d\n", i, pdu_list->ssb_pdu.ssb_pdu_rel15.ssbRsrp);
         }
     }
 

openair2/RRC/LTE/rrc_defs.h

@@ -324,9 +324,9 @@ typedef enum SL_TRIGGER_e {
 #define RRM_CALLOC(t,n)   (t *) malloc16( sizeof(t) * n)
 #define RRM_CALLOC2(t,s)  (t *) malloc16( s )
 
-#define MAX_MEAS_OBJ 6
-#define MAX_MEAS_CONFIG 6
-#define MAX_MEAS_ID 6
+#define MAX_MEAS_OBJ 7
+#define MAX_MEAS_CONFIG 7
+#define MAX_MEAS_ID 7
 
 #define PAYLOAD_SIZE_MAX 1024
 #define RRC_BUF_SIZE 255

openair2/RRC/LTE/rrc_eNB.c

@@ -4583,7 +4583,7 @@ rrc_eNB_process_MeasurementReport(
   }
 
   /* TODO: improve NR triggering */
-  if (measResults2->measId == 7) {
+  if (measResults2->measId == 7) { //Melissa this is where we finish step 26
     if ((ue_context_pP->ue_context.Status != RRC_NR_NSA) && (ue_context_pP->ue_context.Status != RRC_NR_NSA_RECONFIGURED)) {
       MessageDef      *msg;
       ue_context_pP->ue_context.Status = RRC_NR_NSA;

openair2/RRC/NR/nr_rrc_defs.h

@@ -122,9 +122,9 @@ typedef enum UE_STATE_NR_e {
 #define RRM_CALLOC(t,n)   (t *) malloc16( sizeof(t) * n)
 #define RRM_CALLOC2(t,s)  (t *) malloc16( s )
 
-#define MAX_MEAS_OBJ                                  6
-#define MAX_MEAS_CONFIG                               6
-#define MAX_MEAS_ID                                   6
+#define MAX_MEAS_OBJ                                  7
+#define MAX_MEAS_CONFIG                               7
+#define MAX_MEAS_ID                                   7
 
 #define PAYLOAD_SIZE_MAX                              1024
 #define RRC_BUF_SIZE                                  255

openair2/RRC/NR_UE/rrc_defs.h

@@ -59,9 +59,9 @@
 #define NB_CNX_UE 2//MAX_MANAGED_RG_PER_MOBILE
 #define NB_SIG_CNX_UE 2 //MAX_MANAGED_RG_PER_MOBILE
 
-#define MAX_MEAS_OBJ 6
-#define MAX_MEAS_CONFIG 6
-#define MAX_MEAS_ID 6
+#define MAX_MEAS_OBJ 7
+#define MAX_MEAS_CONFIG 7
+#define MAX_MEAS_ID 7
 
 typedef uint32_t channel_t;