Merge remote-tracking branch 'origin/f1ap-msg-encdec-tests' into integration_2024_w40b

common/5g_platform_types.h

@@ -0,0 +1,34 @@
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#ifndef FIVEG_PLATFORM_TYPES_H__
+#define FIVEG_PLATFORM_TYPES_H__
+
+#include <stdint.h>
+
+typedef struct nssai_s {
+  uint8_t sst;
+  uint32_t sd;
+} nssai_t;
+
+typedef enum { NON_DYNAMIC, DYNAMIC } fiveQI_t;
+
+#endif

common/ngran_types.h

@@ -55,5 +55,4 @@ typedef enum { CPtype = 0, UPtype } E1_t;
 #define NODE_IS_MBMS(nOdE_TyPe)       ((nOdE_TyPe) == ngran_eNB_MBMS_STA)
 #define GTPV1_U_PORT_NUMBER (2152)
 
-typedef enum { non_dynamic, dynamic } fiveQI_type_t;
 #endif