maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_SA_RRC' into develop_SA_SIM

Browse Source 
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
This commit is contained in:
Wu.Jing
2020-10-26 07:30:18 +00:00
parent d5f95c6c79 92ba7dc249
commit a9b76b5341
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/GNB_APP/gnb_paramdef.h
-2
View File
@@ -246,7 +246,6 @@ typedef struct ccparams_nr_x2 {
#define GNB_SLICE_SERIVE_TYPE_IDX 0 #define GNB_SLICE_SERIVE_TYPE_IDX 0
#define GNB_SLICE_DIFFERENTIATOR_IDX 1 #define GNB_SLICE_DIFFERENTIATOR_IDX 1
#define GNBSNSSAIPARAMS_DESC { \ #define GNBSNSSAIPARAMS_DESC { \
/* optname helpstr paramflags XXXptr def val type numelt */ \ /* optname helpstr paramflags XXXptr def val type numelt */ \
{GNB_CONFIG_STRING_SLICE_SERIVE_TYPE, "slice serive type", 0, uptr:NULL, defuintval:1, TYPE_UINT, 0}, \ {GNB_CONFIG_STRING_SLICE_SERIVE_TYPE, "slice serive type", 0, uptr:NULL, defuintval:1, TYPE_UINT, 0}, \
@@ -260,7 +259,6 @@ typedef struct ccparams_nr_x2 {
{ .s5 = { NULL } }, \ { .s5 = { NULL } }, \
} }
/* AMF configuration parameters section name */ /* AMF configuration parameters section name */
#define GNB_CONFIG_STRING_AMF_IP_ADDRESS "amf_ip_address" #define GNB_CONFIG_STRING_AMF_IP_ADDRESS "amf_ip_address"