SIM-115: update simulator to use latest E2SM KPM version 3

[sim/e2-interface.git] / e2sim / e2sm_examples / kpm_e2sm / src / kpm / encode_kpm.hpp

diff --git a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/encode_kpm.hpp b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/encode_kpm.hpp
index 96314ab..77b2783 100755 (executable)
--- a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/encode_kpm.hpp
+++ b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/encode_kpm.hpp
@@ -20,14 +20,24 @@
 #define ENCODE_KPM_HPP
 
 extern "C" {
-  #include "OCUCP-PF-Container.h"
   #include "OCTET_STRING.h"
   #include "asn_application.h"
+  #include "GranularityPeriod.h"
+  #include "TimeStamp.h"
+  #include "E2SM-KPM-IndicationHeader-Format1.h"
+  #include "E2SM-KPM-IndicationMessage-Format1.h"
   #include "E2SM-KPM-IndicationMessage.h"
   #include "E2SM-KPM-IndicationHeader.h"  
-  #include "FQIPERSlicesPerPlmnListItem.h"
   #include "E2SM-KPM-RANfunction-Description.h"
-  #include "Timestamp.h"
+  #include "RIC-EventTriggerStyle-Item.h"
+  #include "RIC-ReportStyle-Item.h"
+  #include "MeasurementDataItem.h"
+  #include "MeasurementRecordItem.h"
+  #include "MeasurementInfo-Action-Item.h"
+  #include "MeasurementInfoList.h"
+  #include "MeasurementInfoItem.h"
+  #include "LabelInfoItem.h"
+  #include "S-NSSAI.h"
 }
 
 void encode_kpm(E2SM_KPM_IndicationMessage_t* indicationmessage);
@@ -36,33 +46,16 @@ void encode_kpm_bak(E2SM_KPM_IndicationMessage_t* indicationmessage);
 
 void encode_kpm_function_description(E2SM_KPM_RANfunction_Description_t* ranfunc_desc);
 
-void encode_kpm_report_style5(E2SM_KPM_IndicationMessage_t* indicationmessage);
-
-void encode_kpm_odu_user_level(RAN_Container_t *ranco);
-
-void encode_kpm_ocucp_user_level(RAN_Container_t *ranco);
-
-void encode_e2sm_kpm_indication_header(E2SM_KPM_IndicationHeader_t *ihead, uint8_t *plmnid_buf, uint8_t *sst_buf, uint8_t *sd_buf, long fqival, long qcival, uint8_t *nrcellid_buf, uint8_t *gnbid_buf, int gnbid_unused, uint8_t *cuupid_buf, uint8_t *duid_buf, uint8_t *cuupname_buf);
-
-void encode_kpm_ocuup_user_level(RAN_Container_t *ranco);
-
 void encode_kpm_report_rancontainer_du(E2SM_KPM_IndicationMessage_t *indMsg);
 
-void encode_kpm_report_rancontainer_cucp(E2SM_KPM_IndicationMessage_t *indMsg);
-
-void encode_kpm_report_rancontainer_cuup(E2SM_KPM_IndicationMessage_t *indMsg);
-
 void encode_kpm_report_style1(E2SM_KPM_IndicationMessage_t* indicationmessage);
 
-void encode_kpm_report_rancontainer_du_parameterized(E2SM_KPM_IndicationMessage_t *indMsg, uint8_t *plmnid_buf, uint8_t *nrcellid_buf, uint8_t *crnti_buf, long prb_usage_dl, long prb_usage_ul);
-
-void encode_kpm_report_rancontainer_cucp_parameterized(E2SM_KPM_IndicationMessage_t* indicationmessage,uint8_t *plmnid_buf,uint8_t *nrcellid_buf,uint8_t *crnti_buf,const uint8_t *serving_buf, const uint8_t *neighbor_buf);
+void kpm_report_indication_header_initialized(E2SM_KPM_IndicationHeader_t *ihead, uint8_t *plmnid_buf, uint8_t *sst_buf, uint8_t *sd_buf, long fqival, long qcival, uint8_t *nrcellid_buf, uint8_t *gnbid_buf, int gnbid_unused, uint8_t *cuupid_buf, uint8_t *duid_buf, uint8_t *cuupname_buf);
 
-void encode_kpm_report_rancontainer_cuup_parameterized(E2SM_KPM_IndicationMessage_t* indicationmessage, uint8_t *plmnid_buf, uint8_t *nrcellid_buf, uint8_t *crnti_buf,int pdcp_bytesdl, int pdcp_bytesul);
+void ue_meas_kpm_report_indication_message_initialized(E2SM_KPM_IndicationMessage_t* indicationmessage,uint8_t *nrcellid_buf,uint8_t *crnti_buf,const uint8_t *serving_buf, const uint8_t *neighbor_buf);
 
-void encode_kpm_report_style1_parameterized(E2SM_KPM_IndicationMessage_t* indicationmessage, long fiveqi, long dl_prb_usage, long ul_prb_usage, uint8_t* sst_buf, uint8_t* sd_buf, uint8_t* plmnid_buf, uint8_t* nrcellid_buf, long *dl_prbs, long *ul_prbs);
+void cell_meas_kpm_report_indication_message_style_1_initialized(E2SM_KPM_IndicationMessage_t* indicationmessage, long fiveqi, long dl_prb_usage, long ul_prb_usage, uint8_t* nrcellid_buf, long *dl_prbs, long *ul_prbs);
 
-void encode_kpm_report_style5_parameterized(E2SM_KPM_IndicationMessage_t* indicationmessage, uint8_t *gnbcuupname_buf, int bytes_dl,int bytes_ul, uint8_t *sst_buf, uint8_t *sd_buf, uint8_t *plmnid_buf);
 
 
 #endif