Commit a76c9690 authored by yankuo's avatar yankuo

fix Bug:oxgrf_lib.c and modify config

parent 51fd34f5
...@@ -589,7 +589,7 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) { ...@@ -589,7 +589,7 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg) {
LOG_I(HW, "[oxgrf] device type: IQX%d(Split Mode)\n", model - 2); LOG_I(HW, "[oxgrf] device type: IQX%d(Split Mode)\n", model - 2);
} else if(model == 6000 || model == 7000 || model == 7100) { } else if(model == 6000 || model == 7000 || model == 7100) {
oxgrf->BoardType = IQX7000; oxgrf->BoardType = IQX7000;
shift = 4; shift = 2;
LOG_I(HW, "[oxgrf] device type: IQX%d\n", model); LOG_I(HW, "[oxgrf] device type: IQX%d\n", model);
} else { } else {
oxgrf->BoardType = UNKNOWN; oxgrf->BoardType = UNKNOWN;
......
Active_gNBs = ( "gNB-OAI"); Active_gNBs = ( "gNB-OpenXG");
# Asn1_verbosity, choice in: none, info, annoying # Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none"; Asn1_verbosity = "none";
...@@ -7,21 +7,20 @@ gNBs = ...@@ -7,21 +7,20 @@ gNBs =
{ {
////////// Identification parameters: ////////// Identification parameters:
gNB_ID = 0xe00; gNB_ID = 0xe00;
gNB_name = "gNB-OAI"; gNB_name = "gNB-OpenXG";
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; tracking_area_code = 100;
plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }); }); plmn_list = ({ mcc = 466; mnc = 92; mnc_length = 2; snssaiList = ({ sst = 1; }) });
nr_cellid = 12345678L; nr_cellid = 12345678L;
////////// Physical parameters: ////////// Physical parameters:
min_rxtxtime = 6;
pdsch_AntennaPorts_XP = 2; pdsch_AntennaPorts_XP = 2;
pusch_AntennaPorts = 2; pusch_AntennaPorts = 2;
do_CSIRS = 1; do_CSIRS = 1;
do_SRS = 1; do_SRS = 1;
ul_prbblacklist = "51,52,53,54"
servingCellConfigCommon = ( servingCellConfigCommon = (
{ {
...@@ -32,10 +31,10 @@ gNBs = ...@@ -32,10 +31,10 @@ gNBs =
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68 # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
absoluteFrequencySSB = 621312; # 641280 absoluteFrequencySSB = 641280; # 621312
dl_frequencyBand = 78; dl_frequencyBand = 78;
# this is 3300.60 MHz # this is 3300.60 MHz
dl_absoluteFrequencyPointA = 620040; # 640008 dl_absoluteFrequencyPointA = 640008; # 620040
#scs-SpecificCarrierList #scs-SpecificCarrierList
dl_offstToCarrier = 0; dl_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
...@@ -161,20 +160,13 @@ gNBs = ...@@ -161,20 +160,13 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.0.80"; #"192.168.70.132"; amf_ip_address = ({ ipv4 = "172.11.200.14"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
GNB_INTERFACE_NAME_FOR_NG_AMF = "demo-oai"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.11.200.1/24";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.0.202"; #"192.168.70.129/24"; GNB_IPV4_ADDRESS_FOR_NGU = "172.11.200.1/24";
GNB_INTERFACE_NAME_FOR_NGU = "demo-oai";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.0.202"; #"192.168.70.129/24";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
...@@ -186,10 +178,8 @@ MACRLCs = ( ...@@ -186,10 +178,8 @@ MACRLCs = (
num_cc = 1; num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 300; #pusch_TargetSNRx10 = 150;
pucch_TargetSNRx10 = 300; #pucch_TargetSNRx10 = 200;
pusch_FailureThres = 1000;
ulsch_max_frame_inactivity = 0;
} }
); );
...@@ -216,10 +206,11 @@ RUs = ( ...@@ -216,10 +206,11 @@ RUs = (
##beamforming 1x2 matrix: 1 layer x 2 antennas ##beamforming 1x2 matrix: 1 layer x 2 antennas
bf_weights = [0x00007fff, 0x0000]; bf_weights = [0x00007fff, 0x0000];
#clock_src = "internal"; #clock_src = "internal";
sdr_addrs = "dev=pciex:0,auxdac1=1630"; sdr_addrs = "dev=pciex:0,auxdac1=340";
} }
); );
THREAD_STRUCT = ( THREAD_STRUCT = (
{ {
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT" #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
...@@ -232,7 +223,7 @@ THREAD_STRUCT = ( ...@@ -232,7 +223,7 @@ THREAD_STRUCT = (
rfsimulator : rfsimulator :
{ {
serveraddr = "server"; serveraddr = "server";
serverport = "4043"; serverport = 4043;
options = (); #("saviq"); or/and "chanmod" options = (); #("saviq"); or/and "chanmod"
modelname = "AWGN"; modelname = "AWGN";
IQfile = "/tmp/rfsimulator.iqs"; IQfile = "/tmp/rfsimulator.iqs";
......
Active_gNBs = ( "gNB-OAI"); Active_gNBs = ( "gNB-OpenXG");
# Asn1_verbosity, choice in: none, info, annoying # Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity = "none"; Asn1_verbosity = "none";
...@@ -7,16 +7,16 @@ gNBs = ...@@ -7,16 +7,16 @@ gNBs =
{ {
////////// Identification parameters: ////////// Identification parameters:
gNB_ID = 0xe00; gNB_ID = 0xe00;
gNB_name = "gNB-OAI"; gNB_name = "gNB-OpenXG";
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; tracking_area_code = 100;
plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) }); plmn_list = ({ mcc = 466; mnc = 92; mnc_length = 2; snssaiList = ({ sst = 1; }) });
nr_cellid = 12345678L; nr_cellid = 12345678L;
////////// Physical parameters: ////////// Physical parameters:
min_rxtxtime = 6;
do_CSIRS = 1; do_CSIRS = 1;
do_SRS = 1; do_SRS = 1;
...@@ -159,20 +159,13 @@ gNBs = ...@@ -159,20 +159,13 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.70.132"; amf_ip_address = ({ ipv4 = "172.11.200.14"; });
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
}
);
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
GNB_INTERFACE_NAME_FOR_NG_AMF = "eno2"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.11.200.1/24";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.0.202/24"; GNB_IPV4_ADDRESS_FOR_NGU = "172.11.200.1/24";
GNB_INTERFACE_NAME_FOR_NGU = "eno2";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.0.202/24";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
...@@ -186,7 +179,6 @@ MACRLCs = ( ...@@ -186,7 +179,6 @@ MACRLCs = (
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
pucch_TargetSNRx10 = 200; pucch_TargetSNRx10 = 200;
ulsch_max_frame_inactivity = 0;
} }
); );
...@@ -213,11 +205,12 @@ RUs = ( ...@@ -213,11 +205,12 @@ RUs = (
eNB_instances = [0]; eNB_instances = [0];
#beamforming 1x4 matrix: #beamforming 1x4 matrix:
bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000]; bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
sdr_addrs = "dev=pciex:0,auxdac1=1660"; sdr_addrs = "dev=pciex:0,auxdac1=340";
clock_src = "internal"; clock_src = "internal";
} }
); );
THREAD_STRUCT = ( THREAD_STRUCT = (
{ {
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT" #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
...@@ -230,7 +223,7 @@ THREAD_STRUCT = ( ...@@ -230,7 +223,7 @@ THREAD_STRUCT = (
rfsimulator : rfsimulator :
{ {
serveraddr = "server"; serveraddr = "server";
serverport = "4043"; serverport = 4043;
options = (); #("saviq"); or/and "chanmod" options = (); #("saviq"); or/and "chanmod"
modelname = "AWGN"; modelname = "AWGN";
IQfile = "/tmp/rfsimulator.iqs"; IQfile = "/tmp/rfsimulator.iqs";
...@@ -266,3 +259,8 @@ log_config : ...@@ -266,3 +259,8 @@ log_config :
f1ap_log_level ="debug"; f1ap_log_level ="debug";
}; };
e2_agent = {
near_ric_ip_addr = "127.0.0.1";
#sm_dir = "/path/where/the/SMs/are/located/"
sm_dir = "/usr/local/lib/flexric/"
};
...@@ -10,13 +10,13 @@ gNBs = ...@@ -10,13 +10,13 @@ gNBs =
gNB_name = "gNB-OAI"; gNB_name = "gNB-OAI";
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; tracking_area_code = 100;
plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) }); plmn_list = ({ mcc = 466; mnc = 92; mnc_length = 2; snssaiList = ({ sst = 1; }) });
nr_cellid = 12345678L; nr_cellid = 12345678L;
////////// Physical parameters: ////////// Physical parameters:
min_rxtxtime = 6;
do_CSIRS = 1; do_CSIRS = 1;
do_SRS = 1; do_SRS = 1;
...@@ -159,13 +159,13 @@ gNBs = ...@@ -159,13 +159,13 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ({ ipv4 = "192.168.70.132"; }); amf_ip_address = ({ ipv4 = "172.11.200.14"; });
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.70.129/24"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.11.200.1/24";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.70.129/24"; GNB_IPV4_ADDRESS_FOR_NGU = "172.11.200.1/24";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
......
uicc0 = { uicc0 = {
imsi = "2089900007487"; imsi = "466920000000001";
key = "fec86ba6eb707ed08905757b1bb44b8f"; key = "00112233445566778899aabbccddeeff";
opc= "C42449363BBAD02B66D16BC975D77CC1"; opc= "000102030405060708090a0b0c0d0e0f";
dnn= "oai"; dnn= "internet";
nssai_sst=1; nssai_sst=1;
nssai_sd=1; nssai_sd=0xFFFFFF;
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
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