Commit a65cb3bf authored by General ABS's avatar General ABS Committed by rmagueta

Get target_Nid_cell from measurementReport

parent 63da46f3
......@@ -1002,7 +1002,7 @@ uint8_t do_RRCSetupComplete(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size,
}
// TODO: Improve this function that is all hardcoded
uint16_t do_nrMeasurementReport_SA(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size, uint8_t rsrp_s) {
uint16_t do_nrMeasurementReport_SA(NR_MeasurementReport_t *measurementReport, uint8_t *buffer, size_t buffer_size, uint8_t rsrp_s) {
asn_enc_rval_t enc_rval;
NR_UL_DCCH_Message_t ul_dcch_msg;
......@@ -1012,7 +1012,7 @@ uint16_t do_nrMeasurementReport_SA(uint8_t Mod_id, uint8_t *buffer, size_t buffe
ul_dcch_msg.message.choice.c1 = CALLOC(1,sizeof(struct NR_UL_DCCH_MessageType__c1));
ul_dcch_msg.message.choice.c1->present = NR_UL_DCCH_MessageType__c1_PR_measurementReport;
NR_MeasurementReport_t *measurementReport = CALLOC(1,sizeof(struct NR_MeasurementReport));
memset(measurementReport, 0, sizeof(struct NR_MeasurementReport));
ul_dcch_msg.message.choice.c1->choice.measurementReport = measurementReport;
measurementReport->criticalExtensions.present = NR_MeasurementReport__criticalExtensions_PR_measurementReport;
......
......@@ -146,7 +146,7 @@ uint8_t do_RRCSetupComplete(uint8_t Mod_id,
const int dedicatedInfoNASLength,
const char *dedicatedInfoNAS);
uint16_t do_nrMeasurementReport_SA(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size, uint8_t rsrp_s);
uint16_t do_nrMeasurementReport_SA(NR_MeasurementReport_t *measurementReport, uint8_t *buffer, size_t buffer_size, uint8_t rsrp_s);
uint8_t do_RRCSetupRequest(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size, uint8_t *rv);
......
......@@ -62,7 +62,7 @@
#include "NR_CellGroupConfig.h"
#include "NR_ServingCellConfigCommon.h"
#include "NR_EstablishmentCause.h"
#include "NR_MeasurementReport.h"
//-------------------
#include "intertask_interface.h"
......
......@@ -190,6 +190,7 @@ typedef struct NR_UE_RRC_INST_s {
NR_ServingCellConfigCommonSIB_t *servingCellConfigCommonSIB;
NR_CellGroupConfig_t *scell_group_config;
NR_RadioBearerConfig_t *radio_bearer_config;
NR_MeasurementReport_t *measurementReport;
NR_MeasObjectToAddMod_t *MeasObj[NB_CNX_UE][MAX_MEAS_OBJ];
NR_ReportConfigToAddMod_t *ReportConfig[NB_CNX_UE][MAX_MEAS_CONFIG];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment