diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 3687b08a1a80dfc3640e07ff6d5200eb2313ddc0..d7cd81cf58823de1791c4a195af33a4ad994052a 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -561,6 +561,7 @@ elseif (${RF_BOARD} STREQUAL "OAI_LMSSDR")
include_directories("/usr/local/include/lime")
include_directories("/usr/include/lime")
LINK_DIRECTORIES("/usr/lib/x86_64-linux-gnu")
+ LINK_DIRECTORIES("/usr/local/lib")
LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/lmsSDR")
LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/lms7002m")
LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/Si5351C")
@@ -2059,22 +2060,22 @@ endforeach(myExe)
#ensure that the T header files are generated before targets depending on them
if (${T_TRACER})
- add_dependencies(lte-softmodem generate_T)
- add_dependencies(lte-softmodem-nos1 generate_T)
- add_dependencies(rrh_gw generate_T)
- add_dependencies(oaisim generate_T)
- add_dependencies(oaisim_nos1 generate_T)
- add_dependencies(dlsim generate_T)
- add_dependencies(dlsim_tm4 generate_T)
- add_dependencies(dlsim_tm7 generate_T)
- add_dependencies(ulsim generate_T)
- add_dependencies(pbchsim generate_T)
- add_dependencies(scansim generate_T)
- add_dependencies(mbmssim generate_T)
- add_dependencies(pdcchsim generate_T)
- add_dependencies(pucchsim generate_T)
- add_dependencies(prachsim generate_T)
- add_dependencies(syncsim generate_T)
+ foreach(i
+ #all "add_executable" definitions (except tests, rb_tool, updatefw)
+ lte-softmodem lte-softmodem-nos1 rrh_gw oaisim oaisim_nos1
+ dlsim_tm4 dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim
+ pdcchsim pucchsim prachsim syncsim
+ #all "add_library" definitions
+ ITTI RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB
+ oai_exmimodevif oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif
+ oai_eth_transpro
+ FLPT_MSG ASYNC_IF FLEXRAN_AGENT HASHTABLE MSC UTIL OMG_SUMO SECU_OSA
+ SECU_CN SCHED_LIB PHY L2 default_sched remote_sched RAL MIH CN_UTILS
+ GTPV1U SCTP_CLIENT UDP LIB_NAS_UE LFDS LFDS7 SIMU SIMU_ETH OPENAIR0_LIB)
+ if (TARGET ${i})
+ add_dependencies(${i} generate_T)
+ endif()
+ endforeach(i)
endif (${T_TRACER})
##################################################
@@ -2099,11 +2100,16 @@ endforeach()
# force castxml and clang compilation with gnu89 standard
# we can't use cXX standard as pthread_rwlock_t is gnu standard
list(APPEND itti_compiler_options "-std=gnu89")
-
set (ITTI_H ${ITTI_DIR}/intertask_interface_types.h)
+if(EXISTS /usr/bin/gccxml)
+ set(xml_command gccxml ${itti_compiler_options} -fxml=${OPENAIR_BIN_DIR}/messages.xml ${ITTI_H})
+else()
+ set(xml_command castxml --castxml-gccxml ${itti_compiler_options} ${ITTI_H} -o ${OPENAIR_BIN_DIR}/messages.xml)
+endif()
+
add_custom_command (
OUTPUT ${OPENAIR_BIN_DIR}/messages.xml
- COMMAND gccxml ${itti_compiler_options} -fxml=${OPENAIR_BIN_DIR}/messages.xml ${ITTI_H}
+ COMMAND ${xml_command}
DEPENDS ${S1AP_OAI_generated} ${RRC_FULL_DIR}/asn1_constants.h
)
diff --git a/cmake_targets/autotests/README.txt b/cmake_targets/autotests/README.txt
index 6cd0307b48aa2ca2eac46ed26849710262e48004..b94d99bff7b5a264ada3038a0027c3e6b3b786b1 100644
--- a/cmake_targets/autotests/README.txt
+++ b/cmake_targets/autotests/README.txt
@@ -239,6 +239,20 @@ Obj.# Case# Test# Description
01 75 04 Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
01 75 05 Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+01 76 lte-softmodem + RRU (NGFI IF4P5, UDP) tests with B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
+01 76 00 Band 7 FDD 5MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
+01 76 01 Band 7 FDD 10MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
+01 76 02 Band 7 FDD 20MHz UL Throughput (UDP) for 300 sec for 1TX/1RX
+01 76 03 Band 7 FDD 5MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+01 76 04 Band 7 FDD 10MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+01 76 05 Band 7 FDD 20MHz DL Throughput (UDP) for 300 sec for 1TX/1RX
+01 76 06 Band 7 FDD 5MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+01 76 07 Band 7 FDD 10MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+01 76 08 Band 7 FDD 20MHz UL Throughput (TCP) for 300 sec for 1TX/1RX
+01 76 09 Band 7 FDD 5MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+01 76 10 Band 7 FDD 10MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+01 76 11 Band 7 FDD 20MHz DL Throughput (TCP) for 300 sec for 1TX/1RX
+
01 80 lte-softmodem + RRU (NGFI) tests with BladeRF RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
01 80 00 Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
01 80 01 Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index c55a29c97544776634f7b1723cf084536e7d4a75..0c80e960a45286fe34d3387d3c0783267cb63dc7 100644
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -8664,6 +8664,19 @@ c
<nruns>10</nruns>
</testCase>
+ <testCase id="017600"></testCase>
+ <testCase id="017601"></testCase>
+ <testCase id="017602"></testCase>
+ <testCase id="017603"></testCase>
+ <testCase id="017604"></testCase>
+ <testCase id="017605"></testCase>
+ <testCase id="017606"></testCase>
+ <testCase id="017607"></testCase>
+ <testCase id="017608"></testCase>
+ <testCase id="017609"></testCase>
+ <testCase id="017610"></testCase>
+ <testCase id="017611"></testCase>
+
<testCase id="018600"></testCase>
<testCase id="018601"></testCase>
<testCase id="018602"></testCase>
diff --git a/cmake_targets/autotests/v2/alu_test.py b/cmake_targets/autotests/v2/alu_test.py
index 8ba6ab857ab52715fbbcc9f9a40e5ac58adb1eee..762e414a95f93ea988ed253cfd9d2abe991f8269 100644
--- a/cmake_targets/autotests/v2/alu_test.py
+++ b/cmake_targets/autotests/v2/alu_test.py
@@ -9,18 +9,24 @@ class alu_test:
openair,
user, password,
log_subdir,
- env):
- self.epc_machine = epc
- self.enb_machine = enb
- self.ue_machine = ue
- self.openair_dir = openair
- self.oai_user = user
- self.oai_password = password
- self.env = env
-
- self.task_hss = None
- self.task_enb = None
- self.task_ue = None
+ env,
+ enb_rru = "",
+ enb_rcc = ""):
+ self.epc_machine = epc
+ self.enb_machine = enb
+ self.ue_machine = ue
+ self.openair_dir = openair
+ self.oai_user = user
+ self.oai_password = password
+ self.env = env
+ self.enb_rru_machine = enb_rru
+ self.enb_rcc_machine = enb_rcc
+
+ self.task_hss = None
+ self.task_enb = None
+ self.task_ue = None
+ self.task_rru_enb = None
+ self.task_rcc_enb = None
self.logdir = openair + '/cmake_targets/autotests/log/' + log_subdir
quickshell('mkdir -p ' + self.logdir)
@@ -40,6 +46,10 @@ class alu_test:
self.task_enb.kill()
if self.task_ue != None and self.task_ue.alive():
self.task_ue.kill()
+ if self.task_rru_enb != None and self.task_rru_enb.alive():
+ self.task_rru_enb.kill()
+ if self.task_rcc_enb != None and self.task_rcc_enb.alive():
+ self.task_rcc_enb.kill()
##########################################################################
# start_epc
@@ -101,7 +111,7 @@ class alu_test:
##########################################################################
# compile_enb
##########################################################################
- def compile_enb(self, build_arguments):
+ def compile_enb(self, build_arguments, log_suffix=""):
log("INFO: ALU test: compile softmodem on " + self.enb_machine)
envcomp = list(self.env)
envcomp.append('BUILD_ARGUMENTS="' + build_arguments + '"')
@@ -120,7 +130,8 @@ class alu_test:
self.oai_user,
self.oai_password,
envcomp,
- self.logdir + "/compile_softmodem." + self.enb_machine,
+ self.logdir + "/compile_softmodem." + log_suffix + \
+ self.enb_machine,
post_action=post_action)
ret = task.wait()
if ret != 0:
@@ -162,6 +173,62 @@ class alu_test:
#not sure if we have to quit here or not
#os._exit(1)
+ ##########################################################################
+ # start_enb_rru_rcc
+ ##########################################################################
+ def start_enb_rru_rcc(self, rru_config_file, rcc_config_file):
+ #copy wanted configuration files
+ quickshell("sshpass -p " + self.oai_password +
+ " scp config/" + rru_config_file + " " +
+ self.oai_user + "@" + self.enb_rru_machine+":/tmp/enb.conf")
+ quickshell("sshpass -p " + self.oai_password +
+ " scp config/" + rcc_config_file + " " +
+ self.oai_user + "@" + self.enb_rcc_machine+":/tmp/enb.conf")
+
+ #run RRU/RCC softmodem
+ log("INFO: ALU test: run RRU softmodem with configuration file " +
+ rru_config_file)
+ self.task_rru_enb = Task("actions/run_enb.bash",
+ "run_RRU_softmodem",
+ self.enb_rru_machine,
+ self.oai_user,
+ self.oai_password,
+ self.env,
+ self.logdir + "/run_softmodem." + self.enb_rru_machine,
+ event=self.event)
+ self.task_rru_enb.waitlog('[RRH] binding to')
+ log("INFO: ALU test: run RCC softmodem with configuration file " +
+ rcc_config_file)
+ self.task_rcc_enb = Task("actions/run_enb.bash",
+ "run_RCC_softmodem",
+ self.enb_rcc_machine,
+ self.oai_user,
+ self.oai_password,
+ self.env,
+ self.logdir + "/run_softmodem." + self.enb_rcc_machine,
+ event=self.event)
+ self.task_rcc_enb.waitlog('[BBU] local ip addr')
+ #wait for RRU and RCC to be connected
+ self.task_rru_enb.waitlog('devices ok (eNB_thread_asynch_rx)')
+
+ ##########################################################################
+ # stop_enb_rru_rcc
+ ##########################################################################
+ def stop_enb_rru_rcc(self):
+ log("INFO: ALU test: stop RRU/RCC softmodem")
+ self.task_rru_enb.sendnow("%c" % 3)
+ ret = self.task_rru_enb.wait()
+ if ret != 0:
+ log("ERROR: ALU test: RRU softmodem failed")
+ #not sure if we have to quit here or not
+ #os._exit(1)
+ self.task_rcc_enb.sendnow("%c" % 3)
+ ret = self.task_rcc_enb.wait()
+ if ret != 0:
+ log("ERROR: ALU test: RCC softmodem failed")
+ #not sure if we have to quit here or not
+ #os._exit(1)
+
##########################################################################
# start_ue
##########################################################################
@@ -185,7 +252,9 @@ class alu_test:
self.event.clear()
- if ( not self.task_enb.alive() or
+ if ( (self.task_enb != None and not self.task_enb.alive()) or
+ (self.task_rru_enb!=None and not self.task_rru_enb.alive()) or
+ (self.task_rcc_enb!=None and not self.task_rcc_enb.alive()) or
not self.task_hss.alive() or
not self.task_ue.alive()):
log("ERROR: ALU test: eNB, HSS or UE task died")
@@ -250,14 +319,20 @@ class alu_test:
self.event.wait()
log("DEBUG: event.wait() done")
- if ( not self.task_enb.alive() or
+ if ( (self.task_enb != None and not self.task_enb.alive()) or
+ (self.task_rru_enb!=None and not self.task_rru_enb.alive()) or
+ (self.task_rcc_enb!=None and not self.task_rcc_enb.alive()) or
not self.task_hss.alive() or
not self.task_ue.alive()):
log("ERROR: unexpected task exited, test failed, kill all")
if task_traffic_client.alive():
task_traffic_client.kill()
- if self.task_enb.alive():
+ if (self.task_enb != None and self.task_enb.alive()):
self.task_enb.kill()
+ if (self.task_rru_enb != None and self.task_rru_enb.alive()):
+ self.task_rru_enb.kill()
+ if (self.task_rcc_enb != None and self.task_rcc_enb.alive()):
+ self.task_rcc_enb.kill()
if self.task_ue.alive():
self.task_ue.kill()
@@ -277,7 +352,9 @@ class alu_test:
self.event.clear()
- if ( not self.task_enb.alive() or
+ if ( (self.task_enb != None and not self.task_enb.alive()) or
+ (self.task_rru_enb!=None and not self.task_rru_enb.alive()) or
+ (self.task_rcc_enb!=None and not self.task_rcc_enb.alive()) or
not self.task_hss.alive() or
not self.task_ue.alive()):
log("ERROR: ALU test: eNB, HSS or UE task died")
@@ -334,8 +411,6 @@ class alu_test:
##############################################################################
def run_b210_alu(tests, openair_dir, oai_user, oai_password, env):
- if not do_tests(tests['b210']['alu']):
- return
#compile eNB (two cases: one for FDD and one for TDD)
@@ -365,6 +440,44 @@ def run_b210_alu(tests, openair_dir, oai_user, oai_password, env):
log("ERROR: ALU test failed: eNB compilation failed: " + str(e))
return
+ #compile RRU/RCC eNB
+
+ if do_tests(tests['remote b210']['alu']['fdd']):
+ #RRU
+ alu = alu_test(epc='amerique', ue='stevens',
+ openair=openair_dir,
+ user=oai_user, password=oai_password,
+ log_subdir='enb_tests/remote_b210_alu/compile_enb_rru',
+ env=env,
+ #hack: set 'enb' to reuse 'compile_enb'
+ enb = 'superserver',
+ enb_rru = 'superserver', enb_rcc = 'starsky')
+
+ try:
+ alu.compile_enb("--eNB -x -c -w USRP -t ETHERNET",
+ log_suffix='rru.')
+ except BaseException, e:
+ log("ERROR: ALU test failed: RRU eNB compilation failed: "+str(e))
+ return
+
+ #RCC
+ alu = alu_test(epc='amerique', ue='stevens',
+ openair=openair_dir,
+ user=oai_user, password=oai_password,
+ log_subdir='enb_tests/remote_b210_alu/compile_enb_rcc',
+ env=env,
+ #hack: set 'enb' to reuse 'compile_enb'
+ enb = 'starsky',
+ enb_rru = 'superserver', enb_rcc = 'starsky')
+
+ try:
+ alu.compile_enb("--eNB -w None -t ETHERNET",
+ log_suffix='rcc.')
+ except BaseException, e:
+ log("ERROR: ALU test failed: RCC eNB compilation failed: "+str(e))
+ return
+
+
#run tests
udp_dl_bandwidth = { "5" : "15M",
@@ -410,3 +523,29 @@ def run_b210_alu(tests, openair_dir, oai_user, oai_password, env):
except BaseException, e:
log("ERROR: ALU test failed: " + str(e))
alu.finish()
+ if do_tests(tests['remote b210']['alu'][mode][bw]):
+ log("INFO: ALU test: run RRU/RCC tests for bandwidth " + bw + " MHz")
+ ctest = tests['remote b210']['alu'][mode][bw]
+ alu = alu_test(epc='amerique', enb='', ue=ue_machine[mode],
+ openair=openair_dir,
+ user=oai_user, password=oai_password,
+ log_subdir='enb_tests/remote_b210_alu/' + bw,
+ env=env,
+ enb_rru='superserver', enb_rcc='starsky')
+ try:
+ alu.start_epc()
+ alu.start_enb_rru_rcc("rru.band7.tm1.if4p5." + bw + "MHz.udp.usrpb210.conf",
+ "rcc.band7.tm1.if4p5." + bw + "MHz.conf")
+ for ue in ('bandrich', '3276'):
+ if ue in ctest and do_tests(ctest[ue]):
+ alu.start_ue(ue)
+ if do_tests(ctest[ue]['tcp']['dl']): alu.dl_tcp(ue)
+ if do_tests(ctest[ue]['tcp']['ul']): alu.ul_tcp(ue)
+ if do_tests(ctest[ue]['udp']['dl']): alu.dl_udp(ue, udp_dl_bandwidth[bw])
+ if do_tests(ctest[ue]['udp']['ul']): alu.ul_udp(ue, udp_ul_bandwidth[bw])
+ alu.stop_ue(ue)
+ alu.stop_enb_rru_rcc()
+ alu.stop_epc()
+ except BaseException, e:
+ log("ERROR: ALU test failed: " + str(e))
+ alu.finish()
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
new file mode 100644
index 0000000000000000000000000000000000000000..81eed5f4b10946477df799fd0820e51ea2ffb71a
--- /dev/null
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
@@ -0,0 +1,192 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+ ////////// Identification parameters:
+ eNB_ID = 0xe00;
+
+ cell_type = "CELL_MACRO_ENB";
+
+ eNB_name = "eNB_Eurecom_LTEBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = "1";
+
+ mobile_country_code = "208";
+
+ mobile_network_code = "92";
+
+ ////////// Physical parameters:
+
+ component_carriers = (
+ {
+ node_function = "NGFI_RCC_IF4p5";
+ node_timing = "synch_to_ext_device";
+ node_synch_ref = 0;
+ frame_type = "FDD";
+ tdd_config = 3;
+ tdd_config_s = 0;
+ prefix_type = "NORMAL";
+ eutra_band = 7;
+ downlink_frequency = 2660000000L;
+ uplink_frequency_offset = -120000000;
+ Nid_cell = 0;
+ N_RB_DL = 50;
+ Nid_cell_mbsfn = 0;
+ nb_antenna_ports = 1;
+ nb_antennas_tx = 1;
+ nb_antennas_rx = 1;
+ tx_gain = 90;
+ rx_gain = 125;
+ prach_root = 0;
+ prach_config_index = 0;
+ prach_high_speed = "DISABLE";
+ prach_zero_correlation = 1;
+ prach_freq_offset = 2;
+ pucch_delta_shift = 1;
+ pucch_nRB_CQI = 1;
+ pucch_nCS_AN = 0;
+ pucch_n1_AN = 32;
+ pdsch_referenceSignalPower = -29;
+ pdsch_p_b = 0;
+ pusch_n_SB = 1;
+ pusch_enable64QAM = "DISABLE";
+ pusch_hoppingMode = "interSubFrame";
+ pusch_hoppingOffset = 0;
+ pusch_groupHoppingEnabled = "ENABLE";
+ pusch_groupAssignment = 0;
+ pusch_sequenceHoppingEnabled = "DISABLE";
+ pusch_nDMRS1 = 1;
+ phich_duration = "NORMAL";
+ phich_resource = "ONESIXTH";
+ srs_enable = "DISABLE";
+ /* srs_BandwidthConfig =;
+ srs_SubframeConfig =;
+ srs_ackNackST =;
+ srs_MaxUpPts =;*/
+
+ pusch_p0_Nominal = -96;
+ pusch_alpha = "AL1";
+ pucch_p0_Nominal = -104;
+ msg3_delta_Preamble = 6;
+ pucch_deltaF_Format1 = "deltaF2";
+ pucch_deltaF_Format1b = "deltaF3";
+ pucch_deltaF_Format2 = "deltaF0";
+ pucch_deltaF_Format2a = "deltaF0";
+ pucch_deltaF_Format2b = "deltaF0";
+
+ rach_numberOfRA_Preambles = 64;
+ rach_preamblesGroupAConfig = "DISABLE";
+ /*
+ rach_sizeOfRA_PreamblesGroupA = ;
+ rach_messageSizeGroupA = ;
+ rach_messagePowerOffsetGroupB = ;
+ */
+ rach_powerRampingStep = 4;
+ rach_preambleInitialReceivedTargetPower = -108;
+ rach_preambleTransMax = 10;
+ rach_raResponseWindowSize = 10;
+ rach_macContentionResolutionTimer = 48;
+ rach_maxHARQ_Msg3Tx = 4;
+
+ pcch_default_PagingCycle = 128;
+ pcch_nB = "oneT";
+ bcch_modificationPeriodCoeff = 2;
+ ue_TimersAndConstants_t300 = 1000;
+ ue_TimersAndConstants_t301 = 1000;
+ ue_TimersAndConstants_t310 = 1000;
+ ue_TimersAndConstants_t311 = 10000;
+ ue_TimersAndConstants_n310 = 20;
+ ue_TimersAndConstants_n311 = 1;
+ ue_TransmissionMode = 1;
+ }
+ );
+
+
+ srb1_parameters :
+ {
+ # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+ timer_poll_retransmit = 80;
+
+ # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+ timer_reordering = 35;
+
+ # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+ timer_status_prohibit = 0;
+
+ # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+ poll_pdu = 4;
+
+ # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+ poll_byte = 99999;
+
+ # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+ max_retx_threshold = 4;
+ }
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "192.168.12.26";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+
+ ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.18/24";
+ ENB_INTERFACE_NAME_FOR_S1U = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.18/24";
+ ENB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ rrh_gw_config = (
+ {
+ local_if_name = "eth1";
+ remote_address = "10.10.10.157";
+ local_address = "10.10.10.18";
+ local_port = 50000; #for raw option local port must be the same to remote
+ remote_port = 50000;
+ rrh_gw_active = "yes";
+ tr_preference = "udp_if4p5";
+ rf_preference = "usrp_b200";
+ iq_txshift = 4;
+ tx_sample_advance = 80;
+ tx_scheduling_advance = 9;
+ if_compression = "alaw";
+ }
+ );
+
+ log_config :
+ {
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ };
+ }
+);
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
new file mode 100644
index 0000000000000000000000000000000000000000..4b4190f8ce980cf107f62bd76eab8a9ca9ecf1da
--- /dev/null
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
@@ -0,0 +1,192 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+ ////////// Identification parameters:
+ eNB_ID = 0xe00;
+
+ cell_type = "CELL_MACRO_ENB";
+
+ eNB_name = "eNB_Eurecom_LTEBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = "1";
+
+ mobile_country_code = "208";
+
+ mobile_network_code = "92";
+
+ ////////// Physical parameters:
+
+ component_carriers = (
+ {
+ node_function = "NGFI_RCC_IF4p5";
+ node_timing = "synch_to_ext_device";
+ node_synch_ref = 0;
+ frame_type = "FDD";
+ tdd_config = 3;
+ tdd_config_s = 0;
+ prefix_type = "NORMAL";
+ eutra_band = 7;
+ downlink_frequency = 2660000000L;
+ uplink_frequency_offset = -120000000;
+ Nid_cell = 0;
+ N_RB_DL = 100;
+ Nid_cell_mbsfn = 0;
+ nb_antenna_ports = 1;
+ nb_antennas_tx = 1;
+ nb_antennas_rx = 1;
+ tx_gain = 90;
+ rx_gain = 125;
+ prach_root = 0;
+ prach_config_index = 0;
+ prach_high_speed = "DISABLE";
+ prach_zero_correlation = 1;
+ prach_freq_offset = 2;
+ pucch_delta_shift = 1;
+ pucch_nRB_CQI = 1;
+ pucch_nCS_AN = 0;
+ pucch_n1_AN = 32;
+ pdsch_referenceSignalPower = -29;
+ pdsch_p_b = 0;
+ pusch_n_SB = 1;
+ pusch_enable64QAM = "DISABLE";
+ pusch_hoppingMode = "interSubFrame";
+ pusch_hoppingOffset = 0;
+ pusch_groupHoppingEnabled = "ENABLE";
+ pusch_groupAssignment = 0;
+ pusch_sequenceHoppingEnabled = "DISABLE";
+ pusch_nDMRS1 = 1;
+ phich_duration = "NORMAL";
+ phich_resource = "ONESIXTH";
+ srs_enable = "DISABLE";
+ /* srs_BandwidthConfig =;
+ srs_SubframeConfig =;
+ srs_ackNackST =;
+ srs_MaxUpPts =;*/
+
+ pusch_p0_Nominal = -96;
+ pusch_alpha = "AL1";
+ pucch_p0_Nominal = -104;
+ msg3_delta_Preamble = 6;
+ pucch_deltaF_Format1 = "deltaF2";
+ pucch_deltaF_Format1b = "deltaF3";
+ pucch_deltaF_Format2 = "deltaF0";
+ pucch_deltaF_Format2a = "deltaF0";
+ pucch_deltaF_Format2b = "deltaF0";
+
+ rach_numberOfRA_Preambles = 64;
+ rach_preamblesGroupAConfig = "DISABLE";
+ /*
+ rach_sizeOfRA_PreamblesGroupA = ;
+ rach_messageSizeGroupA = ;
+ rach_messagePowerOffsetGroupB = ;
+ */
+ rach_powerRampingStep = 4;
+ rach_preambleInitialReceivedTargetPower = -108;
+ rach_preambleTransMax = 10;
+ rach_raResponseWindowSize = 10;
+ rach_macContentionResolutionTimer = 48;
+ rach_maxHARQ_Msg3Tx = 4;
+
+ pcch_default_PagingCycle = 128;
+ pcch_nB = "oneT";
+ bcch_modificationPeriodCoeff = 2;
+ ue_TimersAndConstants_t300 = 1000;
+ ue_TimersAndConstants_t301 = 1000;
+ ue_TimersAndConstants_t310 = 1000;
+ ue_TimersAndConstants_t311 = 10000;
+ ue_TimersAndConstants_n310 = 20;
+ ue_TimersAndConstants_n311 = 1;
+ ue_TransmissionMode = 1;
+ }
+ );
+
+
+ srb1_parameters :
+ {
+ # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+ timer_poll_retransmit = 80;
+
+ # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+ timer_reordering = 35;
+
+ # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+ timer_status_prohibit = 0;
+
+ # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+ poll_pdu = 4;
+
+ # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+ poll_byte = 99999;
+
+ # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+ max_retx_threshold = 4;
+ }
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "192.168.12.26";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+
+ ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.18/24";
+ ENB_INTERFACE_NAME_FOR_S1U = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.18/24";
+ ENB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ rrh_gw_config = (
+ {
+ local_if_name = "eth1";
+ remote_address = "10.10.10.157";
+ local_address = "10.10.10.18";
+ local_port = 50000; #for raw option local port must be the same to remote
+ remote_port = 50000;
+ rrh_gw_active = "yes";
+ tr_preference = "udp_if4p5";
+ rf_preference = "usrp_b200";
+ iq_txshift = 4;
+ tx_sample_advance = 80;
+ tx_scheduling_advance = 9;
+ if_compression = "alaw";
+ }
+ );
+
+ log_config :
+ {
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ };
+ }
+);
diff --git a/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
new file mode 100644
index 0000000000000000000000000000000000000000..99b9a66226f0b1d5bc821f632d59636e604fc4f0
--- /dev/null
+++ b/cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
@@ -0,0 +1,192 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+ ////////// Identification parameters:
+ eNB_ID = 0xe00;
+
+ cell_type = "CELL_MACRO_ENB";
+
+ eNB_name = "eNB_Eurecom_LTEBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = "1";
+
+ mobile_country_code = "208";
+
+ mobile_network_code = "92";
+
+ ////////// Physical parameters:
+
+ component_carriers = (
+ {
+ node_function = "NGFI_RCC_IF4p5";
+ node_timing = "synch_to_ext_device";
+ node_synch_ref = 0;
+ frame_type = "FDD";
+ tdd_config = 3;
+ tdd_config_s = 0;
+ prefix_type = "NORMAL";
+ eutra_band = 7;
+ downlink_frequency = 2660000000L;
+ uplink_frequency_offset = -120000000;
+ Nid_cell = 0;
+ N_RB_DL = 25;
+ Nid_cell_mbsfn = 0;
+ nb_antenna_ports = 1;
+ nb_antennas_tx = 1;
+ nb_antennas_rx = 1;
+ tx_gain = 90;
+ rx_gain = 125;
+ prach_root = 0;
+ prach_config_index = 0;
+ prach_high_speed = "DISABLE";
+ prach_zero_correlation = 1;
+ prach_freq_offset = 2;
+ pucch_delta_shift = 1;
+ pucch_nRB_CQI = 1;
+ pucch_nCS_AN = 0;
+ pucch_n1_AN = 32;
+ pdsch_referenceSignalPower = -29;
+ pdsch_p_b = 0;
+ pusch_n_SB = 1;
+ pusch_enable64QAM = "DISABLE";
+ pusch_hoppingMode = "interSubFrame";
+ pusch_hoppingOffset = 0;
+ pusch_groupHoppingEnabled = "ENABLE";
+ pusch_groupAssignment = 0;
+ pusch_sequenceHoppingEnabled = "DISABLE";
+ pusch_nDMRS1 = 1;
+ phich_duration = "NORMAL";
+ phich_resource = "ONESIXTH";
+ srs_enable = "DISABLE";
+ /* srs_BandwidthConfig =;
+ srs_SubframeConfig =;
+ srs_ackNackST =;
+ srs_MaxUpPts =;*/
+
+ pusch_p0_Nominal = -96;
+ pusch_alpha = "AL1";
+ pucch_p0_Nominal = -104;
+ msg3_delta_Preamble = 6;
+ pucch_deltaF_Format1 = "deltaF2";
+ pucch_deltaF_Format1b = "deltaF3";
+ pucch_deltaF_Format2 = "deltaF0";
+ pucch_deltaF_Format2a = "deltaF0";
+ pucch_deltaF_Format2b = "deltaF0";
+
+ rach_numberOfRA_Preambles = 64;
+ rach_preamblesGroupAConfig = "DISABLE";
+ /*
+ rach_sizeOfRA_PreamblesGroupA = ;
+ rach_messageSizeGroupA = ;
+ rach_messagePowerOffsetGroupB = ;
+ */
+ rach_powerRampingStep = 4;
+ rach_preambleInitialReceivedTargetPower = -108;
+ rach_preambleTransMax = 10;
+ rach_raResponseWindowSize = 10;
+ rach_macContentionResolutionTimer = 48;
+ rach_maxHARQ_Msg3Tx = 4;
+
+ pcch_default_PagingCycle = 128;
+ pcch_nB = "oneT";
+ bcch_modificationPeriodCoeff = 2;
+ ue_TimersAndConstants_t300 = 1000;
+ ue_TimersAndConstants_t301 = 1000;
+ ue_TimersAndConstants_t310 = 1000;
+ ue_TimersAndConstants_t311 = 10000;
+ ue_TimersAndConstants_n310 = 20;
+ ue_TimersAndConstants_n311 = 1;
+ ue_TransmissionMode = 1;
+ }
+ );
+
+
+ srb1_parameters :
+ {
+ # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+ timer_poll_retransmit = 80;
+
+ # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+ timer_reordering = 35;
+
+ # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+ timer_status_prohibit = 0;
+
+ # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+ poll_pdu = 4;
+
+ # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+ poll_byte = 99999;
+
+ # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+ max_retx_threshold = 4;
+ }
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "192.168.12.26";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+
+ ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.18/24";
+ ENB_INTERFACE_NAME_FOR_S1U = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.18/24";
+ ENB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ rrh_gw_config = (
+ {
+ local_if_name = "eth1";
+ remote_address = "10.10.10.157";
+ local_address = "10.10.10.18";
+ local_port = 50000; #for raw option local port must be the same to remote
+ remote_port = 50000;
+ rrh_gw_active = "yes";
+ tr_preference = "udp_if4p5";
+ rf_preference = "usrp_b200";
+ iq_txshift = 4;
+ tx_sample_advance = 80;
+ tx_scheduling_advance = 9;
+ if_compression = "alaw";
+ }
+ );
+
+ log_config :
+ {
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ };
+ }
+);
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
new file mode 100644
index 0000000000000000000000000000000000000000..4cc40b6d84139da98b1250b62ba480bce60406f0
--- /dev/null
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
@@ -0,0 +1,194 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+ ////////// Identification parameters:
+ eNB_ID = 0xe00;
+
+ cell_type = "CELL_MACRO_ENB";
+
+ eNB_name = "eNB_Eurecom_LTEBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = "1";
+
+ mobile_country_code = "208";
+
+ mobile_network_code = "92";
+
+ ////////// Physical parameters:
+
+ component_carriers = (
+ {
+ node_function = "NGFI_RRU_IF4p5";
+ node_timing = "synch_to_ext_device";
+ node_synch_ref = 0;
+ frame_type = "FDD";
+ tdd_config = 3;
+ tdd_config_s = 0;
+ prefix_type = "NORMAL";
+ eutra_band = 7;
+ downlink_frequency = 2660000000L;
+ uplink_frequency_offset = -120000000;
+ Nid_cell = 0;
+ N_RB_DL = 50;
+ Nid_cell_mbsfn = 0;
+ nb_antenna_ports = 1;
+ nb_antennas_tx = 1;
+ nb_antennas_rx = 1;
+ tx_gain = 90;
+ rx_gain = 125;
+ prach_root = 0;
+ prach_config_index = 0;
+ prach_high_speed = "DISABLE";
+ prach_zero_correlation = 1;
+ prach_freq_offset = 2;
+ pucch_delta_shift = 1;
+ pucch_nRB_CQI = 1;
+ pucch_nCS_AN = 0;
+ pucch_n1_AN = 32;
+ pdsch_referenceSignalPower = -29;
+ pdsch_p_b = 0;
+ pusch_n_SB = 1;
+ pusch_enable64QAM = "DISABLE";
+ pusch_hoppingMode = "interSubFrame";
+ pusch_hoppingOffset = 0;
+ pusch_groupHoppingEnabled = "ENABLE";
+ pusch_groupAssignment = 0;
+ pusch_sequenceHoppingEnabled = "DISABLE";
+ pusch_nDMRS1 = 1;
+ phich_duration = "NORMAL";
+ phich_resource = "ONESIXTH";
+ srs_enable = "DISABLE";
+ /* srs_BandwidthConfig =;
+ srs_SubframeConfig =;
+ srs_ackNackST =;
+ srs_MaxUpPts =;*/
+
+ pusch_p0_Nominal = -96;
+ pusch_alpha = "AL1";
+ pucch_p0_Nominal = -104;
+ msg3_delta_Preamble = 6;
+ pucch_deltaF_Format1 = "deltaF2";
+ pucch_deltaF_Format1b = "deltaF3";
+ pucch_deltaF_Format2 = "deltaF0";
+ pucch_deltaF_Format2a = "deltaF0";
+ pucch_deltaF_Format2b = "deltaF0";
+
+ rach_numberOfRA_Preambles = 64;
+ rach_preamblesGroupAConfig = "DISABLE";
+ /*
+ rach_sizeOfRA_PreamblesGroupA = ;
+ rach_messageSizeGroupA = ;
+ rach_messagePowerOffsetGroupB = ;
+ */
+ rach_powerRampingStep = 4;
+ rach_preambleInitialReceivedTargetPower = -104;
+ rach_preambleTransMax = 10;
+ rach_raResponseWindowSize = 10;
+ rach_macContentionResolutionTimer = 48;
+ rach_maxHARQ_Msg3Tx = 4;
+
+ pcch_default_PagingCycle = 128;
+ pcch_nB = "oneT";
+ bcch_modificationPeriodCoeff = 2;
+ ue_TimersAndConstants_t300 = 1000;
+ ue_TimersAndConstants_t301 = 1000;
+ ue_TimersAndConstants_t310 = 1000;
+ ue_TimersAndConstants_t311 = 10000;
+ ue_TimersAndConstants_n310 = 20;
+ ue_TimersAndConstants_n311 = 1;
+
+ ue_TransmissionMode = 1;
+
+ }
+ );
+
+
+ srb1_parameters :
+ {
+ # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+ timer_poll_retransmit = 80;
+
+ # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+ timer_reordering = 35;
+
+ # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+ timer_status_prohibit = 0;
+
+ # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+ poll_pdu = 4;
+
+ # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+ poll_byte = 99999;
+
+ # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+ max_retx_threshold = 4;
+ }
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "192.168.12.11";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+
+ ENB_INTERFACE_NAME_FOR_S1_MME = "eth3";
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.215/24";
+ ENB_INTERFACE_NAME_FOR_S1U = "eth3";
+ ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.215/24";
+ ENB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ rrh_gw_config = (
+ {
+ local_if_name = "eth3";
+ remote_address = "10.10.10.18";
+ local_address = "10.10.10.157";
+ local_port = 50000; #for raw option local port must be the same to remote
+ remote_port = 50000;
+ rrh_gw_active = "yes";
+ tr_preference = "udp_if4p5";
+ rf_preference = "usrp_b200";
+ iq_txshift = 4;
+ tx_sample_advance = 80;
+ tx_scheduling_advance = 9;
+ if_compression = "alaw";
+ }
+ );
+
+ log_config :
+ {
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ };
+ }
+);
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
new file mode 100644
index 0000000000000000000000000000000000000000..787cedb18d9972ef05e3d5d0f75074977cfc92e5
--- /dev/null
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
@@ -0,0 +1,194 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+ ////////// Identification parameters:
+ eNB_ID = 0xe00;
+
+ cell_type = "CELL_MACRO_ENB";
+
+ eNB_name = "eNB_Eurecom_LTEBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = "1";
+
+ mobile_country_code = "208";
+
+ mobile_network_code = "92";
+
+ ////////// Physical parameters:
+
+ component_carriers = (
+ {
+ node_function = "NGFI_RRU_IF4p5";
+ node_timing = "synch_to_ext_device";
+ node_synch_ref = 0;
+ frame_type = "FDD";
+ tdd_config = 3;
+ tdd_config_s = 0;
+ prefix_type = "NORMAL";
+ eutra_band = 7;
+ downlink_frequency = 2660000000L;
+ uplink_frequency_offset = -120000000;
+ Nid_cell = 0;
+ N_RB_DL = 100;
+ Nid_cell_mbsfn = 0;
+ nb_antenna_ports = 1;
+ nb_antennas_tx = 1;
+ nb_antennas_rx = 1;
+ tx_gain = 90;
+ rx_gain = 125;
+ prach_root = 0;
+ prach_config_index = 0;
+ prach_high_speed = "DISABLE";
+ prach_zero_correlation = 1;
+ prach_freq_offset = 2;
+ pucch_delta_shift = 1;
+ pucch_nRB_CQI = 1;
+ pucch_nCS_AN = 0;
+ pucch_n1_AN = 32;
+ pdsch_referenceSignalPower = -29;
+ pdsch_p_b = 0;
+ pusch_n_SB = 1;
+ pusch_enable64QAM = "DISABLE";
+ pusch_hoppingMode = "interSubFrame";
+ pusch_hoppingOffset = 0;
+ pusch_groupHoppingEnabled = "ENABLE";
+ pusch_groupAssignment = 0;
+ pusch_sequenceHoppingEnabled = "DISABLE";
+ pusch_nDMRS1 = 1;
+ phich_duration = "NORMAL";
+ phich_resource = "ONESIXTH";
+ srs_enable = "DISABLE";
+ /* srs_BandwidthConfig =;
+ srs_SubframeConfig =;
+ srs_ackNackST =;
+ srs_MaxUpPts =;*/
+
+ pusch_p0_Nominal = -96;
+ pusch_alpha = "AL1";
+ pucch_p0_Nominal = -104;
+ msg3_delta_Preamble = 6;
+ pucch_deltaF_Format1 = "deltaF2";
+ pucch_deltaF_Format1b = "deltaF3";
+ pucch_deltaF_Format2 = "deltaF0";
+ pucch_deltaF_Format2a = "deltaF0";
+ pucch_deltaF_Format2b = "deltaF0";
+
+ rach_numberOfRA_Preambles = 64;
+ rach_preamblesGroupAConfig = "DISABLE";
+ /*
+ rach_sizeOfRA_PreamblesGroupA = ;
+ rach_messageSizeGroupA = ;
+ rach_messagePowerOffsetGroupB = ;
+ */
+ rach_powerRampingStep = 4;
+ rach_preambleInitialReceivedTargetPower = -104;
+ rach_preambleTransMax = 10;
+ rach_raResponseWindowSize = 10;
+ rach_macContentionResolutionTimer = 48;
+ rach_maxHARQ_Msg3Tx = 4;
+
+ pcch_default_PagingCycle = 128;
+ pcch_nB = "oneT";
+ bcch_modificationPeriodCoeff = 2;
+ ue_TimersAndConstants_t300 = 1000;
+ ue_TimersAndConstants_t301 = 1000;
+ ue_TimersAndConstants_t310 = 1000;
+ ue_TimersAndConstants_t311 = 10000;
+ ue_TimersAndConstants_n310 = 20;
+ ue_TimersAndConstants_n311 = 1;
+
+ ue_TransmissionMode = 1;
+
+ }
+ );
+
+
+ srb1_parameters :
+ {
+ # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+ timer_poll_retransmit = 80;
+
+ # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+ timer_reordering = 35;
+
+ # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+ timer_status_prohibit = 0;
+
+ # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+ poll_pdu = 4;
+
+ # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+ poll_byte = 99999;
+
+ # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+ max_retx_threshold = 4;
+ }
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "192.168.12.11";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+
+ ENB_INTERFACE_NAME_FOR_S1_MME = "eth3";
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.215/24";
+ ENB_INTERFACE_NAME_FOR_S1U = "eth3";
+ ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.215/24";
+ ENB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ rrh_gw_config = (
+ {
+ local_if_name = "eth3";
+ remote_address = "10.10.10.18";
+ local_address = "10.10.10.157";
+ local_port = 50000; #for raw option local port must be the same to remote
+ remote_port = 50000;
+ rrh_gw_active = "yes";
+ tr_preference = "udp_if4p5";
+ rf_preference = "usrp_b200";
+ iq_txshift = 4;
+ tx_sample_advance = 80;
+ tx_scheduling_advance = 9;
+ if_compression = "alaw";
+ }
+ );
+
+ log_config :
+ {
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ };
+ }
+);
diff --git a/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
new file mode 100644
index 0000000000000000000000000000000000000000..d9d46bf9446cef80a3fe8dd0a3c1eaa47d245972
--- /dev/null
+++ b/cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
@@ -0,0 +1,194 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+ ////////// Identification parameters:
+ eNB_ID = 0xe00;
+
+ cell_type = "CELL_MACRO_ENB";
+
+ eNB_name = "eNB_Eurecom_LTEBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = "1";
+
+ mobile_country_code = "208";
+
+ mobile_network_code = "92";
+
+ ////////// Physical parameters:
+
+ component_carriers = (
+ {
+ node_function = "NGFI_RRU_IF4p5";
+ node_timing = "synch_to_ext_device";
+ node_synch_ref = 0;
+ frame_type = "FDD";
+ tdd_config = 3;
+ tdd_config_s = 0;
+ prefix_type = "NORMAL";
+ eutra_band = 7;
+ downlink_frequency = 2660000000L;
+ uplink_frequency_offset = -120000000;
+ Nid_cell = 0;
+ N_RB_DL = 25;
+ Nid_cell_mbsfn = 0;
+ nb_antenna_ports = 1;
+ nb_antennas_tx = 1;
+ nb_antennas_rx = 1;
+ tx_gain = 90;
+ rx_gain = 125;
+ prach_root = 0;
+ prach_config_index = 0;
+ prach_high_speed = "DISABLE";
+ prach_zero_correlation = 1;
+ prach_freq_offset = 2;
+ pucch_delta_shift = 1;
+ pucch_nRB_CQI = 1;
+ pucch_nCS_AN = 0;
+ pucch_n1_AN = 32;
+ pdsch_referenceSignalPower = -29;
+ pdsch_p_b = 0;
+ pusch_n_SB = 1;
+ pusch_enable64QAM = "DISABLE";
+ pusch_hoppingMode = "interSubFrame";
+ pusch_hoppingOffset = 0;
+ pusch_groupHoppingEnabled = "ENABLE";
+ pusch_groupAssignment = 0;
+ pusch_sequenceHoppingEnabled = "DISABLE";
+ pusch_nDMRS1 = 1;
+ phich_duration = "NORMAL";
+ phich_resource = "ONESIXTH";
+ srs_enable = "DISABLE";
+ /* srs_BandwidthConfig =;
+ srs_SubframeConfig =;
+ srs_ackNackST =;
+ srs_MaxUpPts =;*/
+
+ pusch_p0_Nominal = -96;
+ pusch_alpha = "AL1";
+ pucch_p0_Nominal = -104;
+ msg3_delta_Preamble = 6;
+ pucch_deltaF_Format1 = "deltaF2";
+ pucch_deltaF_Format1b = "deltaF3";
+ pucch_deltaF_Format2 = "deltaF0";
+ pucch_deltaF_Format2a = "deltaF0";
+ pucch_deltaF_Format2b = "deltaF0";
+
+ rach_numberOfRA_Preambles = 64;
+ rach_preamblesGroupAConfig = "DISABLE";
+ /*
+ rach_sizeOfRA_PreamblesGroupA = ;
+ rach_messageSizeGroupA = ;
+ rach_messagePowerOffsetGroupB = ;
+ */
+ rach_powerRampingStep = 4;
+ rach_preambleInitialReceivedTargetPower = -104;
+ rach_preambleTransMax = 10;
+ rach_raResponseWindowSize = 10;
+ rach_macContentionResolutionTimer = 48;
+ rach_maxHARQ_Msg3Tx = 4;
+
+ pcch_default_PagingCycle = 128;
+ pcch_nB = "oneT";
+ bcch_modificationPeriodCoeff = 2;
+ ue_TimersAndConstants_t300 = 1000;
+ ue_TimersAndConstants_t301 = 1000;
+ ue_TimersAndConstants_t310 = 1000;
+ ue_TimersAndConstants_t311 = 10000;
+ ue_TimersAndConstants_n310 = 20;
+ ue_TimersAndConstants_n311 = 1;
+
+ ue_TransmissionMode = 1;
+
+ }
+ );
+
+
+ srb1_parameters :
+ {
+ # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+ timer_poll_retransmit = 80;
+
+ # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+ timer_reordering = 35;
+
+ # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+ timer_status_prohibit = 0;
+
+ # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+ poll_pdu = 4;
+
+ # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+ poll_byte = 99999;
+
+ # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+ max_retx_threshold = 4;
+ }
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "192.168.12.11";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+
+ ENB_INTERFACE_NAME_FOR_S1_MME = "eth3";
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.215/24";
+ ENB_INTERFACE_NAME_FOR_S1U = "eth3";
+ ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.215/24";
+ ENB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ rrh_gw_config = (
+ {
+ local_if_name = "eth3";
+ remote_address = "10.10.10.18";
+ local_address = "10.10.10.157";
+ local_port = 50000; #for raw option local port must be the same to remote
+ remote_port = 50000;
+ rrh_gw_active = "yes";
+ tr_preference = "udp_if4p5";
+ rf_preference = "usrp_b200";
+ iq_txshift = 4;
+ tx_sample_advance = 80;
+ tx_scheduling_advance = 9;
+ if_compression = "alaw";
+ }
+ );
+
+ log_config :
+ {
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ };
+ }
+);
diff --git a/cmake_targets/autotests/v2/main.py b/cmake_targets/autotests/v2/main.py
index 14e54427201e1fc3e6bf6c6b8e057ab4b54806a2..da38432dbc270f9b208135191bd6a3df6d9a357d 100644
--- a/cmake_targets/autotests/v2/main.py
+++ b/cmake_targets/autotests/v2/main.py
@@ -280,55 +280,21 @@ machine_list.wait_all_free()
# run eNB softmodem tests #
##############################################################################
-tests = {
- 'b210' : {
- 'alu' : {
- 'fdd' : {
- '5' : {
- 'bandrich' : {
- 'tcp' : { 'ul': False, 'dl' : False },
- 'udp' : { 'ul': False, 'dl' : False }},
- 'sony' : {
- 'tcp' : { 'ul': False, 'dl' : False },
- 'udp' : { 'ul': False, 'dl' : False }}},
- '10' : {
- 'bandrich' : {
- 'tcp' : { 'ul': False, 'dl' : False },
- 'udp' : { 'ul': False, 'dl' : False }},
- 'sony' : {
- 'tcp' : { 'ul': False, 'dl' : False },
- 'udp' : { 'ul': False, 'dl' : False }}},
- '20' : {
- 'bandrich' : {
- 'tcp' : { 'ul': False, 'dl' : False },
- 'udp' : { 'ul': False, 'dl' : False }},
- 'sony' : {
- 'tcp' : { 'ul': False, 'dl' : False },
- 'udp' : { 'ul': False, 'dl' : False }}}},
- 'tdd' : {
- '5' : {
- '3276' : {
- 'tcp' : { 'ul': False, 'dl' : False },
- 'udp' : { 'ul': False, 'dl' : False }}},
- '10' : {
- '3276' : {
- 'tcp' : { 'ul': False, 'dl' : False },
- 'udp' : { 'ul': False, 'dl' : False }}},
- '20' : {
- '3276' : {
- 'tcp' : { 'ul': False, 'dl' : False },
- 'udp' : { 'ul': False, 'dl' : False }}}}},
- 'openair-cn' : {}
- },
- 'x310' : {
- 'alu' : {},
- 'openair-cn' : {}
- },
- 'exmimo2' : {
- 'alu' : {},
- 'openair-cn' : {}
- }
-}
+tests = {}
+for a in { 'b210', 'remote b210', 'x310', 'exmimo2' }:
+ tests[a] = {}
+ for b in { 'alu', 'openair-cn' }:
+ tests[a][b] = {}
+ for c in { 'fdd', 'tdd' }:
+ tests[a][b][c] = {}
+ for d in { '5', '10', '20' }:
+ tests[a][b][c][d] = {}
+ for e in { 'bandrich', 'sony', '3276' }:
+ tests[a][b][c][d][e] = {}
+ for f in { 'tcp', 'udp' }:
+ tests[a][b][c][d][e][f] = {}
+ for g in { 'dl', 'ul' }:
+ tests[a][b][c][d][e][f][g] = False
todo_tests_ids = []
for test in todo_tests:
@@ -441,6 +407,19 @@ for test in todo_tests_ids:
if test=='017504':log('WARNING: skip test ' + test) #TODO
if test=='017505':log('WARNING: skip test ' + test) #TODO
+ if test=='017600':tests['remote b210']['alu']['fdd'][ '5']['bandrich']['udp']['ul']=True
+ if test=='017601':tests['remote b210']['alu']['fdd']['10']['bandrich']['udp']['ul']=True
+ if test=='017602':tests['remote b210']['alu']['fdd']['20']['bandrich']['udp']['ul']=True
+ if test=='017603':tests['remote b210']['alu']['fdd'][ '5']['bandrich']['udp']['dl']=True
+ if test=='017604':tests['remote b210']['alu']['fdd']['10']['bandrich']['udp']['dl']=True
+ if test=='017605':tests['remote b210']['alu']['fdd']['20']['bandrich']['udp']['dl']=True
+ if test=='017606':tests['remote b210']['alu']['fdd'][ '5']['bandrich']['tcp']['ul']=True
+ if test=='017607':tests['remote b210']['alu']['fdd']['10']['bandrich']['tcp']['ul']=True
+ if test=='017608':tests['remote b210']['alu']['fdd']['20']['bandrich']['tcp']['ul']=True
+ if test=='017609':tests['remote b210']['alu']['fdd'][ '5']['bandrich']['tcp']['dl']=True
+ if test=='017610':tests['remote b210']['alu']['fdd']['10']['bandrich']['tcp']['dl']=True
+ if test=='017611':tests['remote b210']['alu']['fdd']['20']['bandrich']['tcp']['dl']=True
+
if test=='018000':log('WARNING: skip test ' + test) #TODO
if test=='018001':log('WARNING: skip test ' + test) #TODO
if test=='018002':log('WARNING: skip test ' + test) #TODO
diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c
index de83506bb31aed698f0c41fa95ff49468c204955..d2a814c1755940db4912dcf366c004cea0296231 100755
--- a/openair1/PHY/INIT/lte_init.c
+++ b/openair1/PHY/INIT/lte_init.c
@@ -614,8 +614,12 @@ void phy_config_afterHO_ue(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_id, Mobility
// RNTI
- PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[eNB_id]->crnti = mobilityControlInfo->newUE_Identity.buf[0]|(mobilityControlInfo->newUE_Identity.buf[1]<<8);
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[0][eNB_id]->crnti = mobilityControlInfo->newUE_Identity.buf[0]|(mobilityControlInfo->newUE_Identity.buf[1]<<8);
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[1][eNB_id]->crnti = mobilityControlInfo->newUE_Identity.buf[0]|(mobilityControlInfo->newUE_Identity.buf[1]<<8);
+
+ LOG_I(PHY,"SET C-RNTI %x %x\n",PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[0][eNB_id]->crnti,
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[1][eNB_id]->crnti);
}
if(ho_failed) {
@@ -835,7 +839,7 @@ void phy_config_dedicated_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,
if (physicalConfigDedicated->antennaInfo) {
phy_vars_ue->transmission_mode[eNB_id] = 1+(physicalConfigDedicated->antennaInfo->choice.explicitValue.transmissionMode);
- LOG_D(PHY,"Transmission Mode %d\n",phy_vars_ue->transmission_mode[eNB_id]);
+ LOG_I(PHY,"Transmission Mode %d\n",phy_vars_ue->transmission_mode[eNB_id]);
switch(physicalConfigDedicated->antennaInfo->choice.explicitValue.transmissionMode) {
case AntennaInfoDedicated__transmissionMode_tm1:
phy_vars_ue->transmission_mode[eNB_id] = 1;
@@ -856,7 +860,7 @@ void phy_config_dedicated_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,
phy_vars_ue->transmission_mode[eNB_id] = 6;
break;
case AntennaInfoDedicated__transmissionMode_tm7:
- lte_gold_ue_spec_port5(phy_vars_ue->lte_gold_uespec_port5_table, phy_vars_ue->frame_parms.Nid_cell, phy_vars_ue->pdcch_vars[eNB_id]->crnti);
+ lte_gold_ue_spec_port5(phy_vars_ue->lte_gold_uespec_port5_table, phy_vars_ue->frame_parms.Nid_cell, phy_vars_ue->pdcch_vars[0][eNB_id]->crnti);
phy_vars_ue->transmission_mode[eNB_id] = 7;
break;
default:
@@ -952,6 +956,14 @@ void phy_config_dedicated_ue(uint8_t Mod_id,int CC_id,uint8_t eNB_id,
LOG_I(PHY,"Disabling SIB MIB decoding \n");
phy_vars_ue->decode_SIB = 0;
phy_vars_ue->decode_MIB = 0;
+ //phy_vars_ue->pdcch_vars[1][eNB_id]->crnti = phy_vars_ue->pdcch_vars[0][eNB_id]->crnti;
+ if(phy_vars_ue->pdcch_vars[0][eNB_id]->crnti == 0x1234)
+ phy_vars_ue->pdcch_vars[0][eNB_id]->crnti = phy_vars_ue->pdcch_vars[1][eNB_id]->crnti;
+ else
+ phy_vars_ue->pdcch_vars[1][eNB_id]->crnti = phy_vars_ue->pdcch_vars[0][eNB_id]->crnti;
+
+ LOG_I(PHY,"C-RNTI %x %x \n", phy_vars_ue->pdcch_vars[0][eNB_id]->crnti,
+ phy_vars_ue->pdcch_vars[1][eNB_id]->crnti);
}
@@ -1075,7 +1087,8 @@ int phy_init_lte_ue(PHY_VARS_UE *ue,
LTE_UE_PDSCH** const pdsch_vars_ra = ue->pdsch_vars_ra;
LTE_UE_PDSCH** const pdsch_vars_mch = ue->pdsch_vars_MCH;
LTE_UE_PBCH** const pbch_vars = ue->pbch_vars;
- LTE_UE_PDCCH** const pdcch_vars = ue->pdcch_vars;
+ LTE_UE_PDCCH** const pdcch_vars_th0 = ue->pdcch_vars[0];
+ LTE_UE_PDCCH** const pdcch_vars_th1 = ue->pdcch_vars[1];
LTE_UE_PRACH** const prach_vars = ue->prach_vars;
int i,j,k,l;
@@ -1157,7 +1170,8 @@ int phy_init_lte_ue(PHY_VARS_UE *ue,
pdsch_vars_SI[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
pdsch_vars_ra[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
pdsch_vars_mch[eNB_id] = (LTE_UE_PDSCH *)malloc16_clear(sizeof(LTE_UE_PDSCH));
- pdcch_vars[eNB_id] = (LTE_UE_PDCCH *)malloc16_clear(sizeof(LTE_UE_PDCCH));
+ pdcch_vars_th0[eNB_id] = (LTE_UE_PDCCH *)malloc16_clear(sizeof(LTE_UE_PDCCH));
+ pdcch_vars_th1[eNB_id] = (LTE_UE_PDCCH *)malloc16_clear(sizeof(LTE_UE_PDCCH));
prach_vars[eNB_id] = (LTE_UE_PRACH *)malloc16_clear(sizeof(LTE_UE_PRACH));
pbch_vars[eNB_id] = (LTE_UE_PBCH *)malloc16_clear(sizeof(LTE_UE_PBCH));
@@ -1233,29 +1247,46 @@ int phy_init_lte_ue(PHY_VARS_UE *ue,
phy_init_lte_ue__PDSCH( pdsch_vars_mch[eNB_id], fp );
// 100 PRBs * 12 REs/PRB * 4 PDCCH SYMBOLS * 2 LLRs/RE
- pdcch_vars[eNB_id]->llr = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- pdcch_vars[eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- pdcch_vars[eNB_id]->wbar = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
- pdcch_vars[eNB_id]->e_rx = (int8_t*)malloc16_clear( 4*2*100*12 );
-
- pdcch_vars[eNB_id]->rxdataF_comp = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdcch_vars[eNB_id]->dl_ch_rho_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdcch_vars[eNB_id]->rho = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
- pdcch_vars[eNB_id]->rxdataF_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
- pdcch_vars[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdcch_vars_th0[eNB_id]->llr = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ pdcch_vars_th0[eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ pdcch_vars_th0[eNB_id]->wbar = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ pdcch_vars_th0[eNB_id]->e_rx = (int8_t*)malloc16_clear( 4*2*100*12 );
+
+ pdcch_vars_th0[eNB_id]->rxdataF_comp = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdcch_vars_th0[eNB_id]->dl_ch_rho_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdcch_vars_th0[eNB_id]->rho = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+ pdcch_vars_th0[eNB_id]->rxdataF_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdcch_vars_th0[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+
+ pdcch_vars_th1[eNB_id]->llr = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ pdcch_vars_th1[eNB_id]->llr16 = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ pdcch_vars_th1[eNB_id]->wbar = (uint16_t*)malloc16_clear( 2*4*100*12*sizeof(uint16_t) );
+ pdcch_vars_th1[eNB_id]->e_rx = (int8_t*)malloc16_clear( 4*2*100*12 );
+
+ pdcch_vars_th1[eNB_id]->rxdataF_comp = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdcch_vars_th1[eNB_id]->dl_ch_rho_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdcch_vars_th1[eNB_id]->rho = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
+ pdcch_vars_th1[eNB_id]->rxdataF_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
+ pdcch_vars_th1[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
for (i=0; i<fp->nb_antennas_rx; i++) {
//ue_pdcch_vars[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(fp->N_RB_DL*12*7*2) );
- pdcch_vars[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
+ pdcch_vars_th0[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
+ pdcch_vars_th1[eNB_id]->rho[i] = (int32_t*)malloc16_clear( sizeof(int32_t)*(100*12*4) );
for (j=0; j<4; j++) { //fp->nb_antennas_tx; j++)
int idx = (j<<1)+i;
// size_t num = 7*2*fp->N_RB_DL*12;
size_t num = 4*100*12; // 4 symbols, 100 PRBs, 12 REs per PRB
- pdcch_vars[eNB_id]->rxdataF_comp[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- pdcch_vars[eNB_id]->dl_ch_rho_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- pdcch_vars[eNB_id]->rxdataF_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
- pdcch_vars[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdcch_vars_th0[eNB_id]->rxdataF_comp[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdcch_vars_th0[eNB_id]->dl_ch_rho_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdcch_vars_th0[eNB_id]->rxdataF_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdcch_vars_th0[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+
+ pdcch_vars_th1[eNB_id]->rxdataF_comp[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdcch_vars_th1[eNB_id]->dl_ch_rho_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdcch_vars_th1[eNB_id]->rxdataF_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
+ pdcch_vars_th1[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t) * num );
}
}
diff --git a/openair1/PHY/LTE_TRANSPORT/dci.c b/openair1/PHY/LTE_TRANSPORT/dci.c
index af25e33ff74dbc70ea7d4d46a6cdfcbf41fad1a1..21c4c8aba84c57cb312e0edb0900955e965db662 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci.c
@@ -1682,9 +1682,7 @@ void pdcch_alamouti(LTE_DL_FRAME_PARMS *frame_parms,
int32_t avgP[4];
-int32_t rx_pdcch(LTE_UE_COMMON *common_vars,
- LTE_UE_PDCCH **pdcch_vars,
- LTE_DL_FRAME_PARMS *frame_parms,
+int32_t rx_pdcch(PHY_VARS_UE *ue,
uint32_t frame,
uint8_t subframe,
uint8_t eNB_id,
@@ -1693,6 +1691,10 @@ int32_t rx_pdcch(LTE_UE_COMMON *common_vars,
uint8_t is_secondary_ue)
{
+ LTE_UE_COMMON *common_vars = &ue->common_vars;
+ LTE_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
+ LTE_UE_PDCCH **pdcch_vars = ue->pdcch_vars[subframe & 0x1];
+
uint8_t log2_maxh,aatx,aarx;
#ifdef MU_RECEIVER
uint8_t eNB_id_i=eNB_id+1;//add 1 to eNB_id to separate from wanted signal, chosen as the B/F'd pilots from the SeNB are shifted by 1
@@ -1701,7 +1703,7 @@ int32_t rx_pdcch(LTE_UE_COMMON *common_vars,
uint8_t n_pdcch_symbols = 3; //pdcch_vars[eNB_id]->num_pdcch_symbols;
uint8_t mi = get_mi(frame_parms,subframe);
- // printf("In rx_pdcch, subframe %d, eNB_id %d\n",subframe,eNB_id);
+ //printf("In rx_pdcch, subframe %d, eNB_id %d, pdcch_vars %d \n",subframe,eNB_id,pdcch_vars);
for (s=0; s<n_pdcch_symbols; s++) {
if (is_secondary_ue == 1) {
@@ -1876,12 +1878,12 @@ int32_t rx_pdcch(LTE_UE_COMMON *common_vars,
pdcch_vars[eNB_id],
mimo_mode);
+
if (n_pdcch_symbols>3)
n_pdcch_symbols=1;
#ifdef DEBUG_DCI_DECODING
- printf("[PDCCH] subframe %d n_pdcch_symbols from PCFICH =%d\n",subframe,n_pdcch_symbols);
printf("demapping: subframe %d, mi %d, tdd_config %d\n",subframe,get_mi(frame_parms,subframe),frame_parms->tdd_config);
#endif
@@ -2503,7 +2505,7 @@ void dci_decoding(uint8_t DCI_LENGTH,
}
-static uint8_t dci_decoded_output[(MAX_DCI_SIZE_BITS+64)/8];
+static uint8_t dci_decoded_output[2][(MAX_DCI_SIZE_BITS+64)/8];
uint16_t get_nCCE(uint8_t num_pdcch_symbols,LTE_DL_FRAME_PARMS *frame_parms,uint8_t mi)
{
@@ -2795,21 +2797,23 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **pdcch_vars,
#ifdef DEBUG_DCI_DECODING
if (do_common == 1)
- LOG_I(PHY,"[DCI search - common] Attempting candidate %d Aggregation Level %d DCI length %d at CCE %d/%d (CCEmap %x,CCEmap_cand %x)\n",m,L2,sizeof_bits,CCEind,nCCE,*CCEmap,CCEmap_mask);
+ LOG_I(PHY,"[DCI search nPdcch %d - common] Attempting candidate %d Aggregation Level %d DCI length %d at CCE %d/%d (CCEmap %x,CCEmap_cand %x)\n",
+ pdcch_vars[eNB_id]->num_pdcch_symbols,m,L2,sizeof_bits,CCEind,nCCE,*CCEmap,CCEmap_mask);
else
- LOG_I(PHY,"[DCI search - ue spec] Attempting candidate %d Aggregation Level %d DCI length %d at CCE %d/%d (CCEmap %x,CCEmap_cand %x)\n",m,L2,sizeof_bits,CCEind,nCCE,*CCEmap,CCEmap_mask);
+ LOG_I(PHY,"[DCI search nPdcch %d - ue spec] Attempting candidate %d Aggregation Level %d DCI length %d at CCE %d/%d (CCEmap %x,CCEmap_cand %x)\n",
+ pdcch_vars[eNB_id]->num_pdcch_symbols,m,L2,sizeof_bits,CCEind,nCCE,*CCEmap,CCEmap_mask);
#endif
dci_decoding(sizeof_bits,
L,
&pdcch_vars[eNB_id]->e_rx[CCEind*72],
- dci_decoded_output);
+ &dci_decoded_output[subframe&0x1][0]);
/*
for (i=0;i<3+(sizeof_bits>>3);i++)
printf("dci_decoded_output[%d] => %x\n",i,dci_decoded_output[i]);
*/
- crc = (crc16(dci_decoded_output,sizeof_bits)>>16) ^ extract_crc(dci_decoded_output,sizeof_bits);
+ crc = (crc16(&dci_decoded_output[subframe&0x1][0],sizeof_bits)>>16) ^ extract_crc(&dci_decoded_output[subframe&0x1][0],sizeof_bits);
#ifdef DEBUG_DCI_DECODING
printf("crc =>%x\n",crc);
#endif
@@ -2823,27 +2827,31 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **pdcch_vars,
dci_alloc[*dci_cnt].L = L;
dci_alloc[*dci_cnt].firstCCE = CCEind;
+ //printf("DCI FOUND !!! crc =>%x, sizeof_bits %d, sizeof_bytes %d \n",crc, sizeof_bits, sizeof_bytes);
if (sizeof_bytes<=4) {
- dci_alloc[*dci_cnt].dci_pdu[3] = dci_decoded_output[0];
- dci_alloc[*dci_cnt].dci_pdu[2] = dci_decoded_output[1];
- dci_alloc[*dci_cnt].dci_pdu[1] = dci_decoded_output[2];
- dci_alloc[*dci_cnt].dci_pdu[0] = dci_decoded_output[3];
+ dci_alloc[*dci_cnt].dci_pdu[3] = dci_decoded_output[subframe&0x1][0];
+ dci_alloc[*dci_cnt].dci_pdu[2] = dci_decoded_output[subframe&0x1][1];
+ dci_alloc[*dci_cnt].dci_pdu[1] = dci_decoded_output[subframe&0x1][2];
+ dci_alloc[*dci_cnt].dci_pdu[0] = dci_decoded_output[subframe&0x1][3];
#ifdef DEBUG_DCI_DECODING
- printf("DCI => %x,%x,%x,%x\n",dci_decoded_output[0],dci_decoded_output[1],dci_decoded_output[2],dci_decoded_output[3]);
+ printf("DCI => %x,%x,%x,%x\n",dci_decoded_output[subframe&0x1][0],
+ dci_decoded_output[subframe&0x1][1],
+ dci_decoded_output[subframe&0x1][2],
+ dci_decoded_output[subframe&0x1][3]);
#endif
} else {
- dci_alloc[*dci_cnt].dci_pdu[7] = dci_decoded_output[0];
- dci_alloc[*dci_cnt].dci_pdu[6] = dci_decoded_output[1];
- dci_alloc[*dci_cnt].dci_pdu[5] = dci_decoded_output[2];
- dci_alloc[*dci_cnt].dci_pdu[4] = dci_decoded_output[3];
- dci_alloc[*dci_cnt].dci_pdu[3] = dci_decoded_output[4];
- dci_alloc[*dci_cnt].dci_pdu[2] = dci_decoded_output[5];
- dci_alloc[*dci_cnt].dci_pdu[1] = dci_decoded_output[6];
- dci_alloc[*dci_cnt].dci_pdu[0] = dci_decoded_output[7];
+ dci_alloc[*dci_cnt].dci_pdu[7] = dci_decoded_output[subframe&0x1][0];
+ dci_alloc[*dci_cnt].dci_pdu[6] = dci_decoded_output[subframe&0x1][1];
+ dci_alloc[*dci_cnt].dci_pdu[5] = dci_decoded_output[subframe&0x1][2];
+ dci_alloc[*dci_cnt].dci_pdu[4] = dci_decoded_output[subframe&0x1][3];
+ dci_alloc[*dci_cnt].dci_pdu[3] = dci_decoded_output[subframe&0x1][4];
+ dci_alloc[*dci_cnt].dci_pdu[2] = dci_decoded_output[subframe&0x1][5];
+ dci_alloc[*dci_cnt].dci_pdu[1] = dci_decoded_output[subframe&0x1][6];
+ dci_alloc[*dci_cnt].dci_pdu[0] = dci_decoded_output[subframe&0x1][7];
#ifdef DEBUG_DCI_DECODING
printf("DCI => %x,%x,%x,%x,%x,%x,%x,%x\n",
- dci_decoded_output[0],dci_decoded_output[1],dci_decoded_output[2],dci_decoded_output[3],
- dci_decoded_output[4],dci_decoded_output[5],dci_decoded_output[6],dci_decoded_output[7]);
+ dci_decoded_output[subframe&0x1][0],dci_decoded_output[subframe&0x1][1],dci_decoded_output[subframe&0x1][2],dci_decoded_output[subframe&0x1][3],
+ dci_decoded_output[subframe&0x1][4],dci_decoded_output[subframe&0x1][5],dci_decoded_output[subframe&0x1][6],dci_decoded_output[subframe&0x1][7]);
#endif
}
@@ -2860,7 +2868,7 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **pdcch_vars,
*dci_cnt = *dci_cnt+1;
} else if (crc==pdcch_vars[eNB_id]->crnti) {
- if ((mode&UL_DCI)&&(format_c == format0)&&((dci_decoded_output[0]&0x80)==0)) {// check if pdu is format 0 or 1A
+ if ((mode&UL_DCI)&&(format_c == format0)&&((dci_decoded_output[subframe&0x1][0]&0x80)==0)) {// check if pdu is format 0 or 1A
if (*format0_found == 0) {
dci_alloc[*dci_cnt].format = format0;
*format0_found = 1;
@@ -2928,7 +2936,7 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
uint8_t dci_cnt=0,old_dci_cnt=0;
uint32_t CCEmap0=0,CCEmap1=0,CCEmap2=0;
- LTE_UE_PDCCH **pdcch_vars = ue->pdcch_vars;
+ LTE_UE_PDCCH **pdcch_vars = ue->pdcch_vars[subframe & 0x1];
LTE_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
uint8_t mi = get_mi(&ue->frame_parms,subframe);
uint16_t ra_rnti=99;
@@ -3518,7 +3526,7 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
} else if (tmode == 3) {
- LOG_D(PHY," Now check UE_SPEC format 2A_2A search aggregation 1\n");
+ LOG_D(PHY," Now check UE_SPEC format 2A_2A search aggregation 1 dci length: %d[bits] %d[bytes]\n",format2A_size_bits,format2A_size_bytes);
// Now check UE_SPEC format 2A_2A search spaces at aggregation 1
old_dci_cnt=dci_cnt;
dci_decoding_procedure0(pdcch_vars,0,mode,
@@ -3554,7 +3562,7 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
return(dci_cnt);
// Now check UE_SPEC format 2 search spaces at aggregation 2
- LOG_D(PHY," Now check UE_SPEC format 2A_2A search aggregation 2\n");
+ LOG_D(PHY," Now check UE_SPEC format 2A_2A search aggregation 2 dci length: %d[bits] %d[bytes]\n",format2A_size_bits,format2A_size_bytes);
old_dci_cnt=dci_cnt;
dci_decoding_procedure0(pdcch_vars,0,mode,
subframe,
@@ -3623,7 +3631,7 @@ uint16_t dci_decoding_procedure(PHY_VARS_UE *ue,
//#ifdef ALL_AGGREGATION
// Now check UE_SPEC format 2_2A search spaces at aggregation 8
- LOG_D(PHY," Now check UE_SPEC format 2_2A search spaces at aggregation 8 \n");
+ LOG_D(PHY," Now check UE_SPEC format 2_2A search spaces at aggregation 8 dci length: %d[bits] %d[bytes]\n",format2A_size_bits,format2A_size_bytes);
old_dci_cnt=dci_cnt;
dci_decoding_procedure0(pdcch_vars,0,mode,
subframe,
diff --git a/openair1/PHY/LTE_TRANSPORT/dci.h b/openair1/PHY/LTE_TRANSPORT/dci.h
index c250e7c10ab00fa29cc56fd7449a69410482f3b1..2987f026e04663ddd8ee68e2adb2b321a95d128a 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci.h
+++ b/openair1/PHY/LTE_TRANSPORT/dci.h
@@ -1897,9 +1897,9 @@ struct DCI2A_10MHz_4A_TDD {
#define sizeof_DCI2A_10MHz_4A_TDD_t 41
typedef struct DCI2A_10MHz_4A_TDD DCI2A_10MHz_4A_TDD_t;
-/// DCI Format Type 2A (10 MHz, FDD, 2 Antenna Ports, 36 bits)
+/// DCI Format Type 2A (10 MHz, FDD, 2 Antenna Ports, 40 bits)
struct DCI2A_10MHz_2A_FDD {
- uint64_t padding:28;
+ uint64_t padding:24;
/// Redundancy version 2
uint64_t rv2:2;
/// New Data Indicator 2
@@ -1923,7 +1923,7 @@ struct DCI2A_10MHz_2A_FDD {
/// Resource Allocation Header
uint64_t rah:1;
} __attribute__ ((__packed__));
-#define sizeof_DCI2A_10MHz_2A_FDD_t 36
+#define sizeof_DCI2A_10MHz_2A_FDD_t 41
typedef struct DCI2A_10MHz_2A_FDD DCI2A_10MHz_2A_FDD_t;
/// DCI Format Type 2A (10 MHz, FDD, 4 Antenna Ports, 38 bits)
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
index c4e379b45ab1b42c1db7b9622f67402be0f0b737..00e7d45b8c6a9614204d27135404153f55ac484f 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -5144,6 +5144,7 @@ void prepare_dl_decoding_format1_1A(DCI_format_t dci_format,
LTE_DL_FRAME_PARMS *frame_parms,
uint8_t subframe,
uint16_t rnti,
+ uint16_t tc_rnti,
uint16_t si_rnti,
uint16_t ra_rnti,
uint16_t p_rnti,
@@ -5206,6 +5207,13 @@ void prepare_dl_decoding_format1_1A(DCI_format_t dci_format,
}
else //CRNTI
{
+ if (rnti == tc_rnti) {
+ //fix for standalone Contention Resolution Id
+ pdlsch0_harq->DCINdi = (uint8_t)-1;
+ LOG_D(PHY,"UE (%x/%d): Format1A DCI: C-RNTI is temporary. Set NDI = %d and to be ignored\n",
+ rnti,harq_pid,pdlsch0_harq->DCINdi);
+ }
+
// DCI has been toggled or this is the first transmission
if (ndi1!=pdlsch0_harq->DCINdi)
{
@@ -5720,9 +5728,9 @@ void prepare_dl_decoding_format2_2A(DCI_format_t dci_format,
pdlsch1->active = 0;
}
-#ifdef DEBUG_HARQ
+//#ifdef DEBUG_HARQ
printf("[DCI UE]: dlsch0_harq status %d , dlsch1_harq status %d\n", dlsch0_harq->status, dlsch1_harq->status);
-#endif
+//#endif
// compute resource allocation
if (TB0_active == 1){
@@ -5882,9 +5890,9 @@ void prepare_dl_decoding_format2_2A(DCI_format_t dci_format,
dlsch1_harq->Qm = (mcs2-28)<<1;
}
-#ifdef DEBUG_HARQ
+//#ifdef DEBUG_HARQ
printf("[DCI UE]: dlsch0_harq status %d , dlsch1_harq status %d\n", dlsch0_harq->status, dlsch1_harq->status);
-#endif
+//#endif
#ifdef DEBUG_HARQ
if (dlsch0 != NULL && dlsch1 != NULL)
@@ -5992,6 +6000,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
frame_parms,
subframe,
rnti,
+ tc_rnti,
si_rnti,
ra_rnti,
p_rnti,
@@ -6092,6 +6101,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
frame_parms,
subframe,
rnti,
+ tc_rnti,
si_rnti,
ra_rnti,
p_rnti,
@@ -6156,7 +6166,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
case format2A:
{
// extract dci infomation
- //LOG_I(PHY,"[DCI-format2] AbsSubframe %d.%d extract dci infomation \n", frame%1024, subframe);
+ LOG_I(PHY,"[DCI-format2] AbsSubframe %d.%d extract dci infomation \n", frame%1024, subframe);
extract_dci2A_info(frame_parms->N_RB_DL,
frame_type,
frame_parms->nb_antenna_ports_eNB,
@@ -6376,7 +6386,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
}
- #ifdef DEBUG_DCI
+#ifdef DEBUG_DCI
if (dlsch[0] && (dlsch[0]->rnti != 0xffff)) {
printf("dci_format:%d Abssubframe: %d.%d \n",dci_format,frame%1024,subframe);
@@ -6384,7 +6394,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
printf("PDSCH dlsch0 UE: NBRB %d\n",dlsch0_harq->nb_rb);
printf("PDSCH dlsch0 UE: rballoc %x\n",dlsch0_harq->rb_alloc_even[0]);
printf("PDSCH dlsch0 UE: harq_pid %d\n",harq_pid);
- printf("PDSCH dlsch0 UE: tpc %d\n",TPC);
+ //printf("PDSCH dlsch0 UE: tpc %d\n",TPC);
printf("PDSCH dlsch0 UE: g %d\n",dlsch[0]->g_pucch);
printf("PDSCH dlsch0 UE: round %d\n",dlsch0_harq->round);
printf("PDSCH dlsch0 UE: DCINdi %d\n",dlsch0_harq->DCINdi);
@@ -6393,8 +6403,7 @@ int generate_ue_dlsch_params_from_dci(int frame,
printf("PDSCH dlsch0 UE: mcs %d\n",dlsch0_harq->mcs);
printf("PDSCH dlsch0 UE: pwr_off %d\n",dlsch0_harq->dl_power_off);
}
-
- #endif
+#endif
#if T_TRACER
if( (dlsch[0]->rnti != si_rnti) && (dlsch[0]->rnti != ra_rnti) && (dlsch[0]->rnti != p_rnti))
@@ -8077,7 +8086,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
// ulsch->n_DMRS2 = ((DCI0_5MHz_TDD_1_6_t *)dci_pdu)->cshift;
- #ifdef DEBUG_DCI
+#ifdef DEBUG_DCI
printf("Format 0 DCI : ulsch (ue): AbsSubframe %d.%d\n",proc->frame_rx%1024,subframe);
printf("Format 0 DCI : ulsch (ue): NBRB %d\n",ulsch->harq_processes[harq_pid]->nb_rb);
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
index d683decc9f57230760206b91795621eaa585de8e..9f8ee6cec79a861403653fabbc6348f534647fa6 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
@@ -160,7 +160,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
LTE_DL_FRAME_PARMS *frame_parms,
LTE_UE_DLSCH_t *dlsch,
LTE_DL_UE_HARQ_t *harq_process,
- uint8_t frame,
+ uint32_t frame,
uint8_t subframe,
uint8_t harq_pid,
uint8_t is_crnti,
@@ -472,6 +472,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
}
start_meas(dlsch_turbo_decoding_stats);
+ LOG_D(PHY,"AbsSubframe %d.%d Start turbo segment %d/%d \n",frame%1024,subframe,r,harq_process->C-1);
ret = tc
(&harq_process->d[r][96],
harq_process->c[r],
@@ -626,7 +627,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
if ((err_flag == 0) && (ret>=(1+dlsch->max_turbo_iterations))) {// a Code segment is in error so break;
- //printf("CRC failed, segment %d\n",r);
+ LOG_D(PHY,"AbsSubframe %d.%d CRC failed, segment %d/%d \n",frame%1024,subframe,r,harq_process->C-1);
err_flag = 1;
}
}
@@ -927,7 +928,7 @@ uint32_t dlsch_decoding_emul(PHY_VARS_UE *phy_vars_ue,
case PDSCH: // TB0
dlsch_ue = phy_vars_ue->dlsch[subframe&0x1][eNB_id][0];
harq_pid = dlsch_ue->current_harq_pid;
- ue_id= (uint32_t)find_ue((int16_t)phy_vars_ue->pdcch_vars[(uint32_t)eNB_id]->crnti,PHY_vars_eNB_g[eNB_id2][CC_id]);
+ ue_id= (uint32_t)find_ue((int16_t)phy_vars_ue->pdcch_vars[subframe & 0x1][(uint32_t)eNB_id]->crnti,PHY_vars_eNB_g[eNB_id2][CC_id]);
DevAssert( ue_id != (uint32_t)-1 );
dlsch_eNB = PHY_vars_eNB_g[eNB_id2][CC_id]->dlsch[ue_id][0];
@@ -973,7 +974,7 @@ uint32_t dlsch_decoding_emul(PHY_VARS_UE *phy_vars_ue,
case PDSCH1: { // TB1
dlsch_ue = phy_vars_ue->dlsch[subframe&0x1][eNB_id][1];
harq_pid = dlsch_ue->current_harq_pid;
- int8_t UE_id = find_ue( phy_vars_ue->pdcch_vars[eNB_id]->crnti, PHY_vars_eNB_g[eNB_id2][CC_id] );
+ int8_t UE_id = find_ue( phy_vars_ue->pdcch_vars[subframe & 0x1][eNB_id]->crnti, PHY_vars_eNB_g[eNB_id2][CC_id] );
DevAssert( UE_id != -1 );
dlsch_eNB = PHY_vars_eNB_g[eNB_id2][CC_id]->dlsch[UE_id][1];
// reset HARQ
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
index a842a8a9dcf88ed8dc4b130412f8188d5d5c0ca9..cb1129f8cb6118d78551f85f55cb003053e28168 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
@@ -56,9 +56,7 @@ int16_t dlsch_demod_shift = 0;
//#define DEBUG_PHY 1
//#define DEBUG_DLSCH_DEMOD 1
-int avg[4];
-int avg_0[2];
-int avg_1[2];
+
// [MCS][i_mod (0,1,2) = (2,4,6)]
unsigned char offset_mumimo_llr_drange_fix=0;
@@ -110,6 +108,9 @@ int rx_pdsch(PHY_VARS_UE *ue,
PHY_MEASUREMENTS *measurements = &ue->measurements;
LTE_UE_DLSCH_t **dlsch;
+ int avg[4];
+ int avg_0[2];
+ int avg_1[2];
unsigned char aatx,aarx;
@@ -143,7 +144,7 @@ int rx_pdsch(PHY_VARS_UE *ue,
break;
case PDSCH:
- pdsch_vars = &ue->pdsch_vars[subframe&0x1][eNB_id];
+ pdsch_vars = ue->pdsch_vars[subframe&0x1];
dlsch = ue->dlsch[subframe&0x1][eNB_id];
LOG_D(PHY,"AbsSubframe %d.%d / Sym %d harq_pid %d, harq status %d.%d \n",
frame,subframe,symbol,harq_pid,
@@ -3374,9 +3375,16 @@ void dlsch_channel_level(int **dl_ch_estimates_ext,
symbol_mod = (symbol>=(7-frame_parms->Ncp)) ? symbol-(7-frame_parms->Ncp) : symbol;
- float one_over_nb_re = 0;
- one_over_nb_re = 1/(nb_rb *12);
- int16_t one_over_nb_re_q1_15 = (int16_t)(one_over_nb_re * (float)(1<<15) );
+ if (((symbol_mod == 0) || (symbol_mod == (frame_parms->Ncp-1)))&&(frame_parms->mode1_flag==0))
+ nre=8;
+ else if (((symbol_mod == 0) || (symbol_mod == (frame_parms->Ncp-1)))&&(frame_parms->mode1_flag==1))
+ nre=10;
+ else
+ nre=12;
+
+ double one_over_nb_re = 0.0;
+ one_over_nb_re = 1/((double)(nb_rb*nre));
+ int16_t one_over_nb_re_q1_15 = (int16_t)(one_over_nb_re * (double)(1<<15) );
coeff128 = _mm_set_epi16(one_over_nb_re_q1_15,one_over_nb_re_q1_15,one_over_nb_re_q1_15,one_over_nb_re_q1_15,
one_over_nb_re_q1_15,one_over_nb_re_q1_15,one_over_nb_re_q1_15,one_over_nb_re_q1_15);
@@ -3398,7 +3406,7 @@ void dlsch_channel_level(int **dl_ch_estimates_ext,
dl_ch128+=2;
}
else {
- avg128D = _mm_add_epi32(avg128D,_mm_madd_epi16(dl_ch128[2],dl_ch128[2]));
+ avg128D = _mm_add_epi32(avg128D,_mm_madd_epi16(dl_ch128[2],_mm_srai_epi16(_mm_mulhi_epi16(dl_ch128[2], coeff128),15)));
dl_ch128+=3;
}
/*
@@ -3410,18 +3418,10 @@ void dlsch_channel_level(int **dl_ch_estimates_ext,
*/
}
- if (((symbol_mod == 0) || (symbol_mod == (frame_parms->Ncp-1)))&&(frame_parms->mode1_flag==0))
- nre=8;
- else if (((symbol_mod == 0) || (symbol_mod == (frame_parms->Ncp-1)))&&(frame_parms->mode1_flag==1))
- nre=10;
- else
- nre=12;
-
avg[(aatx<<1)+aarx] =(((int32_t*)&avg128D)[0] +
((int32_t*)&avg128D)[1] +
((int32_t*)&avg128D)[2] +
((int32_t*)&avg128D)[3]);
-
// printf("Channel level : %d\n",avg[(aatx<<1)+aarx]);
}
@@ -5880,7 +5880,7 @@ unsigned short dlsch_extract_rbs_TM7(int **rxdataF,
#ifdef USER_MODE
-void dump_dlsch2(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t subframe,uint16_t coded_bits_per_codeword,int round, unsigned char harq_pid)
+void dump_dlsch2(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t subframe,unsigned int *coded_bits_per_codeword,int round, unsigned char harq_pid)
{
unsigned int nsymb = (ue->frame_parms.Ncp == 0) ? 14 : 12;
char fname[32],vname[32];
@@ -5959,7 +5959,7 @@ void dump_dlsch2(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t subframe,uint16_t coded_
sprintf(fname,"dlsch%d_rxF_r%d_llr.m",eNB_id,round);
sprintf(vname,"dl%d_r%d_llr",eNB_id,round);
- write_output(fname,vname, ue->pdsch_vars[subframe&0x1][eNB_id]->llr[0],coded_bits_per_codeword,1,0);
+ write_output(fname,vname, ue->pdsch_vars[subframe&0x1][eNB_id]->llr[0],coded_bits_per_codeword[0],1,0);
sprintf(fname,"dlsch%d_r%d_mag1.m",eNB_id,round);
sprintf(vname,"dl%d_r%d_mag1",eNB_id,round);
write_output(fname,vname,ue->pdsch_vars[subframe&0x1][eNB_id]->dl_ch_mag0[0],12*N_RB_DL*nsymb,1,1);
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
index b08836762cdbbf4111cc9f32b1460c891718d752..e2de78f9caf4b903bb30051095fc83d9774b8b1d 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
@@ -8847,6 +8847,15 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
memcpy(ch_mag_i_256i, ch_mag_i, len*4);
memcpy(rho_256i, rho, len*4);
+#if 0
+ qam64_qam16_avx2((short *)rxF_256i,
+ (short *)rxF_i_256i,
+ (short *)ch_mag_256i,
+ (short *)ch_mag_i_256i,
+ (short *)llr16,
+ (short *) rho_256i,
+ len);
+#else
qam64_qam64_avx2((int32_t *)rxF_256i,
(int32_t *)rxF_i_256i,
(int32_t *)ch_mag_256i,
@@ -8854,7 +8863,7 @@ int dlsch_64qam_64qam_llr(LTE_DL_FRAME_PARMS *frame_parms,
(int16_t *)llr16,
(int32_t *) rho_256i,
len);
-
+#endif
free16(rxF_256i, sizeof(rxF_256i));
free16(rxF_i_256i, sizeof(rxF_i_256i));
free16(ch_mag_256i, sizeof(ch_mag_256i));
diff --git a/openair1/PHY/LTE_TRANSPORT/phich.c b/openair1/PHY/LTE_TRANSPORT/phich.c
index df789cd174bf09d42148df583952822069cc6d60..d363d4dcf65faf9312a1dc70357f45eab7f5f6a8 100644
--- a/openair1/PHY/LTE_TRANSPORT/phich.c
+++ b/openair1/PHY/LTE_TRANSPORT/phich.c
@@ -1067,7 +1067,7 @@ void rx_phich(PHY_VARS_UE *ue,
LTE_DL_FRAME_PARMS *frame_parms=&ue->frame_parms;
- LTE_UE_PDCCH **pdcch_vars = ue->pdcch_vars;
+ LTE_UE_PDCCH **pdcch_vars = &ue->pdcch_vars[subframe & 0x1][eNB_id];
// uint8_t HI;
uint8_t harq_pid = phich_subframe_to_harq_pid(frame_parms,proc->frame_rx,subframe);
diff --git a/openair1/PHY/LTE_TRANSPORT/print_stats.c b/openair1/PHY/LTE_TRANSPORT/print_stats.c
index c3e40e1e72f323b108d740b7d5db815f76cf8cd1..0bebff8c353c2bab20cb469e49105a9a657bb10b 100644
--- a/openair1/PHY/LTE_TRANSPORT/print_stats.c
+++ b/openair1/PHY/LTE_TRANSPORT/print_stats.c
@@ -59,7 +59,7 @@ int dump_ue_stats(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc,char* buffer, int length
return 0;
if ((mode == normal_txrx) || (mode == no_L2_connect)) {
- len += sprintf(&buffer[len], "[UE_PROC] UE %d, RNTI %x\n",ue->Mod_id, ue->pdcch_vars[0]->crnti);
+ len += sprintf(&buffer[len], "[UE_PROC] UE %d, RNTI %x\n",ue->Mod_id, ue->pdcch_vars[0][0]->crnti);
len += sprintf(&buffer[len],"[UE PROC] RSRP[0] %.2f dBm/RE, RSSI %.2f dBm, RSRQ[0] %.2f dB, N0 %d dBm/RE (NF %.1f dB)\n",
10*log10(ue->measurements.rsrp[0])-ue->rx_total_gain_dB,
10*log10(ue->measurements.rssi)-ue->rx_total_gain_dB,
diff --git a/openair1/PHY/LTE_TRANSPORT/proto.h b/openair1/PHY/LTE_TRANSPORT/proto.h
index fe7991e343ab200cf96d8d5f7a34f66a29a8fba0..409c41da4fe22725120f0ee55c9c6be195f8e458 100644
--- a/openair1/PHY/LTE_TRANSPORT/proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/proto.h
@@ -1268,7 +1268,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
LTE_DL_FRAME_PARMS *lte_frame_parms,
LTE_UE_DLSCH_t *dlsch,
LTE_DL_UE_HARQ_t *harq_process,
- uint8_t frame,
+ uint32_t frame,
uint8_t subframe,
uint8_t harq_pid,
uint8_t is_crnti,
@@ -1308,9 +1308,7 @@ int32_t rx_pdsch(PHY_VARS_UE *phy_vars_ue,
uint8_t i_mod,
uint8_t harq_pid);
-int32_t rx_pdcch(LTE_UE_COMMON *lte_ue_common_vars,
- LTE_UE_PDCCH **lte_ue_pdcch_vars,
- LTE_DL_FRAME_PARMS *frame_parms,
+int32_t rx_pdcch(PHY_VARS_UE *ue,
uint32_t frame,
uint8_t subframe,
uint8_t eNB_id,
@@ -1781,6 +1779,7 @@ uint32_t ulsch_encoding(uint8_t *a,
PHY_VARS_UE *phy_vars_ue,
uint8_t harq_pid,
uint8_t eNB_id,
+ uint8_t subframe_rx,
uint8_t tmode,
uint8_t control_only_flag,
uint8_t Nbundled);
@@ -1796,6 +1795,7 @@ uint32_t ulsch_encoding(uint8_t *a,
int32_t ulsch_encoding_emul(uint8_t *ulsch_buffer,
PHY_VARS_UE *phy_vars_ue,
uint8_t eNB_id,
+ uint8_t subframe_rx,
uint8_t harq_pid,
uint8_t control_only_flag);
diff --git a/openair1/PHY/LTE_TRANSPORT/pucch.c b/openair1/PHY/LTE_TRANSPORT/pucch.c
index 563f83bb7fa9e7d1851f2a2ed623b5d5c1c537ea..1efad912af5a0f54ff6efe37c99f73f4cce001e6 100644
--- a/openair1/PHY/LTE_TRANSPORT/pucch.c
+++ b/openair1/PHY/LTE_TRANSPORT/pucch.c
@@ -1315,7 +1315,7 @@ int32_t rx_pucch_emul(PHY_VARS_eNB *eNB,
rnti = eNB->ulsch[UE_index]->rnti;
for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
- if (rnti == PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[0]->crnti)
+ if (rnti == PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[subframe & 0x1][0]->crnti)
break;
}
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_coding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
index dbb7a16ac9cbb983a650b5811e9cfc594e2245e3..bd49fdacb06dc4c177a9182f6ee5d57759a49577 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
@@ -202,6 +202,7 @@ uint32_t ulsch_encoding(uint8_t *a,
PHY_VARS_UE *ue,
uint8_t harq_pid,
uint8_t eNB_id,
+ uint8_t subframe_rx,
uint8_t tmode,
uint8_t control_only_flag,
uint8_t Nbundled)
@@ -261,10 +262,10 @@ uint32_t ulsch_encoding(uint8_t *a,
// fill CQI/PMI information
if (ulsch->O>0) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_ULSCH_ENCODING_FILL_CQI, VCD_FUNCTION_IN);
- rnti = ue->pdcch_vars[eNB_id]->crnti;
+ rnti = ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti;
fill_CQI(ulsch,meas,0,harq_pid,ue->frame_parms.N_RB_DL,rnti, tmode,ue->sinr_eff);
- LOG_D(PHY,"UE CQI\n");
+ LOG_D(PHY,"ULSCH Encoding rnti %x \n", rnti);
print_CQI(ulsch->o,ulsch->uci_format,0,ue->frame_parms.N_RB_DL);
// save PUSCH pmi for later (transmission modes 4,5,6)
@@ -961,6 +962,7 @@ uint32_t ulsch_encoding(uint8_t *a,
int ulsch_encoding_emul(uint8_t *ulsch_buffer,
PHY_VARS_UE *ue,
uint8_t eNB_id,
+ uint8_t subframe_rx,
uint8_t harq_pid,
uint8_t control_only_flag)
{
@@ -969,7 +971,7 @@ int ulsch_encoding_emul(uint8_t *ulsch_buffer,
LTE_UE_DLSCH_t **dlsch = ue->dlsch[0][eNB_id];
PHY_MEASUREMENTS *meas = &ue->measurements;
uint8_t tmode = ue->transmission_mode[eNB_id];
- uint16_t rnti=ue->pdcch_vars[eNB_id]->crnti;
+ uint16_t rnti=ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti;
LOG_D(PHY,"EMUL UE ulsch_encoding for eNB %d,mod_id %d, harq_pid %d rnti %x, ACK(%d,%d) \n",
eNB_id,ue->Mod_id, harq_pid, rnti,ulsch->o_ACK[0],ulsch->o_ACK[1]);
@@ -1003,7 +1005,7 @@ int ulsch_encoding_emul(uint8_t *ulsch_buffer,
//UE_transport_info_TB_index[ue->Mod_id]+=ue->ulsch[eNB_id]->harq_processes[harq_pid]->TBS>>3;
// navid: currently more than one eNB is not supported in the code
UE_transport_info[ue->Mod_id][ue->CC_id].num_eNB = 1;
- UE_transport_info[ue->Mod_id][ue->CC_id].rnti[0] = ue->pdcch_vars[0]->crnti;
+ UE_transport_info[ue->Mod_id][ue->CC_id].rnti[0] = ue->pdcch_vars[subframe_rx & 0x1][0]->crnti;
UE_transport_info[ue->Mod_id][ue->CC_id].eNB_id[0] = eNB_id;
UE_transport_info[ue->Mod_id][ue->CC_id].harq_pid[0] = harq_pid;
UE_transport_info[ue->Mod_id][ue->CC_id].tbs[0] = ue->ulsch[eNB_id]->harq_processes[harq_pid]->TBS>>3 ;
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
index bb2a5b3e224652d3fc62c6f2594743d88dc30cc1..a26f3a876bd53be7a4db161878d735070490cf83 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
@@ -2002,7 +2002,7 @@ uint32_t ulsch_decoding_emul(PHY_VARS_eNB *eNB, eNB_rxtx_proc_t *proc,
#endif
for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
- if (rnti == PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[0]->crnti)
+ if (rnti == PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[subframe & 0x1][0]->crnti)
break;
}
diff --git a/openair1/PHY/TOOLS/lte_phy_scope.c b/openair1/PHY/TOOLS/lte_phy_scope.c
index 7a533464530f337d4aeba89722164670a830be63..13beb469e426b6ae86ed769df59dc07af0f6e4a8 100644
--- a/openair1/PHY/TOOLS/lte_phy_scope.c
+++ b/openair1/PHY/TOOLS/lte_phy_scope.c
@@ -525,8 +525,8 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
}
}
- if (phy_vars_ue->pdcch_vars[eNB_id]!=NULL) {
- num_pdcch_symbols = phy_vars_ue->pdcch_vars[eNB_id]->num_pdcch_symbols;
+ if (phy_vars_ue->pdcch_vars[subframe&0x1][eNB_id]!=NULL) {
+ num_pdcch_symbols = phy_vars_ue->pdcch_vars[subframe&0x1][eNB_id]->num_pdcch_symbols;
}
// coded_bits_per_codeword = frame_parms->N_RB_DL*12*get_Qm(mcs)*(frame_parms->symbols_per_tti);
@@ -563,8 +563,8 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
chest_f = (int16_t**) phy_vars_ue->common_vars.common_vars_rx_data_per_thread[subframe&0x1].dl_ch_estimates[eNB_id];
pbch_llr = (int8_t*) phy_vars_ue->pbch_vars[eNB_id]->llr;
pbch_comp = (int16_t*) phy_vars_ue->pbch_vars[eNB_id]->rxdataF_comp[0];
- pdcch_llr = (int8_t*) phy_vars_ue->pdcch_vars[eNB_id]->llr;
- pdcch_comp = (int16_t*) phy_vars_ue->pdcch_vars[eNB_id]->rxdataF_comp[0];
+ pdcch_llr = (int8_t*) phy_vars_ue->pdcch_vars[subframe&0x1][eNB_id]->llr;
+ pdcch_comp = (int16_t*) phy_vars_ue->pdcch_vars[subframe&0x1][eNB_id]->rxdataF_comp[0];
pdsch_llr = (int16_t*) phy_vars_ue->pdsch_vars[subframe&0x1][eNB_id]->llr[0]; // stream 0
// pdsch_llr = (int16_t*) phy_vars_ue->lte_ue_pdsch_vars_SI[eNB_id]->llr[0]; // stream 0
pdsch_comp = (int16_t*) phy_vars_ue->pdsch_vars[subframe&0x1][eNB_id]->rxdataF_comp0[0];
@@ -699,7 +699,14 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
}
fl_set_xyplot_xbounds(form->pdcch_llr,0,12*frame_parms->N_RB_DL*2*3);
- fl_set_xyplot_data(form->pdcch_llr,bit_pdcch,llr_pdcch,12*frame_parms->N_RB_DL*2*num_pdcch_symbols,"","","");
+ if (frame_parms->N_RB_DL != 100)
+ {
+ fl_set_xyplot_data(form->pdcch_llr,bit_pdcch,llr_pdcch,12*frame_parms->N_RB_DL*2*num_pdcch_symbols,"","","");
+ }
+ else
+ {
+ LOG_D(PHY,"UE PDCCH LLR plot is bugged in 20 MHz BW, to be fixed !!!\n");
+ }
}
// PDCCH I/Q of MF Output
@@ -708,8 +715,14 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
I[i] = pdcch_comp[2*i];
Q[i] = pdcch_comp[2*i+1];
}
-
- fl_set_xyplot_data(form->pdcch_comp,I,Q,12*frame_parms->N_RB_DL*num_pdcch_symbols,"","","");
+ if (frame_parms->N_RB_DL != 100)
+ {
+ fl_set_xyplot_data(form->pdcch_comp,I,Q,12*frame_parms->N_RB_DL*num_pdcch_symbols,"","","");
+ }
+ else
+ {
+ LOG_D(PHY,"UE PDCCH COMP plot is bugged in 20 MHz BW, to be fixed !!!\n");
+ }
}
// PDSCH LLRs
@@ -720,7 +733,14 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
}
fl_set_xyplot_xbounds(form->pdsch_llr,0,coded_bits_per_codeword);
- fl_set_xyplot_data(form->pdsch_llr,bit,llr,coded_bits_per_codeword,"","","");
+ if (frame_parms->N_RB_DL != 100)
+ {
+ fl_set_xyplot_data(form->pdsch_llr,bit,llr,coded_bits_per_codeword,"","","");
+ }
+ else
+ {
+ LOG_D(PHY,"UE PDSCH LLR plot is bugged in 20 MHz BW, to be fixed !!!\n");
+ }
}
// PDSCH I/Q of MF Output
@@ -768,4 +788,4 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
}
free(chest_t_abs);
-}
\ No newline at end of file
+}
diff --git a/openair1/PHY/TOOLS/lte_phy_scope_tm4.c b/openair1/PHY/TOOLS/lte_phy_scope_tm4.c
index 6807f1f6f48a6de4ee057c9c2341b80084526448..92a0d9f218e2ebedc09ecbdcf4eecccfa55ad022 100755
--- a/openair1/PHY/TOOLS/lte_phy_scope_tm4.c
+++ b/openair1/PHY/TOOLS/lte_phy_scope_tm4.c
@@ -467,8 +467,8 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
return;
mcs1 = phy_vars_ue->dlsch[subframe&0x1][eNB_id][1]->harq_processes[harq_pid]->mcs;
}
- if (phy_vars_ue->pdcch_vars[eNB_id]!=NULL) {
- num_pdcch_symbols = phy_vars_ue->pdcch_vars[eNB_id]->num_pdcch_symbols;
+ if (phy_vars_ue->pdcch_vars[subframe&0x1][eNB_id]!=NULL) {
+ num_pdcch_symbols = phy_vars_ue->pdcch_vars[subframe&0x1][eNB_id]->num_pdcch_symbols;
}
// coded_bits_per_codeword = frame_parms->N_RB_DL*12*get_Qm(mcs)*(frame_parms->symbols_per_tti);
if (phy_vars_ue->dlsch[subframe&0x1][eNB_id][0]!=NULL) {
@@ -519,8 +519,8 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form,
chest_f = (int16_t**) phy_vars_ue->common_vars.common_vars_rx_data_per_thread[subframe&0x1].dl_ch_estimates[eNB_id];
pbch_llr = (int8_t*) phy_vars_ue->pbch_vars[eNB_id]->llr;
pbch_comp = (int16_t*) phy_vars_ue->pbch_vars[eNB_id]->rxdataF_comp[0];
- pdcch_llr = (int8_t*) phy_vars_ue->pdcch_vars[eNB_id]->llr;
- pdcch_comp = (int16_t*) phy_vars_ue->pdcch_vars[eNB_id]->rxdataF_comp[0];
+ pdcch_llr = (int8_t*) phy_vars_ue->pdcch_vars[subframe&0x1][eNB_id]->llr;
+ pdcch_comp = (int16_t*) phy_vars_ue->pdcch_vars[subframe&0x1][eNB_id]->rxdataF_comp[0];
pdsch_llr = (int16_t*) phy_vars_ue->pdsch_vars[subframe&0x1][eNB_id]->llr[0]; // stream 0
pdsch_llr1 = (int16_t*) phy_vars_ue->pdsch_vars[subframe&0x1][eNB_id]->llr[1]; // stream 1
pdsch_comp = (int16_t*) phy_vars_ue->pdsch_vars[subframe&0x1][eNB_id]->rxdataF_comp0[0];
diff --git a/openair1/PHY/defs.h b/openair1/PHY/defs.h
index 5c1b1158ba45a62f9a206e45022a746a5bd23db7..272051000664a4dc4917c5917e9f90b286df2389 100644
--- a/openair1/PHY/defs.h
+++ b/openair1/PHY/defs.h
@@ -713,7 +713,7 @@ typedef struct {
LTE_UE_PDSCH *pdsch_vars_p[NUMBER_OF_CONNECTED_eNB_MAX+1];
LTE_UE_PDSCH *pdsch_vars_MCH[NUMBER_OF_CONNECTED_eNB_MAX];
LTE_UE_PBCH *pbch_vars[NUMBER_OF_CONNECTED_eNB_MAX];
- LTE_UE_PDCCH *pdcch_vars[NUMBER_OF_CONNECTED_eNB_MAX];
+ LTE_UE_PDCCH *pdcch_vars[2][NUMBER_OF_CONNECTED_eNB_MAX];
LTE_UE_PRACH *prach_vars[NUMBER_OF_CONNECTED_eNB_MAX];
LTE_UE_DLSCH_t *dlsch[2][NUMBER_OF_CONNECTED_eNB_MAX][2]; // two RxTx Threads
LTE_UE_ULSCH_t *ulsch[NUMBER_OF_CONNECTED_eNB_MAX];
@@ -896,7 +896,7 @@ typedef struct {
time_stats_t rx_dft_stats;
time_stats_t dlsch_channel_estimation_stats;
time_stats_t dlsch_freq_offset_estimation_stats;
- time_stats_t dlsch_decoding_stats;
+ time_stats_t dlsch_decoding_stats[2];
time_stats_t dlsch_demodulation_stats;
time_stats_t dlsch_rate_unmatching_stats;
time_stats_t dlsch_turbo_decoding_stats;
diff --git a/openair1/SCHED/defs.h b/openair1/SCHED/defs.h
index ac2d7957f2ffc72aaea81ca0a0753687560ae9c0..fd4b868382af36dd9abaf5f82fc4d3ae0b473c05 100644
--- a/openair1/SCHED/defs.h
+++ b/openair1/SCHED/defs.h
@@ -511,7 +511,7 @@ void dump_dlsch(PHY_VARS_UE *phy_vars_ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
void dump_dlsch_SI(PHY_VARS_UE *phy_vars_ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t subframe);
void dump_dlsch_ra(PHY_VARS_UE *phy_vars_ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t subframe);
-void dump_dlsch2(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t subframe, uint16_t coded_bits_per_codeword,int round, unsigned char harq_pid);
+void dump_dlsch2(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t subframe, unsigned int *coded_bits_per_codeword,int round, unsigned char harq_pid);
/*@}*/
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index e9f1125a34fcac8af696f56527e6335ec85f956d..97c8fb08375f97ee8abece1e91411712ac14b968 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -899,7 +899,7 @@ void pdsch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,LTE_eNB_DLSCH_t *d
int input_buffer_length = dlsch_harq->TBS/8;
LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
uint8_t *DLSCH_pdu=NULL;
- uint8_t DLSCH_pdu_tmp[768*8];
+ uint8_t DLSCH_pdu_tmp[input_buffer_length+4]; //[768*8];
uint8_t DLSCH_pdu_rar[256];
int i;
diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c
index 386dd8b52c0355949378905d9273c813c8a7bffd..a94847f83fd47a3d9c6a05ba72fd44c4ebbe391f 100644
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -95,7 +95,7 @@ void dump_dlsch(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t subf
ue->dlsch[subframe&0x1][eNB_id][0]->harq_processes[harq_pid]->rb_alloc_even,
ue->dlsch[subframe&0x1][eNB_id][0]->harq_processes[harq_pid]->Qm,
ue->dlsch[subframe&0x1][eNB_id][0]->harq_processes[harq_pid]->Nl,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[0&0x1][eNB_id]->num_pdcch_symbols,
proc->frame_rx,
subframe,
ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id]);
@@ -126,7 +126,7 @@ void dump_dlsch_SI(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t s
ue->dlsch_SI[eNB_id]->harq_processes[0]->rb_alloc_even,
2,
1,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[0&0x1][eNB_id]->num_pdcch_symbols,
proc->frame_rx,
subframe,
0);
@@ -137,7 +137,7 @@ void dump_dlsch_SI(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t s
ue->dlsch_SI[eNB_id]->harq_processes[0]->nb_rb,
ue->dlsch_SI[eNB_id]->harq_processes[0]->mcs,
ue->dlsch_SI[eNB_id]->harq_processes[0]->nb_rb,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[0&0x1][eNB_id]->num_pdcch_symbols,
coded_bits_per_codeword);
write_output("rxsig0.m","rxs0", &ue->common_vars.rxdata[0][subframe*ue->frame_parms.samples_per_tti],ue->frame_parms.samples_per_tti,1,1);
@@ -231,7 +231,7 @@ void dump_dlsch_ra(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t s
ue->dlsch_ra[eNB_id]->harq_processes[0]->rb_alloc_even,
2,
1,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[0&0x1][eNB_id]->num_pdcch_symbols,
proc->frame_rx,
subframe,
0);
@@ -240,7 +240,7 @@ void dump_dlsch_ra(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t s
ue->dlsch_ra[eNB_id]->harq_processes[0]->nb_rb,
ue->dlsch_ra[eNB_id]->harq_processes[0]->mcs,
ue->dlsch_ra[eNB_id]->harq_processes[0]->nb_rb,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[0&0x1][eNB_id]->num_pdcch_symbols,
coded_bits_per_codeword);
write_output("rxsigF0.m","rxsF0", ue->common_vars.common_vars_rx_data_per_thread[subframe&0x1].rxdataF[0],2*12*ue->frame_parms.ofdm_symbol_size,2,1);
@@ -310,8 +310,10 @@ void ra_failed(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index)
// if contention resolution fails, go back to PRACH
PHY_vars_UE_g[Mod_id][CC_id]->UE_mode[eNB_index] = PRACH;
- PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[eNB_index]->crnti_is_temporary = 0;
- PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[eNB_index]->crnti = 0;
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[0][eNB_index]->crnti_is_temporary = 0;
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[0][eNB_index]->crnti = 0;
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[1][eNB_index]->crnti_is_temporary = 0;
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[1][eNB_index]->crnti = 0;
LOG_E(PHY,"[UE %d] Random-access procedure fails, going back to PRACH, setting SIStatus = 0, discard temporary C-RNTI and State RRC_IDLE\n",Mod_id);
//mac_xface->macphy_exit("");
}
@@ -323,7 +325,8 @@ void ra_succeeded(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index)
LOG_I(PHY,"[UE %d][RAPROC] Random-access procedure succeeded. Set C-RNTI = Temporary C-RNTI\n",Mod_id);
- PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[eNB_index]->crnti_is_temporary = 0;
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[0][eNB_index]->crnti_is_temporary = 0;
+ PHY_vars_UE_g[Mod_id][CC_id]->pdcch_vars[1][eNB_index]->crnti_is_temporary = 0;
PHY_vars_UE_g[Mod_id][CC_id]->ulsch_Msg3_active[eNB_index] = 0;
PHY_vars_UE_g[Mod_id][CC_id]->UE_mode[eNB_index] = PUSCH;
@@ -379,7 +382,7 @@ uint8_t is_SR_TXOp(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id)
int subframe=proc->subframe_tx;
LOG_D(PHY,"[UE %d][SR %x] Frame %d subframe %d Checking for SR TXOp (sr_ConfigIndex %d)\n",
- ue->Mod_id,ue->pdcch_vars[eNB_id]->crnti,proc->frame_tx,subframe,
+ ue->Mod_id,ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->crnti,proc->frame_tx,subframe,
ue->scheduling_request_config[eNB_id].sr_ConfigIndex);
if (ue->scheduling_request_config[eNB_id].sr_ConfigIndex <= 4) { // 5 ms SR period
@@ -632,7 +635,7 @@ void ue_compute_srs_occasion(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id
CC_id,
frame_tx,
eNB_id,
- ue->pdcch_vars[eNB_id]->crnti,
+ ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->crnti,
subframe_tx); // subframe used for meas gap
if (SR_payload > 0)
@@ -819,10 +822,10 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
if (frame_parms->frame_type == FDD ) { // FDD
sf = (subframe<4)? subframe+6 : subframe-4;
- LOG_D(PHY,"n1_pucch_UE: subframe %d, nCCE %d\n",sf,ue->pdcch_vars[eNB_id]->nCCE[sf]);
+ LOG_D(PHY,"n1_pucch_UE: subframe %d, nCCE %d\n",sf,ue->pdcch_vars[proc->subframe_rx&0x1][eNB_id]->nCCE[sf]);
if (SR == 0)
- return(frame_parms->pucch_config_common.n1PUCCH_AN + ue->pdcch_vars[eNB_id]->nCCE[sf]);
+ return(frame_parms->pucch_config_common.n1PUCCH_AN + ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->nCCE[sf]);
else
return(ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex);
} else {
@@ -885,7 +888,7 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
last_dl);
// i=0
- nCCE0 = ue->pdcch_vars[eNB_id]->nCCE[last_dl];
+ nCCE0 = ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->nCCE[last_dl];
n1_pucch0 = get_Np(frame_parms->N_RB_DL,nCCE0,0) + nCCE0+ frame_parms->pucch_config_common.n1PUCCH_AN;
harq_ack0 = b[0];
@@ -927,10 +930,10 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
// This is the offset for a particular subframe (2,3,4) => (0,2,4)
last_dl = (subframe-2)<<1;
// i=0
- nCCE0 = ue->pdcch_vars[eNB_id]->nCCE[5+last_dl];
+ nCCE0 = ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->nCCE[5+last_dl];
n1_pucch0 = get_Np(frame_parms->N_RB_DL,nCCE0,0) + nCCE0+ frame_parms->pucch_config_common.n1PUCCH_AN;
// i=1
- nCCE1 = ue->pdcch_vars[eNB_id]->nCCE[(6+last_dl)%10];
+ nCCE1 = ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->nCCE[(6+last_dl)%10];
n1_pucch1 = get_Np(frame_parms->N_RB_DL,nCCE1,1) + nCCE1 + frame_parms->pucch_config_common.n1PUCCH_AN;
// set ACK/NAK to values if not DTX
@@ -1425,7 +1428,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
}
if (isBad) {
- LOG_D(PHY,"Skip PUSCH generation!\n");
+ LOG_I(PHY,"Skip PUSCH generation!\n");
ue->ulsch[eNB_id]->harq_processes[harq_pid]->subframe_scheduling_flag = 0;
}
}
@@ -1491,8 +1494,8 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#ifdef DEBUG_PHY_PROC
LOG_D(PHY,
- "[UE %d][PUSCH %d] AbsSubframe %d.%d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d, bundling %d\n",
- Mod_id,harq_pid,frame_tx,subframe_tx,
+ "[UE %d][PUSCH %d] AbsSubframe %d.%d %d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d, bundling %d\n",
+ Mod_id,harq_pid,frame_tx,subframe_tx,proc->subframe_rx,
first_rb,nb_rb,
ue->ulsch[eNB_id]->harq_processes[harq_pid]->round,
ue->ulsch[eNB_id]->harq_processes[harq_pid]->mcs,
@@ -1536,6 +1539,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
ue,
harq_pid,
eNB_id,
+ proc->subframe_rx,
ue->transmission_mode[eNB_id],0,0)!=0) {
LOG_E(PHY,"ulsch_coding.c: FATAL ERROR: returning\n");
mac_xface->macphy_exit("Error in ulsch_coding");
@@ -1548,7 +1552,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#ifdef PHY_ABSTRACTION
else {
- ulsch_encoding_emul(ue->prach_resources[eNB_id]->Msg3,ue,eNB_id,harq_pid,0);
+ ulsch_encoding_emul(ue->prach_resources[eNB_id]->Msg3,ue,eNB_id,proc->subframe_rx,harq_pid,0);
}
#endif
@@ -1608,6 +1612,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
ue,
harq_pid,
eNB_id,
+ proc->subframe_rx,
ue->transmission_mode[eNB_id],0,
Nbundled)!=0) {
LOG_E(PHY,"ulsch_coding.c: FATAL ERROR: returning\n");
@@ -1619,7 +1624,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#ifdef PHY_ABSTRACTION
else {
- ulsch_encoding_emul(ulsch_input_buffer,ue,eNB_id,harq_pid,0);
+ ulsch_encoding_emul(ulsch_input_buffer,ue,eNB_id,proc->subframe_rx,harq_pid,0);
}
#endif
@@ -1890,7 +1895,7 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
CC_id,
frame_tx,
eNB_id,
- ue->pdcch_vars[eNB_id]->crnti,
+ ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->crnti,
subframe_tx); // subframe used for meas gap
}
else {
@@ -1986,7 +1991,7 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
LOG_D(PHY,"[UE %d][SR %x] AbsSubframe %d.%d Generating PUCCH 1 (SR for PUSCH), an_srs_simultanous %d, shorten_pucch %d, n1_pucch %d, Po_PUCCH %d\n",
Mod_id,
ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->rnti,
- frame_tx, subframe_tx,
+ frame_tx%1024, subframe_tx,
frame_parms->soundingrs_ul_config_common.ackNackSRS_SimultaneousTransmission,
isShortenPucch,
ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex,
@@ -2107,7 +2112,7 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
0, // B2 not needed
tx_amp,
subframe_tx,
- ue->pdcch_vars[eNB_id]->crnti);
+ ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->crnti);
}
break;
@@ -2217,6 +2222,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
ue,
harq_pid,
eNB_id,
+ proc->subframe_rx,
ue->transmission_mode[eNB_id],0,
0)!=0) { // Nbundled, to be updated!!!!
LOG_E(PHY,"ulsch_coding.c: FATAL ERROR: returning\n");
@@ -2226,7 +2232,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
#ifdef PHY_ABSTRACTION
else {
- ulsch_encoding_emul(ulsch_input_buffer,ue,eNB_id,harq_pid,0);
+ ulsch_encoding_emul(ulsch_input_buffer,ue,eNB_id,proc->subframe_rx,harq_pid,0);
}
#endif
@@ -2261,12 +2267,14 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
}
// reset DL ACK/NACK status
- reset_ack(&ue->frame_parms,
- ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack,
- subframe_tx,
- ue->ulsch[eNB_id]->o_ACK,0);
-
- reset_ack(&ue->frame_parms,
+ if (ue->dlsch[proc->subframe_rx&0x1][eNB_id][0] != NULL)
+ reset_ack(&ue->frame_parms,
+ ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack,
+ subframe_tx,
+ ue->ulsch[eNB_id]->o_ACK,0);
+
+ if (ue->dlsch_SI[eNB_id] != NULL)
+ reset_ack(&ue->frame_parms,
ue->dlsch_SI[eNB_id]->harq_ack,
subframe_tx,
ue->ulsch[eNB_id]->o_ACK,0);
@@ -2502,10 +2510,15 @@ void restart_phy(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc, uint8_t eNB_id,uint8_t ab
ue->pbch_vars[eNB_id]->pdu_errors_conseq=0;
ue->pbch_vars[eNB_id]->pdu_errors=0;
- ue->pdcch_vars[eNB_id]->dci_errors = 0;
- ue->pdcch_vars[eNB_id]->dci_missed = 0;
- ue->pdcch_vars[eNB_id]->dci_false = 0;
- ue->pdcch_vars[eNB_id]->dci_received = 0;
+ ue->pdcch_vars[0][eNB_id]->dci_errors = 0;
+ ue->pdcch_vars[0][eNB_id]->dci_missed = 0;
+ ue->pdcch_vars[0][eNB_id]->dci_false = 0;
+ ue->pdcch_vars[0][eNB_id]->dci_received = 0;
+
+ ue->pdcch_vars[1][eNB_id]->dci_errors = 0;
+ ue->pdcch_vars[1][eNB_id]->dci_missed = 0;
+ ue->pdcch_vars[1][eNB_id]->dci_false = 0;
+ ue->pdcch_vars[1][eNB_id]->dci_received = 0;
ue->dlsch_errors[eNB_id] = 0;
ue->dlsch_errors_last[eNB_id] = 0;
@@ -2753,9 +2766,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
if (abstraction_flag == 0) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PDCCH, VCD_FUNCTION_IN);
- rx_pdcch(&ue->common_vars,
- ue->pdcch_vars,
- &ue->frame_parms,
+ rx_pdcch(ue,
proc->frame_rx,
subframe_rx,
eNB_id,
@@ -2801,14 +2812,14 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
}
LOG_D(PHY,"Calling dci_decoding_proc_emul ...\n");
- dci_cnt = dci_decoding_procedure_emul(ue->pdcch_vars,
+ dci_cnt = dci_decoding_procedure_emul(ue->pdcch_vars[subframe_rx&1],
PHY_vars_eNB_g[i][CC_id]->num_ue_spec_dci[subframe_rx&1],
PHY_vars_eNB_g[i][CC_id]->num_common_dci[subframe_rx&1],
PHY_vars_eNB_g[i][CC_id]->dci_alloc[subframe_rx&1],
dci_alloc_rx,
eNB_id);
// printf("DCI: dci_cnt %d\n",dci_cnt);
- UE_id = (uint32_t)find_ue((int16_t)ue->pdcch_vars[eNB_id]->crnti,PHY_vars_eNB_g[i][CC_id]);
+ UE_id = (uint32_t)find_ue((int16_t)ue->pdcch_vars[subframe_rx&1][eNB_id]->crnti,PHY_vars_eNB_g[i][CC_id]);
if (UE_id>=0) {
// printf("Checking PHICH for UE %d (eNB %d)\n",UE_id,i);
@@ -2831,9 +2842,14 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
#endif
- LOG_D(PHY,"[UE %d] AbsSubFrame %d.%d, Mode %s: DCI found %i\n",ue->Mod_id,frame_rx%1024,subframe_rx,mode_string[ue->UE_mode[eNB_id]],dci_cnt);
+ LOG_D(PHY,"[UE %d] AbsSubFrame %d.%d, Mode %s: DCI found %i --> rnti %x / crnti %x : format %d\n",
+ ue->Mod_id,frame_rx%1024,subframe_rx,mode_string[ue->UE_mode[eNB_id]],
+ dci_cnt,
+ dci_alloc_rx[0].rnti,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti,
+ dci_alloc_rx[0].format );
- ue->pdcch_vars[eNB_id]->dci_received += dci_cnt;
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->dci_received += dci_cnt;
#ifdef EMOS
//emos_dump_UE.dci_cnt[subframe_rx] = dci_cnt;
@@ -2844,7 +2860,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
if ((ue->UE_mode[eNB_id]>PRACH) &&
- (dci_alloc_rx[i].rnti == ue->pdcch_vars[eNB_id]->crnti) &&
+ (dci_alloc_rx[i].rnti == ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti) &&
(dci_alloc_rx[i].format != format0)) {
@@ -2852,8 +2868,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
ue->Mod_id,dci_alloc_rx[i].rnti,
frame_rx%1024,subframe_rx,
dci_alloc_rx[i].format,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
- ue->pdcch_vars[eNB_id]->nCCE[subframe_rx],
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->nCCE[subframe_rx],
get_nCCE(3,&ue->frame_parms,get_mi(&ue->frame_parms,0)));
@@ -2865,7 +2881,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
(generate_ue_dlsch_params_from_dci(frame_rx,
subframe_rx,
(void *)&dci_alloc_rx[i].dci_pdu,
- ue->pdcch_vars[eNB_id]->crnti,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti,
dci_alloc_rx[i].format,
ue->dlsch[subframe_rx&0x1][eNB_id],
&ue->frame_parms,
@@ -2874,7 +2890,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
0,
P_RNTI,
ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id],
- ue->pdcch_vars[eNB_id]->crnti_is_temporary? ue->pdcch_vars[eNB_id]->crnti: 0)==0)) {
+ ue->pdcch_vars[0&0x1][eNB_id]->crnti_is_temporary? ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti: 0)==0)) {
// update TPC for PUCCH
if((dci_alloc_rx[i].format == format1) ||
@@ -2898,7 +2914,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
// we received a CRNTI, so we're in PUSCH
if (ue->UE_mode[eNB_id] != PUSCH) {
#ifdef DEBUG_PHY_PROC
- LOG_D(PHY,"[UE %d] Frame %d, subframe %d: Received DCI with CRNTI %x => Mode PUSCH\n",ue->Mod_id,frame_rx,subframe_rx,ue->pdcch_vars[eNB_id]->crnti);
+ LOG_D(PHY,"[UE %d] Frame %d, subframe %d: Received DCI with CRNTI %x => Mode PUSCH\n",ue->Mod_id,frame_rx,subframe_rx,ue->pdcch_vars[subframe_rx&1][eNB_id]->crnti);
#endif
//dump_dci(&ue->frame_parms, &dci_alloc_rx[i]);
ue->UE_mode[eNB_id] = PUSCH;
@@ -3006,7 +3022,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
ue->Mod_id,ue->dlsch_ra[eNB_id]->harq_processes[0]->rb_alloc_even[0],ue->dlsch_ra[eNB_id]);
#endif
}
- } else if( (dci_alloc_rx[i].rnti == ue->pdcch_vars[eNB_id]->crnti) &&
+ } else if( (dci_alloc_rx[i].rnti == ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti) &&
(dci_alloc_rx[i].format == format0)) {
#ifdef DEBUG_PHY_PROC
LOG_D(PHY,"[UE %d][PUSCH] Frame %d subframe %d: Found rnti %x, format 0, dci_cnt %d\n",
@@ -3018,7 +3034,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
if ((ue->UE_mode[eNB_id] > PRACH) &&
(generate_ue_ulsch_params_from_dci((void *)&dci_alloc_rx[i].dci_pdu,
- ue->pdcch_vars[eNB_id]->crnti,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti,
subframe_rx,
format0,
ue,
@@ -3089,7 +3105,7 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
else {
#ifdef DEBUG_PHY_PROC
LOG_D(PHY,"[UE %d] frame %d, subframe %d: received DCI %d with RNTI=%x (C-RNTI:%x, CBA_RNTI %x) and format %d!\n",ue->Mod_id,frame_rx,subframe_rx,i,dci_alloc_rx[i].rnti,
- ue->pdcch_vars[eNB_id]->crnti,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti,
ue->ulsch[eNB_id]->cba_rnti[0],
dci_alloc_rx[i].format);
// dump_dci(&ue->frame_parms, &dci_alloc_rx[i]);
@@ -3345,21 +3361,23 @@ void process_rar(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc, int eNB_id, runmode_t mo
frame_rx,
ue->prach_resources[eNB_id]->ra_RNTI,
dlsch0->harq_processes[0]->b,
- &ue->pdcch_vars[eNB_id]->crnti,
+ &ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti,
ue->prach_resources[eNB_id]->ra_PreambleIndex);
+
+ ue->pdcch_vars[(subframe_rx+1) & 0x1][eNB_id]->crnti = ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti;
if (timing_advance!=0xffff) {
- LOG_D(PHY,"[UE %d][RAPROC] Frame %d subframe %d Got rnti %x and timing advance %d from RAR\n",
- ue->Mod_id,
- frame_rx,
- subframe_rx,
- ue->pdcch_vars[eNB_id]->crnti,
- timing_advance);
+ LOG_D(PHY,"[UE %d][RAPROC] Frame %d subframe %d Got rnti %x and timing advance %d from RAR\n",
+ ue->Mod_id,
+ frame_rx,
+ subframe_rx,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti,
+ timing_advance);
// remember this c-rnti is still a tc-rnti
- ue->pdcch_vars[eNB_id]->crnti_is_temporary = 1;
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->crnti_is_temporary = 1;
//timing_advance = 0;
process_timing_advance_rar(ue,proc,timing_advance);
@@ -3491,7 +3509,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
dlsch0->harq_processes[harq_pid]->rb_alloc_even,
dlsch0->harq_processes[harq_pid]->Qm,
dlsch0->harq_processes[harq_pid]->Nl,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols,
frame_rx,
subframe_rx,
ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id]);
@@ -3504,15 +3522,19 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
0,
subframe_rx<<1);
stop_meas(&ue->dlsch_unscrambling_stats);
-
- //LOG_I(PHY,"start turbo decode for CW 0 --> nb_rb %d \n", dlsch0->harq_processes[harq_pid]->nb_rb);
- //LOG_I(PHY,"start turbo decode for CW 0 --> rb_alloc_even %x \n", dlsch0->harq_processes[harq_pid]->rb_alloc_even);
- //LOG_I(PHY,"start turbo decode for CW 0 --> Qm %d \n", dlsch0->harq_processes[harq_pid]->Qm);
- //LOG_I(PHY,"start turbo decode for CW 0 --> Nl %d \n", dlsch0->harq_processes[harq_pid]->Nl);
- //LOG_I(PHY,"start turbo decode for CW 0 --> G %d \n", dlsch0->harq_processes[harq_pid]->G);
- //LOG_I(PHY,"start turbo decode for CW 0 --> Kmimo %d \n", dlsch0->Kmimo);
-
- start_meas(&ue->dlsch_decoding_stats);
+
+#if 0
+ LOG_I(PHY," ------ start turbo decoder for AbsSubframe %d.%d / %d ------ \n", frame_rx, subframe_rx, harq_pid);
+ LOG_I(PHY,"start turbo decode for CW 0 for AbsSubframe %d.%d / %d --> nb_rb %d \n", frame_rx, subframe_rx, harq_pid, dlsch0->harq_processes[harq_pid]->nb_rb);
+ LOG_I(PHY,"start turbo decode for CW 0 for AbsSubframe %d.%d / %d --> rb_alloc_even %x \n", frame_rx, subframe_rx, harq_pid, dlsch0->harq_processes[harq_pid]->rb_alloc_even);
+ LOG_I(PHY,"start turbo decode for CW 0 for AbsSubframe %d.%d / %d --> Qm %d \n", frame_rx, subframe_rx, harq_pid, dlsch0->harq_processes[harq_pid]->Qm);
+ LOG_I(PHY,"start turbo decode for CW 0 for AbsSubframe %d.%d / %d --> Nl %d \n", frame_rx, subframe_rx, harq_pid, dlsch0->harq_processes[harq_pid]->Nl);
+ LOG_I(PHY,"start turbo decode for CW 0 for AbsSubframe %d.%d / %d --> G %d \n", frame_rx, subframe_rx, harq_pid, dlsch0->harq_processes[harq_pid]->G);
+ LOG_I(PHY,"start turbo decode for CW 0 for AbsSubframe %d.%d / %d --> Kmimo %d \n", frame_rx, subframe_rx, harq_pid, dlsch0->Kmimo);
+ LOG_I(PHY,"start turbo decode for CW 0 for AbsSubframe %d.%d / %d --> Pdcch Sym %d \n", frame_rx, subframe_rx, harq_pid, ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols);
+#endif
+
+ start_meas(&ue->dlsch_decoding_stats[subframe_rx&0x1]);
ret = dlsch_decoding(ue,
pdsch_vars->llr[0],
&ue->frame_parms,
@@ -3523,12 +3545,13 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
harq_pid,
pdsch==PDSCH?1:0,
dlsch0->harq_processes[harq_pid]->TBS>256?1:0);
- stop_meas(&ue->dlsch_decoding_stats);
+ stop_meas(&ue->dlsch_decoding_stats[subframe_rx&0x1]);
+
+ LOG_D(PHY," --> Unscrambling for CW0 %5.3f\n",
+ (ue->dlsch_unscrambling_stats.p_time)/(cpuf*1000.0));
+ LOG_D(PHY,"AbsSubframe %d.%d --> Turbo Decoding for CW0 %5.3f\n",
+ frame_rx%1024, subframe_rx,(ue->dlsch_decoding_stats[subframe_rx&0x1].p_time)/(cpuf*1000.0));
- //printf(" --> Unscrambling for CW0 %5.3f\n",
- // (ue->dlsch_unscrambling_stats.p_time)/(cpuf*1000.0));
- //printf(" --> Turbo Decoding for CW0 %5.3f\n",
- // (ue->dlsch_decoding_stats.p_time)/(cpuf*1000.0));
if(is_cw1_active)
{
@@ -3538,7 +3561,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
dlsch1->harq_processes[harq_pid]->rb_alloc_even,
dlsch1->harq_processes[harq_pid]->Qm,
dlsch1->harq_processes[harq_pid]->Nl,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols,
frame_rx,
subframe_rx,
ue->transmission_mode[eNB_id]<7?0:ue->transmission_mode[eNB_id]);
@@ -3553,14 +3576,18 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
subframe_rx<<1);
stop_meas(&ue->dlsch_unscrambling_stats);
- //LOG_I(PHY,"start turbo decode for CW 1 --> nb_rb %d \n", dlsch1->harq_processes[harq_pid]->nb_rb);
- //LOG_I(PHY,"start turbo decode for CW 1 --> rb_alloc_even %x \n", dlsch1->harq_processes[harq_pid]->rb_alloc_even);
- //LOG_I(PHY,"start turbo decode for CW 1 --> Qm %d \n", dlsch1->harq_processes[harq_pid]->Qm);
- //LOG_I(PHY,"start turbo decode for CW 1 --> Nl %d \n", dlsch1->harq_processes[harq_pid]->Nl);
- //LOG_I(PHY,"start turbo decode for CW 1 --> G %d \n", dlsch1->harq_processes[harq_pid]->G);
- //LOG_I(PHY,"start turbo decode for CW 1 --> Kmimo %d \n", dlsch1->Kmimo);
+#if 0
+ LOG_I(PHY,"start turbo decode for CW 1 for AbsSubframe %d.%d / %d --> nb_rb %d \n", frame_rx, subframe_rx, harq_pid, dlsch1->harq_processes[harq_pid]->nb_rb);
+ LOG_I(PHY,"start turbo decode for CW 1 for AbsSubframe %d.%d / %d --> rb_alloc_even %x \n", frame_rx, subframe_rx, harq_pid, dlsch1->harq_processes[harq_pid]->rb_alloc_even);
+ LOG_I(PHY,"start turbo decode for CW 1 for AbsSubframe %d.%d / %d --> Qm %d \n", frame_rx, subframe_rx, harq_pid, dlsch1->harq_processes[harq_pid]->Qm);
+ LOG_I(PHY,"start turbo decode for CW 1 for AbsSubframe %d.%d / %d --> Nl %d \n", frame_rx, subframe_rx, harq_pid, dlsch1->harq_processes[harq_pid]->Nl);
+ LOG_I(PHY,"start turbo decode for CW 1 for AbsSubframe %d.%d / %d --> G %d \n", frame_rx, subframe_rx, harq_pid, dlsch1->harq_processes[harq_pid]->G);
+ LOG_I(PHY,"start turbo decode for CW 1 for AbsSubframe %d.%d / %d --> Kmimo %d \n", frame_rx, subframe_rx, harq_pid, dlsch1->Kmimo);
+ LOG_I(PHY,"start turbo decode for CW 1 for AbsSubframe %d.%d / %d --> Pdcch Sym %d \n", frame_rx, subframe_rx, harq_pid, ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols);
+#endif
+
+ start_meas(&ue->dlsch_decoding_stats[subframe_rx&0x1]);
- start_meas(&ue->dlsch_decoding_stats);
ret1 = dlsch_decoding(ue,
pdsch_vars->llr[1],
&ue->frame_parms,
@@ -3571,13 +3598,16 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
harq_pid,
pdsch==PDSCH?1:0,
dlsch1->harq_processes[harq_pid]->TBS>256?1:0);
- stop_meas(&ue->dlsch_decoding_stats);
+ stop_meas(&ue->dlsch_decoding_stats[subframe_rx&0x1]);
+
- //printf(" --> Unscrambling for CW1 %5.3f\n",
- // (ue->dlsch_unscrambling_stats.p_time)/(cpuf*1000.0));
- //printf(" --> Turbo Decoding for CW1 %5.3f\n",
- // (ue->dlsch_decoding_stats.p_time)/(cpuf*1000.0));
+ LOG_D(PHY," --> Unscrambling for CW1 %5.3f\n",
+ (ue->dlsch_unscrambling_stats.p_time)/(cpuf*1000.0));
+ LOG_D(PHY,"AbsSubframe %d.%d --> Turbo Decoding for CW1 %5.3f\n",
+ frame_rx%1024, subframe_rx,(ue->dlsch_decoding_stats[subframe_rx&0x1].p_time)/(cpuf*1000.0));
}
+
+ LOG_D(PHY," ------ end turbo decoder for AbsSubframe %d.%d ------ \n", frame_rx, subframe_rx);
}
else {
@@ -3596,10 +3626,11 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
if(dlsch0->rnti != 0xffff)
{
- LOG_D(PHY,"[UE %d][PDSCH %x/%d] AbsSubframe %d.%d : DLSCH CW0 in error (rv %d,mcs %d,TBS %d)\n",
+ LOG_D(PHY,"[UE %d][PDSCH %x/%d] AbsSubframe %d.%d : DLSCH CW0 in error (rv %d,round %d, mcs %d,TBS %d)\n",
ue->Mod_id,dlsch0->rnti,
harq_pid,frame_rx,subframe_rx,
dlsch0->harq_processes[harq_pid]->rvidx,
+ dlsch0->harq_processes[harq_pid]->round,
dlsch0->harq_processes[harq_pid]->mcs,
dlsch0->harq_processes[harq_pid]->TBS);
}
@@ -3608,10 +3639,11 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
} else {
if(dlsch0->rnti != 0xffff)
{
- LOG_D(PHY,"[UE %d][PDSCH %x/%d] AbsSubframe %d.%d : Received DLSCH CW0 (rv %d,mcs %d,TBS %d)\n",
+ LOG_D(PHY,"[UE %d][PDSCH %x/%d] AbsSubframe %d.%d : Received DLSCH CW0 (rv %d,round %d, mcs %d,TBS %d)\n",
ue->Mod_id,dlsch0->rnti,
harq_pid,frame_rx,subframe_rx,
dlsch0->harq_processes[harq_pid]->rvidx,
+ dlsch0->harq_processes[harq_pid]->round,
dlsch0->harq_processes[harq_pid]->mcs,
dlsch0->harq_processes[harq_pid]->TBS);
}
@@ -3677,7 +3709,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
if(is_cw1_active)
{
if (ret1 == (1+dlsch0->max_turbo_iterations)) {
- LOG_D(PHY,"[UE %d][PDSCH %x/%d] Frame %d subframe %d DLSCH CW1 in error (rv %d,mcs %d,TBS %d)\n",
+ LOG_I(PHY,"[UE %d][PDSCH %x/%d] Frame %d subframe %d DLSCH CW1 in error (rv %d,mcs %d,TBS %d)\n",
ue->Mod_id,dlsch0->rnti,
harq_pid,frame_rx,subframe_rx,
dlsch0->harq_processes[harq_pid]->rvidx,
@@ -3685,7 +3717,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
dlsch0->harq_processes[harq_pid]->TBS);
} else {
- LOG_D(PHY,"[UE %d][PDSCH %x/%d] Frame %d subframe %d: Received DLSCH CW1 (rv %d,mcs %d,TBS %d)\n",
+ LOG_I(PHY,"[UE %d][PDSCH %x/%d] Frame %d subframe %d: Received DLSCH CW1 (rv %d,mcs %d,TBS %d)\n",
ue->Mod_id,dlsch0->rnti,
harq_pid,frame_rx,subframe_rx,
dlsch0->harq_processes[harq_pid]->rvidx,
@@ -3765,6 +3797,8 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
ue->frame_parms.samples_per_tti * 4));
// start timers
+
+ LOG_D(PHY," ****** start RX-Chain for AbsSubframe %d.%d ****** \n", frame_rx%1024, subframe_rx);
start_meas(&ue->phy_proc_rx[subframe_rx&0x1]);
start_meas(&ue->generic_stat);
@@ -3818,6 +3852,9 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
l=1;
}
+
+ LOG_D(PHY," ------ slot 0 Processing: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
+ LOG_D(PHY," ------ --> FFT/ChannelEst/PDCCH slot 0: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
for (; l<=l2; l++) {
if (abstraction_flag == 0) {
start_meas(&ue->ofdm_demod_stats);
@@ -3841,12 +3878,13 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
LOG_E(PHY,"[UE %d] Frame %d, subframe %d: Error in pdcch procedures\n",ue->Mod_id,frame_rx,subframe_rx);
return(-1);
}
- LOG_D(PHY,"num_pdcch_symbols %d\n",ue->pdcch_vars[eNB_id]->num_pdcch_symbols);
+ LOG_D(PHY,"num_pdcch_symbols %d\n",ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols);
}
} // for l=1..l2
ue_measurement_procedures(l-1,ue,proc,eNB_id,(subframe_rx<<1),abstraction_flag,mode);
+ LOG_D(PHY," ------ end FFT/ChannelEst/PDCCH slot 0: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
// If this is PMCH, call procedures and return
if (pmch_flag == 1) {
ue_pmch_procedures(ue,proc,eNB_id,abstraction_flag);
@@ -3862,7 +3900,8 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
// first slot has been processed (FFTs + Channel Estimation, PCFICH/PHICH/PDCCH)
stop_meas(&ue->generic_stat);
- //printf("[SFN %d] Slot0: FFT + Channel Estimate + PCFICH/PHICH/PDCCH %5.2f \n",subframe_rx,ue->generic_stat.p_time/(cpuf*1000.0));
+ LOG_D(PHY,"[SFN %d] Slot0: FFT + Channel Estimate + PCFICH/PHICH/PDCCH %5.2f \n",subframe_rx,ue->generic_stat.p_time/(cpuf*1000.0));
+ LOG_D(PHY," ------ --> PDSCH ChannelComp/LLR slot 0: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
start_meas(&ue->generic_stat);
// do procedures for C-RNTI
@@ -3874,11 +3913,13 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
PDSCH,
ue->dlsch[subframe_rx&0x1][eNB_id][0],
NULL,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols,
ue->frame_parms.symbols_per_tti>>1,
abstraction_flag);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC, VCD_FUNCTION_OUT);
}
+
+ LOG_D(PHY," ------ end PDSCH ChannelComp/LLR slot 0: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
// do procedures for SI-RNTI
if ((ue->dlsch_SI[eNB_id]) && (ue->dlsch_SI[eNB_id]->active == 1)) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_SI, VCD_FUNCTION_IN);
@@ -3888,7 +3929,7 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
SI_PDSCH,
ue->dlsch_SI[eNB_id],
NULL,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols,
ue->frame_parms.symbols_per_tti>>1,
abstraction_flag);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_SI, VCD_FUNCTION_OUT);
@@ -3903,7 +3944,7 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
P_PDSCH,
ue->dlsch_p[eNB_id],
NULL,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols,
ue->frame_parms.symbols_per_tti>>1,
abstraction_flag);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_P, VCD_FUNCTION_OUT);
@@ -3918,12 +3959,15 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
RA_PDSCH,
ue->dlsch_ra[eNB_id],
NULL,
- ue->pdcch_vars[eNB_id]->num_pdcch_symbols,
+ ue->pdcch_vars[subframe_rx & 0x1][eNB_id]->num_pdcch_symbols,
ue->frame_parms.symbols_per_tti>>1,
abstraction_flag);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC_RA, VCD_FUNCTION_OUT);
}
+ LOG_D(PHY," ------ slot 1 Processing: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
+ LOG_D(PHY," ------ --> FFT/ChannelEst/PDCCH slot 1: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
+
if (subframe_select(&ue->frame_parms,subframe_rx) != SF_S) { // do front-end processing for second slot, and first symbol of next subframe
for (l=1; l<ue->frame_parms.symbols_per_tti>>1; l++) {
if (abstraction_flag == 0) {
@@ -3957,15 +4001,17 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
} // not an S-subframe
stop_meas(&ue->generic_stat);
- //printf("[SFN %d] Slot1: FFT + Channel Estimate + Pdsch Proc Slot0 %5.2f \n",subframe_rx,ue->generic_stat.p_time/(cpuf*1000.0));
- // run pbch procedures if subframe is 0
+ LOG_D(PHY,"[SFN %d] Slot1: FFT + Channel Estimate + Pdsch Proc Slot0 %5.2f \n",subframe_rx,ue->generic_stat.p_time/(cpuf*1000.0));
+ LOG_D(PHY," ------ end FFT/ChannelEst/PDCCH slot 1: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
+
if ( (subframe_rx == 0) && (ue->decode_MIB == 1))
{
ue_pbch_procedures(eNB_id,ue,proc,abstraction_flag);
}
// do procedures for C-RNTI
+ LOG_D(PHY," ------ --> PDSCH ChannelComp/LLR slot 0: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
if (ue->dlsch[subframe_rx&0x1][eNB_id][0]->active == 1) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC, VCD_FUNCTION_IN);
start_meas(&ue->pdsch_procedures_stat);
@@ -3980,6 +4026,9 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
abstraction_flag);
stop_meas(&ue->pdsch_procedures_stat);
+ LOG_D(PHY," ------ end PDSCH ChannelComp/LLR slot 0: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
+ LOG_D(PHY," ------ --> PDSCH Turbo Decoder slot 0/1: AbsSubframe %d.%d ------ \n", frame_rx%1024, subframe_rx);
+
start_meas(&ue->dlsch_procedures_stat);
ue_dlsch_procedures(ue,
proc,
@@ -3991,15 +4040,14 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
mode,
abstraction_flag);
stop_meas(&ue->dlsch_procedures_stat);
- //printf("[SFN %d] Slot1: Pdsch Proc %5.2f\n",subframe_rx,ue->pdsch_procedures_stat.p_time/(cpuf*1000.0));
- //printf("[SFN %d] Slot0 Slot1: Dlsch Proc %5.2f\n",subframe_rx,ue->dlsch_procedures_stat.p_time/(cpuf*1000.0));
+ LOG_D(PHY,"[SFN %d] Slot1: Pdsch Proc %5.2f\n",subframe_rx,ue->pdsch_procedures_stat.p_time/(cpuf*1000.0));
+ LOG_D(PHY,"[SFN %d] Slot0 Slot1: Dlsch Proc %5.2f\n",subframe_rx,ue->dlsch_procedures_stat.p_time/(cpuf*1000.0));
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC, VCD_FUNCTION_OUT);
}
start_meas(&ue->generic_stat);
-
// do procedures for SI-RNTI
if ((ue->dlsch_SI[eNB_id]) && (ue->dlsch_SI[eNB_id]->active == 1)) {
ue_pdsch_procedures(ue,
@@ -4105,8 +4153,8 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX, VCD_FUNCTION_OUT);
stop_meas(&ue->phy_proc_rx[subframe_rx&0x1]);
- //printf("------FULL RX PROC [SFN %d]: %5.2f ------\n",subframe_rx,ue->phy_proc_rx[subframe_rx&0x1].p_time/(cpuf*1000.0));
-
+ LOG_D(PHY,"------FULL RX PROC [SFN %d]: %5.2f ------\n",subframe_rx,ue->phy_proc_rx[subframe_rx&0x1].p_time/(cpuf*1000.0));
+ LOG_D(PHY," ****** end RX-Chain for AbsSubframe %d.%d ****** \n", frame_rx%1024, subframe_rx);
return (0);
}
diff --git a/openair1/SIMULATION/ETH_TRANSPORT/emu_transport.c b/openair1/SIMULATION/ETH_TRANSPORT/emu_transport.c
index 6d3d4cabb35aacee0ce5e3e71bce097751430581..76b72e321f304901ac38c0d0e2cf72fbd3a8c460 100644
--- a/openair1/SIMULATION/ETH_TRANSPORT/emu_transport.c
+++ b/openair1/SIMULATION/ETH_TRANSPORT/emu_transport.c
@@ -488,7 +488,8 @@ void fill_phy_ue_vars(unsigned int ue_id, uint8_t CC_id,unsigned int last_slot)
rnti = UE_transport_info[ue_id][CC_id].rnti[n_enb];
enb_id = UE_transport_info[ue_id][CC_id].eNB_id[n_enb];
- PHY_vars_UE_g[ue_id][CC_id]->pdcch_vars[enb_id]->crnti=rnti;
+ PHY_vars_UE_g[ue_id][CC_id]->pdcch_vars[0][enb_id]->crnti=rnti;
+ PHY_vars_UE_g[ue_id][CC_id]->pdcch_vars[1][enb_id]->crnti=rnti;
harq_pid = UE_transport_info[ue_id][CC_id].harq_pid[n_enb];
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index ddc108a7c8491e9d4d234982cb911620b4f2bbf7..6acfc646c7e5adef0ba00b96b08a4f1ba2d3053e 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -57,6 +57,8 @@
PHY_VARS_eNB *eNB;
PHY_VARS_UE *UE;
+double cpuf;
+
int otg_enabled=0;
/*the following parameters are used to control the processing times calculations*/
double t_tx_max = -1000000000; /*!< \brief initial max process time for tx */
@@ -1409,6 +1411,8 @@ int main(int argc, char **argv)
#endif
printf("Detected cpu_freq %f GHz\n",cpu_freq_GHz);
+ cpuf = cpu_freq_GHz;
+
//signal(SIGSEGV, handler);
//signal(SIGABRT, handler);
@@ -1991,7 +1995,7 @@ int main(int argc, char **argv)
}
*/
- UE->pdcch_vars[0]->crnti = n_rnti;
+ UE->pdcch_vars[0][0]->crnti = n_rnti;
// Fill in UL_alloc
UL_alloc_pdu.type = 0;
@@ -2259,7 +2263,8 @@ int main(int argc, char **argv)
reset_meas(&UE->dlsch_channel_estimation_stats);
reset_meas(&UE->dlsch_freq_offset_estimation_stats);
reset_meas(&UE->rx_dft_stats);
- reset_meas(&UE->dlsch_decoding_stats);
+ reset_meas(&UE->dlsch_decoding_stats[0]);
+ reset_meas(&UE->dlsch_decoding_stats[1]);
reset_meas(&UE->dlsch_turbo_decoding_stats);
reset_meas(&UE->dlsch_deinterleaving_stats);
reset_meas(&UE->dlsch_rate_unmatching_stats);
@@ -2543,16 +2548,16 @@ int main(int argc, char **argv)
//pdsch_vars
- dump_dlsch2(UE,eNB_id,subframe,coded_bits_per_codeword,round, UE->dlsch[subframe&0x1][0][0]->current_harq_pid);
+ dump_dlsch2(UE,eNB_id,subframe,&coded_bits_per_codeword,round, UE->dlsch[subframe&0x1][0][0]->current_harq_pid);
write_output("dlsch_e.m","e",eNB->dlsch[0][0]->harq_processes[0]->e,coded_bits_per_codeword,1,4);
//pdcch_vars
- write_output("pdcchF0_ext.m","pdcchF_ext", UE->pdcch_vars[eNB_id]->rxdataF_ext[0],2*3*UE->frame_parms.ofdm_symbol_size,1,1);
- write_output("pdcch00_ch0_ext.m","pdcch00_ch0_ext",UE->pdcch_vars[eNB_id]->dl_ch_estimates_ext[0],300*3,1,1);
+ write_output("pdcchF0_ext.m","pdcchF_ext", UE->pdcch_vars[0][eNB_id]->rxdataF_ext[0],2*3*UE->frame_parms.ofdm_symbol_size,1,1);
+ write_output("pdcch00_ch0_ext.m","pdcch00_ch0_ext",UE->pdcch_vars[0][eNB_id]->dl_ch_estimates_ext[0],300*3,1,1);
- write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",UE->pdcch_vars[eNB_id]->rxdataF_comp[0],4*300,1,1);
- write_output("pdcch_rxF_llr.m","pdcch_llr",UE->pdcch_vars[eNB_id]->llr,2400,1,4);
+ write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",UE->pdcch_vars[0][eNB_id]->rxdataF_comp[0],4*300,1,1);
+ write_output("pdcch_rxF_llr.m","pdcch_llr",UE->pdcch_vars[0][eNB_id]->llr,2400,1,4);
}
@@ -2644,7 +2649,7 @@ int main(int argc, char **argv)
}
//pdsch_vars
- dump_dlsch2(UE,eNB_id,subframe,coded_bits_per_codeword,round, UE->dlsch[subframe&0x1][0][0]->current_harq_pid);
+ dump_dlsch2(UE,eNB_id,subframe,&coded_bits_per_codeword,round, UE->dlsch[subframe&0x1][0][0]->current_harq_pid);
//write_output("dlsch_e.m","e",eNB->dlsch[0][0]->harq_processes[0]->e,coded_bits_per_codeword,1,4);
@@ -2652,11 +2657,11 @@ int main(int argc, char **argv)
//write_output("dlsch_w.m","w",eNB->dlsch[0][0]->harq_processes[0]->w[0],3*(tbs+64),1,4);
//write_output("dlsch_w.m","w",UE->dlsch[subframe&0x1][0][0]->harq_processes[0]->w[0],3*(tbs+64),1,0);
//pdcch_vars
- write_output("pdcchF0_ext.m","pdcchF_ext", UE->pdcch_vars[eNB_id]->rxdataF_ext[0],2*3*UE->frame_parms.ofdm_symbol_size,1,1);
- write_output("pdcch00_ch0_ext.m","pdcch00_ch0_ext",UE->pdcch_vars[eNB_id]->dl_ch_estimates_ext[0],300*3,1,1);
+ write_output("pdcchF0_ext.m","pdcchF_ext", UE->pdcch_vars[0][eNB_id]->rxdataF_ext[0],2*3*UE->frame_parms.ofdm_symbol_size,1,1);
+ write_output("pdcch00_ch0_ext.m","pdcch00_ch0_ext",UE->pdcch_vars[0][eNB_id]->dl_ch_estimates_ext[0],300*3,1,1);
- write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",UE->pdcch_vars[eNB_id]->rxdataF_comp[0],4*300,1,1);
- write_output("pdcch_rxF_llr.m","pdcch_llr",UE->pdcch_vars[eNB_id]->llr,2400,1,4);
+ write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",UE->pdcch_vars[0][eNB_id]->rxdataF_comp[0],4*300,1,1);
+ write_output("pdcch_rxF_llr.m","pdcch_llr",UE->pdcch_vars[0][eNB_id]->llr,2400,1,4);
if (round == 3) exit(-1);
}
@@ -2708,7 +2713,7 @@ int main(int argc, char **argv)
double t_rx = (double)UE->phy_proc_rx[subframe&0x1].p_time/cpu_freq_GHz/1000.0;
double t_rx_fft = (double)UE->ofdm_demod_stats.p_time/cpu_freq_GHz/1000.0;
double t_rx_demod = (double)UE->dlsch_rx_pdcch_stats.p_time/cpu_freq_GHz/1000.0;
- double t_rx_dec = (double)UE->dlsch_decoding_stats.p_time/cpu_freq_GHz/1000.0;
+ double t_rx_dec = (double)UE->dlsch_decoding_stats[subframe&1].p_time/cpu_freq_GHz/1000.0;
if (t_tx > t_tx_max)
t_tx_max = t_tx;
@@ -2921,12 +2926,12 @@ int main(int argc, char **argv)
printf("|__ Statistcs std: %fus median %fus q1 %fus q3 %fus \n",std_phy_proc_rx_demod, rx_demod_median, rx_demod_q1, rx_demod_q3);
printf("DLSCH unscrambling time :%f us (%d trials)\n",(double)UE->dlsch_unscrambling_stats.diff/UE->dlsch_unscrambling_stats.trials/cpu_freq_GHz/1000.0,
UE->dlsch_unscrambling_stats.trials);
- std_phy_proc_rx_dec = sqrt((double)UE->dlsch_decoding_stats.diff_square/pow(cpu_freq_GHz,2)/pow(1000,
- 2)/UE->dlsch_decoding_stats.trials - pow((double)UE->dlsch_decoding_stats.diff/UE->dlsch_decoding_stats.trials/cpu_freq_GHz/1000,2));
+ std_phy_proc_rx_dec = sqrt((double)UE->dlsch_decoding_stats[subframe&1].diff_square/pow(cpu_freq_GHz,2)/pow(1000,
+ 2)/UE->dlsch_decoding_stats[subframe&1].trials - pow((double)UE->dlsch_decoding_stats[subframe&1].diff/UE->dlsch_decoding_stats[subframe&1].trials/cpu_freq_GHz/1000,2));
printf("DLSCH Decoding time (%02.2f Mbit/s, avg iter %1.2f) :%f us (%d trials, max %f)\n",
eNB->dlsch[0][0]->harq_processes[0]->TBS/1000.0,(double)avg_iter/iter_trials,
- (double)UE->dlsch_decoding_stats.diff/UE->dlsch_decoding_stats.trials/cpu_freq_GHz/1000.0,UE->dlsch_decoding_stats.trials,
- (double)UE->dlsch_decoding_stats.max/cpu_freq_GHz/1000.0);
+ (double)UE->dlsch_decoding_stats[subframe&1].diff/UE->dlsch_decoding_stats[subframe&1].trials/cpu_freq_GHz/1000.0,UE->dlsch_decoding_stats[subframe&1].trials,
+ (double)UE->dlsch_decoding_stats[subframe&1].max/cpu_freq_GHz/1000.0);
printf("|__ Statistcs std: %fus median %fus q1 %fus q3 %fus \n",std_phy_proc_rx_dec, rx_dec_median, rx_dec_q1, rx_dec_q3);
printf("|__ DLSCH Rate Unmatching :%f us (%d trials)\n",
(double)UE->dlsch_rate_unmatching_stats.diff/UE->dlsch_rate_unmatching_stats.trials/cpu_freq_GHz/1000.0,UE->dlsch_rate_unmatching_stats.trials);
@@ -3114,7 +3119,7 @@ int main(int argc, char **argv)
UE->dlsch_rx_pdcch_stats.trials,
UE->dlsch_llr_stats.trials,
UE->dlsch_unscrambling_stats.trials,
- UE->dlsch_decoding_stats.trials
+ UE->dlsch_decoding_stats[subframe&1].trials
);
fprintf(time_meas_fd,"%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;",
get_time_meas_us(&eNB->phy_proc_tx),
@@ -3127,7 +3132,7 @@ int main(int argc, char **argv)
get_time_meas_us(&UE->dlsch_rx_pdcch_stats),
3*get_time_meas_us(&UE->dlsch_llr_stats),
get_time_meas_us(&UE->dlsch_unscrambling_stats),
- get_time_meas_us(&UE->dlsch_decoding_stats)
+ get_time_meas_us(&UE->dlsch_decoding_stats[subframe&1])
);
//fprintf(time_meas_fd,"eNB_PROC_TX_STD;eNB_PROC_TX_MAX;eNB_PROC_TX_MIN;eNB_PROC_TX_MED;eNB_PROC_TX_Q1;eNB_PROC_TX_Q3;eNB_PROC_TX_DROPPED;\n");
fprintf(time_meas_fd,"%f;%f;%f;%f;%f;%f;%d;", std_phy_proc_tx, t_tx_max, t_tx_min, tx_median, tx_q1, tx_q3, n_tx_dropped);
@@ -3167,7 +3172,7 @@ int main(int argc, char **argv)
UE->dlsch_rx_pdcch_stats.trials,
UE->dlsch_llr_stats.trials,
UE->dlsch_unscrambling_stats.trials,
- UE->dlsch_decoding_stats.trials);
+ UE->dlsch_decoding_stats[subframe&1].trials);
*/
printf("[passed] effective rate : %f (%2.1f%%,%f)): log and break \n",rate*effective_rate, 100*effective_rate, rate );
break;
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c b/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
index b45bfdf324ea2a0eac62118f48ea07427832994c..57742c5e13e4ec8d1f7fe13e0fe069a7ce1238c4 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
@@ -68,6 +68,7 @@ extern uint8_t interf_unaw_shift;
PHY_VARS_eNB *eNB;
PHY_VARS_UE *UE;
+double cpuf;
int otg_enabled=0;
/*the following parameters are used to control the processing times calculations*/
@@ -296,8 +297,6 @@ int main(int argc, char **argv)
int threequarter_fs=0;
-
-
opp_enabled=1; // to enable the time meas
#if defined(__arm__)
@@ -316,6 +315,8 @@ int main(int argc, char **argv)
#else
cpu_freq_GHz = get_cpu_freq_GHz();
#endif
+ cpuf = cpu_freq_GHz;
+
printf("Detected cpu_freq %f GHz\n",cpu_freq_GHz);
//signal(SIGSEGV, handler);
@@ -867,7 +868,7 @@ int main(int argc, char **argv)
// bzero(r_im0[i],FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(double));
}
- UE->pdcch_vars[0]->crnti = n_rnti;
+ UE->pdcch_vars[subframe&0x1][0]->crnti = n_rnti;
UE->transmission_mode[eNB_id]=transmission_mode;
if (UE->transmission_mode[eNB_id] !=4)
UE->measurements.rank[eNB_id]=0;
@@ -2087,7 +2088,8 @@ int main(int argc, char **argv)
reset_meas(&UE->dlsch_freq_offset_estimation_stats);
reset_meas(&UE->rx_dft_stats);
reset_meas(&UE->dlsch_llr_stats);
- reset_meas(&UE->dlsch_decoding_stats);
+ reset_meas(&UE->dlsch_decoding_stats[0]);
+ reset_meas(&UE->dlsch_decoding_stats[1]);
reset_meas(&UE->dlsch_turbo_decoding_stats);
reset_meas(&UE->dlsch_deinterleaving_stats);
reset_meas(&UE->dlsch_rate_unmatching_stats);
@@ -3488,9 +3490,7 @@ int main(int argc, char **argv)
UE->UE_mode[0] = PUSCH;
start_meas(&UE->dlsch_rx_pdcch_stats);
- rx_pdcch(&UE->common_vars,
- UE->pdcch_vars,
- &UE->frame_parms,
+ rx_pdcch(UE,
trials,
subframe,
0,
@@ -3500,7 +3500,7 @@ int main(int argc, char **argv)
stop_meas(&UE->dlsch_rx_pdcch_stats);
// overwrite number of pdcch symbols
- UE->pdcch_vars[0]->num_pdcch_symbols = num_pdcch_symbols;
+ UE->pdcch_vars[subframe&0x1][0]->num_pdcch_symbols = num_pdcch_symbols;
dci_cnt = dci_decoding_procedure(UE,
dci_alloc_rx,1,
@@ -3544,14 +3544,14 @@ int main(int argc, char **argv)
0,
P_RNTI,
transmission_mode<7?0:transmission_mode,
- UE->pdcch_vars[0]->crnti_is_temporary? UE->pdcch_vars[0]->crnti: 0)==0)) {
+ UE->pdcch_vars[subframe&0x1][0]->crnti_is_temporary? UE->pdcch_vars[subframe&0x1][0]->crnti: 0)==0)) {
dump_dci(&UE->frame_parms,&dci_alloc_rx[i]);
coded_bits_per_codeword[0]= get_G(&eNB->frame_parms,
UE->dlsch[subframe&0x1][0][0]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->nb_rb,
UE->dlsch[subframe&0x1][0][0]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->rb_alloc_even,
get_Qm(UE->dlsch[subframe&0x1][0][0]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->mcs),
UE->dlsch[subframe&0x1][0][0]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->Nl,
- UE->pdcch_vars[0]->num_pdcch_symbols,
+ UE->pdcch_vars[subframe&0x1][0]->num_pdcch_symbols,
0,
subframe,
transmission_mode>=7?transmission_mode:0);
@@ -3561,7 +3561,7 @@ int main(int argc, char **argv)
UE->dlsch[subframe&0x1][0][1]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->rb_alloc_even,
get_Qm(UE->dlsch[subframe&0x1][0][1]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->mcs),
UE->dlsch[subframe&0x1][0][1]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->Nl,
- UE->pdcch_vars[1]->num_pdcch_symbols,
+ UE->pdcch_vars[subframe&0x1][1]->num_pdcch_symbols,
0,
subframe,
transmission_mode>=7?transmission_mode:0);
@@ -3570,7 +3570,7 @@ int main(int argc, char **argv)
rate = (double)dlsch_tbs25[get_I_TBS(UE->dlsch[subframe&0x1][0][0]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->mcs)][UE->dlsch[subframe&0x1][0][0]->nb_rb-1]/(coded_bits_per_codeword);
rate*=get_Qm(UE->dlsch[subframe&0x1][0][0]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->mcs);
*/
- printf("num_pdcch_symbols %d, G %d, TBS %d\n",UE->pdcch_vars[0]->num_pdcch_symbols,coded_bits_per_codeword [0],UE->dlsch[subframe&0x1][0][0]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->TBS);
+ printf("num_pdcch_symbols %d, G %d, TBS %d\n",UE->pdcch_vars[subframe&0x1][0]->num_pdcch_symbols,coded_bits_per_codeword [0],UE->dlsch[subframe&0x1][0][0]->harq_processes[UE->dlsch[subframe&0x1][0][0]->current_harq_pid]->TBS);
dlsch_active = 1; // what does it indicates???
} else {
@@ -3591,8 +3591,8 @@ int main(int argc, char **argv)
}
}
} else { //dci_flag == 0
- UE->pdcch_vars[0]->crnti = n_rnti;
- UE->pdcch_vars[0]->num_pdcch_symbols = num_pdcch_symbols;
+ UE->pdcch_vars[subframe&0x1][0]->crnti = n_rnti;
+ UE->pdcch_vars[subframe&0x1][0]->num_pdcch_symbols = num_pdcch_symbols;
if (round == 0) {
UE->dlsch[subframe&0x1][0][0]->harq_processes[0]->first_tx=1;
UE->dlsch[subframe&0x1][0][1]->harq_processes[0]->first_tx=1;
@@ -3613,7 +3613,7 @@ int main(int argc, char **argv)
0,
P_RNTI,
transmission_mode<7?0:transmission_mode,
- UE->pdcch_vars[0]->crnti_is_temporary? UE->pdcch_vars[0]->crnti: 0);
+ UE->pdcch_vars[subframe&0x1][0]->crnti_is_temporary? UE->pdcch_vars[subframe&0x1][0]->crnti: 0);
break;
case 3:
@@ -3631,7 +3631,7 @@ int main(int argc, char **argv)
0,
P_RNTI,
transmission_mode<7?0:transmission_mode,
- UE->pdcch_vars[0]->crnti_is_temporary? UE->pdcch_vars[0]->crnti: 0);
+ UE->pdcch_vars[subframe&0x1][0]->crnti_is_temporary? UE->pdcch_vars[subframe&0x1][0]->crnti: 0);
//printf("Rate: TM3 (after) round %d (%d) first_tx %d\n",round,UE->dlsch[subframe&0x1][0][0]->harq_processes[0]->round,UE->dlsch[subframe&0x1][0][0]->harq_processes[0]->first_tx);
break;
case 4:
@@ -3647,7 +3647,7 @@ int main(int argc, char **argv)
0,
P_RNTI,
transmission_mode<7?0:transmission_mode,
- UE->pdcch_vars[0]->crnti_is_temporary? UE->pdcch_vars[0]->crnti: 0);
+ UE->pdcch_vars[subframe&0x1][0]->crnti_is_temporary? UE->pdcch_vars[subframe&0x1][0]->crnti: 0);
break;
case 5:
@@ -3664,7 +3664,7 @@ int main(int argc, char **argv)
0,
P_RNTI,
transmission_mode<7?0:transmission_mode,
- UE->pdcch_vars[0]->crnti_is_temporary? UE->pdcch_vars[0]->crnti: 0);
+ UE->pdcch_vars[subframe&0x1][0]->crnti_is_temporary? UE->pdcch_vars[subframe&0x1][0]->crnti: 0);
break;
}
dlsch_active = 1;
@@ -3690,7 +3690,7 @@ int main(int argc, char **argv)
start_meas(&UE->dlsch_llr_stats);
- for (m=UE->pdcch_vars[0]->num_pdcch_symbols; m<pilot2; m++) {
+ for (m=UE->pdcch_vars[subframe&0x1][0]->num_pdcch_symbols; m<pilot2; m++) {
if (rx_pdsch(UE,
PDSCH,
eNB_id,
@@ -3698,7 +3698,7 @@ int main(int argc, char **argv)
0,
subframe,
m,
- (m==UE->pdcch_vars[0]->num_pdcch_symbols)?1:0,
+ (m==UE->pdcch_vars[subframe&0x1][0]->num_pdcch_symbols)?1:0,
rx_type,
i_mod,
UE->dlsch[subframe&0x1][0][0]->current_harq_pid)==-1){
@@ -3849,7 +3849,7 @@ int main(int argc, char **argv)
subframe<<1);
stop_meas(&UE->dlsch_unscrambling_stats);
- start_meas(&UE->dlsch_decoding_stats);
+ start_meas(&UE->dlsch_decoding_stats[subframe&0x1]);
ret[TB] = dlsch_decoding(UE,
UE->pdsch_vars[subframe&0x1][eNB_id]->llr[UE->dlsch[subframe&0x1][0][TB]->harq_processes[UE->dlsch[subframe&0x1][0][TB]->current_harq_pid]->codeword],
&UE->frame_parms,
@@ -3859,7 +3859,7 @@ int main(int argc, char **argv)
subframe,
UE->dlsch[subframe&0x1][0][TB]->current_harq_pid,
1,llr8_flag);
- stop_meas(&UE->dlsch_decoding_stats);
+ stop_meas(&UE->dlsch_decoding_stats[subframe&0x1]);
#ifdef DEBUG_HARQ
printf("[DLSIM] ret[%d] = %d\n", TB, ret[TB]);
#endif
@@ -4208,7 +4208,7 @@ int main(int argc, char **argv)
subframe<<1);
stop_meas(&UE->dlsch_unscrambling_stats);
- start_meas(&UE->dlsch_decoding_stats);
+ start_meas(&UE->dlsch_decoding_stats[subframe&0x1]);
ret[1] = dlsch_decoding(UE,
UE->pdsch_vars[subframe&0x1][eNB_id]->llr[UE->dlsch[subframe&0x1][0][1]->harq_processes[UE->dlsch[subframe&0x1][0][1]->current_harq_pid]->codeword],
@@ -4219,7 +4219,7 @@ int main(int argc, char **argv)
subframe,
UE->dlsch[subframe&0x1][0][1]->current_harq_pid,
1,llr8_flag);
- stop_meas(&UE->dlsch_decoding_stats);
+ stop_meas(&UE->dlsch_decoding_stats[subframe&0x1]);
#ifdef DEBUG_HARQ
printf("[DLSIM] Decoding TB1 in SIC: ret[1] = %d, round sic %d\n", ret[1], round_sic);
@@ -4419,11 +4419,11 @@ int main(int argc, char **argv)
*/
//pdcch_vars
- write_output("pdcchF0_ext.m","pdcchF_ext", UE->pdcch_vars[eNB_id]->rxdataF_ext[0],2*3*UE->frame_parms.ofdm_symbol_size,1,1);
- write_output("pdcch00_ch0_ext.m","pdcch00_ch0_ext",UE->pdcch_vars[eNB_id]->dl_ch_estimates_ext[0],300*3,1,1);
+ write_output("pdcchF0_ext.m","pdcchF_ext", UE->pdcch_vars[subframe&0x1][eNB_id]->rxdataF_ext[0],2*3*UE->frame_parms.ofdm_symbol_size,1,1);
+ write_output("pdcch00_ch0_ext.m","pdcch00_ch0_ext",UE->pdcch_vars[subframe&0x1][eNB_id]->dl_ch_estimates_ext[0],300*3,1,1);
- write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",UE->pdcch_vars[eNB_id]->rxdataF_comp[0],4*300,1,1);
- write_output("pdcch_rxF_llr.m","pdcch_llr",UE->pdcch_vars[eNB_id]->llr,2400,1,4);
+ write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",UE->pdcch_vars[subframe&0x1][eNB_id]->rxdataF_comp[0],4*300,1,1);
+ write_output("pdcch_rxF_llr.m","pdcch_llr",UE->pdcch_vars[subframe&0x1][eNB_id]->llr,2400,1,4);
if (round == 3) exit(-1);
}
@@ -4534,7 +4534,7 @@ int main(int argc, char **argv)
double t_rx = (double)UE->phy_proc_rx[subframe&0x1].p_time/cpu_freq_GHz/1000.0;
double t_rx_fft = (double)UE->ofdm_demod_stats.p_time/cpu_freq_GHz/1000.0;
double t_rx_demod = (double)UE->dlsch_rx_pdcch_stats.p_time/cpu_freq_GHz/1000.0;
- double t_rx_dec = (double)UE->dlsch_decoding_stats.p_time/cpu_freq_GHz/1000.0;
+ double t_rx_dec = (double)UE->dlsch_decoding_stats[subframe&0x1].p_time/cpu_freq_GHz/1000.0;
if (t_tx > t_tx_max)
@@ -4891,12 +4891,12 @@ int main(int argc, char **argv)
printf("|__ Statistcs std: %fus median %fus q1 %fus q3 %fus \n",std_phy_proc_rx_demod, rx_demod_median, rx_demod_q1, rx_demod_q3);
printf("DLSCH unscrambling time :%f us (%d trials)\n",(double)UE->dlsch_unscrambling_stats.diff/UE->dlsch_unscrambling_stats.trials/cpu_freq_GHz/1000.0,
UE->dlsch_unscrambling_stats.trials);
- std_phy_proc_rx_dec = sqrt((double)UE->dlsch_decoding_stats.diff_square/pow(cpu_freq_GHz,2)/pow(1000,
- 2)/UE->dlsch_decoding_stats.trials - pow((double)UE->dlsch_decoding_stats.diff/UE->dlsch_decoding_stats.trials/cpu_freq_GHz/1000,2));
+ std_phy_proc_rx_dec = sqrt((double)UE->dlsch_decoding_stats[subframe&0x1].diff_square/pow(cpu_freq_GHz,2)/pow(1000,
+ 2)/UE->dlsch_decoding_stats[subframe&0x1].trials - pow((double)UE->dlsch_decoding_stats[subframe&0x1].diff/UE->dlsch_decoding_stats[subframe&0x1].trials/cpu_freq_GHz/1000,2));
printf("DLSCH Decoding time (%02.2f Mbit/s, avg iter %1.2f) :%f us (%d trials, max %f)\n",
eNB->dlsch[0][0]->harq_processes[0]->TBS/1000.0,(double)avg_iter[0]/iter_trials[0],
- (double)UE->dlsch_decoding_stats.diff/UE->dlsch_decoding_stats.trials/cpu_freq_GHz/1000.0,UE->dlsch_decoding_stats.trials,
- (double)UE->dlsch_decoding_stats.max/cpu_freq_GHz/1000.0);
+ (double)UE->dlsch_decoding_stats[subframe&0x1].diff/UE->dlsch_decoding_stats[subframe&0x1].trials/cpu_freq_GHz/1000.0,UE->dlsch_decoding_stats[subframe&0x1].trials,
+ (double)UE->dlsch_decoding_stats[subframe&0x1].max/cpu_freq_GHz/1000.0);
printf("|__ Statistcs std: %fus median %fus q1 %fus q3 %fus \n",std_phy_proc_rx_dec, rx_dec_median, rx_dec_q1, rx_dec_q3);
printf("|__ DLSCH Rate Unmatching :%f us (%d trials)\n",
(double)UE->dlsch_rate_unmatching_stats.diff/UE->dlsch_rate_unmatching_stats.trials/cpu_freq_GHz/1000.0,UE->dlsch_rate_unmatching_stats.trials);
@@ -5194,7 +5194,7 @@ int main(int argc, char **argv)
UE->dlsch_rx_pdcch_stats.trials,
UE->dlsch_llr_stats.trials,
UE->dlsch_unscrambling_stats.trials,
- UE->dlsch_decoding_stats.trials
+ UE->dlsch_decoding_stats[subframe&0x1].trials
);
fprintf(time_meas_fd,"%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;",
get_time_meas_us(&eNB->phy_proc_tx),
@@ -5207,7 +5207,7 @@ int main(int argc, char **argv)
get_time_meas_us(&UE->dlsch_rx_pdcch_stats),
3*get_time_meas_us(&UE->dlsch_llr_stats),
get_time_meas_us(&UE->dlsch_unscrambling_stats),
- get_time_meas_us(&UE->dlsch_decoding_stats)
+ get_time_meas_us(&UE->dlsch_decoding_stats[subframe&0x1])
);
//fprintf(time_meas_fd,"eNB_PROC_TX_STD;eNB_PROC_TX_MAX;eNB_PROC_TX_MIN;eNB_PROC_TX_MED;eNB_PROC_TX_Q1;eNB_PROC_TX_Q3;eNB_PROC_TX_DROPPED;\n");
fprintf(time_meas_fd,"%f;%f;%f;%f;%f;%f;%d;", std_phy_proc_tx, t_tx_max, t_tx_min, tx_median, tx_q1, tx_q3, n_tx_dropped);
@@ -5247,7 +5247,7 @@ int main(int argc, char **argv)
UE->dlsch_rx_pdcch_stats.trials,
UE->dlsch_llr_stats.trials,
UE->dlsch_unscrambling_stats.trials,
- UE->dlsch_decoding_stats.trials);
+ UE->dlsch_decoding_stats[subframe&0x1].trials);
*/
printf("[passed] effective rate : %f (%2.1f%%,%f)): log and break \n",rate[0]*effective_rate, 100*effective_rate, rate[0]);
break;
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim_tm7.c b/openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
index 6c306d6d46c3c34b8a4de5cb3e6d77eb58070c37..3055e99b07272a4d318787f4b6830b772efd88d8 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
@@ -3504,7 +3504,7 @@ PMI_FEEDBACK:
UE->frame_parms.ofdm_symbol_size*nsymb/2,1,1);
//pdsch_vars
- dump_dlsch2(UE,eNB_id,subframe,coded_bits_per_codeword,round);
+ dump_dlsch2(UE,eNB_id,subframe,&coded_bits_per_codeword,round);
//dump_dlsch2(UE,eNB_id_i,coded_bits_per_codeword);
write_output("dlsch_e.m","e",eNB->dlsch[0][0]->harq_processes[0]->e,coded_bits_per_codeword,1,4);
@@ -3721,7 +3721,7 @@ PMI_FEEDBACK:
}
//pdsch_vars
- dump_dlsch2(UE,eNB_id,subframe,coded_bits_per_codeword,round);
+ dump_dlsch2(UE,eNB_id,subframe,&coded_bits_per_codeword,round);
/*
write_output("dlsch_e.m","e",eNB->dlsch[0][0]->harq_processes[0]->e,coded_bits_per_codeword,1,4);
write_output("dlsch_ber_bit.m","ber_bit",uncoded_ber_bit,coded_bits_per_codeword,1,0);
diff --git a/openair1/SIMULATION/LTE_PHY/mbmssim.c b/openair1/SIMULATION/LTE_PHY/mbmssim.c
index fb2fa506ac20f01aedc334f9283ca4836f75b895..69de4aee9f000337292bff2f6d5c2e5b9f9d3822 100644
--- a/openair1/SIMULATION/LTE_PHY/mbmssim.c
+++ b/openair1/SIMULATION/LTE_PHY/mbmssim.c
@@ -50,6 +50,7 @@
PHY_VARS_eNB *eNB;
PHY_VARS_UE *UE;
+double cpuf;
DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu2_1E[2];
#define UL_RB_ALLOC 0x1ff;
@@ -118,6 +119,8 @@ int main(int argc, char **argv)
#endif
*/
+ cpuf = get_cpu_freq_GHz();
+
logInit();
number_of_cards = 1;
diff --git a/openair1/SIMULATION/LTE_PHY/pbchsim.c b/openair1/SIMULATION/LTE_PHY/pbchsim.c
index 806a206a2bd851800126a929b7a9f51bfa14dec9..f117879d6b49fd43f390d3c9999dae237bc3a492 100644
--- a/openair1/SIMULATION/LTE_PHY/pbchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pbchsim.c
@@ -50,6 +50,8 @@
PHY_VARS_eNB *eNB,*eNB1,*eNB2;
PHY_VARS_UE *UE;
+double cpuf;
+
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
int32_t *dummybuf[4];
@@ -116,6 +118,8 @@ int main(int argc, char **argv)
char title[255];
#endif
+ cpuf = get_cpu_freq_GHz();
+
logInit();
number_of_cards = 1;
diff --git a/openair1/SIMULATION/LTE_PHY/pdcchsim.c b/openair1/SIMULATION/LTE_PHY/pdcchsim.c
index 1ba79bdb0a4182ff10a2c5ae3609025310704381..4c50aaa5d540ca3c18a7718ff6f904db7844c26d 100644
--- a/openair1/SIMULATION/LTE_PHY/pdcchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pdcchsim.c
@@ -50,6 +50,7 @@ PHY_VARS_UE *UE;
#define CCCH_RB_ALLOC computeRIV(eNB->frame_parms.N_RB_UL,0,2)
#define DLSCH_RB_ALLOC ((uint16_t)0x1fbf) // igore DC component,RB13
+double cpuf;
DCI_PDU DCI_pdu;
@@ -457,6 +458,8 @@ int main(int argc, char **argv)
number_of_cards = 1;
+ cpuf = get_cpu_freq_GHz();
+
logInit();
@@ -1085,12 +1088,10 @@ int main(int argc, char **argv)
// write_output("H00.m","h00",&(UE->common_vars.dl_ch_estimates[0][0][0]),((frame_parms->Ncp==0)?7:6)*(eNB->frame_parms.ofdm_symbol_size),1,1);
// do PDCCH procedures here
- UE->pdcch_vars[0]->crnti = n_rnti;
+ UE->pdcch_vars[0][0]->crnti = n_rnti;
// printf("Doing RX : num_pdcch_symbols at TX %d\n",num_pdcch_symbols);
- rx_pdcch(&UE->common_vars,
- UE->pdcch_vars,
- &UE->frame_parms,
+ rx_pdcch(UE,
trial,
subframe,
0,
@@ -1118,7 +1119,7 @@ int main(int argc, char **argv)
dl_rx=0;
if (n_frames==1) {
- numCCE = get_nCCE(UE->pdcch_vars[0]->num_pdcch_symbols, &UE->frame_parms, get_mi(&UE->frame_parms,subframe));
+ numCCE = get_nCCE(UE->pdcch_vars[0][0]->num_pdcch_symbols, &UE->frame_parms, get_mi(&UE->frame_parms,subframe));
for (i = 0; i < dci_cnt; i++)
printf("dci %d: rnti 0x%x, format %d, L %d, nCCE %d/%d dci_length %d\n",i, dci_alloc_rx[i].rnti, dci_alloc_rx[i].format,
@@ -1167,7 +1168,7 @@ int main(int argc, char **argv)
// exit(-1);
}
- if (UE->pdcch_vars[0]->num_pdcch_symbols != num_pdcch_symbols)
+ if (UE->pdcch_vars[0][0]->num_pdcch_symbols != num_pdcch_symbols)
n_errors_cfi++;
/*
@@ -1224,9 +1225,9 @@ int main(int argc, char **argv)
if (n_tx==2)
write_output("H10.m","h10",&(UE->common_vars.common_vars_rx_data_per_thread[subframe&0x1].dl_ch_estimates[0][2][0]),((frame_parms->Ncp==0)?7:6)*(eNB->frame_parms.ofdm_symbol_size),1,1);
- write_output("pdcch_rxF_ext0.m","pdcch_rxF_ext0",UE->pdcch_vars[eNb_id]->rxdataF_ext[0],3*12*UE->frame_parms.N_RB_DL,1,1);
- write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",UE->pdcch_vars[eNb_id]->rxdataF_comp[0],4*12*UE->frame_parms.N_RB_DL,1,1);
- write_output("pdcch_rxF_llr.m","pdcch_llr",UE->pdcch_vars[eNb_id]->llr,2400,1,4);
+ write_output("pdcch_rxF_ext0.m","pdcch_rxF_ext0",UE->pdcch_vars[0][eNb_id]->rxdataF_ext[0],3*12*UE->frame_parms.N_RB_DL,1,1);
+ write_output("pdcch_rxF_comp0.m","pdcch0_rxF_comp0",UE->pdcch_vars[0][eNb_id]->rxdataF_comp[0],4*12*UE->frame_parms.N_RB_DL,1,1);
+ write_output("pdcch_rxF_llr.m","pdcch_llr",UE->pdcch_vars[0][eNb_id]->llr,2400,1,4);
}
lte_sync_time_free();
diff --git a/openair1/SIMULATION/LTE_PHY/prachsim.c b/openair1/SIMULATION/LTE_PHY/prachsim.c
index 7acc07528c4763cc3e23fb4d34bece13be8c7473..52339cdc5d585c1a20f6276bc680283d6bb46afa 100644
--- a/openair1/SIMULATION/LTE_PHY/prachsim.c
+++ b/openair1/SIMULATION/LTE_PHY/prachsim.c
@@ -45,7 +45,7 @@ PHY_VARS_UE *UE;
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
-
+double cpuf;
extern uint16_t prach_root_sequence_map0_3[838];
@@ -99,6 +99,8 @@ int main(int argc, char **argv)
int NCS_config = 1,rootSequenceIndex=0;
int threequarter_fs = 0;
+ cpuf = get_cpu_freq_GHz();
+
logInit();
number_of_cards = 1;
diff --git a/openair1/SIMULATION/LTE_PHY/pucchsim.c b/openair1/SIMULATION/LTE_PHY/pucchsim.c
index 77bfcb18cf68682f2d80f87cd371c92c5e45d25d..d1db3c29e13067486b16e628d5820c58b270f3cc 100644
--- a/openair1/SIMULATION/LTE_PHY/pucchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pucchsim.c
@@ -47,7 +47,7 @@ PHY_VARS_UE *UE;
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
-
+double cpuf;
int main(int argc, char **argv)
{
@@ -101,6 +101,8 @@ int main(int argc, char **argv)
number_of_cards = 1;
+ cpuf = get_cpu_freq_GHz();
+
while ((c = getopt (argc, argv, "har:pf:g:n:s:S:x:y:z:N:F:T:R:")) != -1) {
switch (c) {
case 'a':
diff --git a/openair1/SIMULATION/LTE_PHY/syncsim.c b/openair1/SIMULATION/LTE_PHY/syncsim.c
index 6e74f7bc01f2181a09c44dbddf5c522b43a0c710..97a94a1a4323f3bda14401c39425b1c761b6db3b 100644
--- a/openair1/SIMULATION/LTE_PHY/syncsim.c
+++ b/openair1/SIMULATION/LTE_PHY/syncsim.c
@@ -406,7 +406,7 @@ int main(int argc, char **argv)
DCI_ALLOC_t dci_alloc[8],dci_alloc_rx[8];
uint16_t n_rnti=1234,dci_cnt;
- uint16_t coded_bits_per_codeword;
+ unsigned int coded_bits_per_codeword;
double tmp_re,tmp_im,foff,deltaF=0.0,cs,sn;
uint32_t carrier_freq[4]= {1907600000,1907600000,1907600000,1907600000};
uint32_t rf_mode[4] = {55759,55759,55759,55759};
@@ -1739,7 +1739,7 @@ int main(int argc, char **argv)
PHY_vars_UE[0]->lte_ue_pdcch_vars[0]->num_pdcch_symbols,
0);
- dump_dlsch2(PHY_vars_UE[0],0,0,coded_bits_per_codeword);
+ dump_dlsch2(PHY_vars_UE[0],0,0,&coded_bits_per_codeword);
}
} else {
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index 470cfc3f87b56a44762142df700825badae8e8d5..3564f597ef1594806809bed481b2576c9e57b0ef 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -50,6 +50,7 @@
PHY_VARS_eNB *eNB;
PHY_VARS_UE *UE;
+double cpuf;
@@ -280,6 +281,7 @@ int main(int argc, char **argv)
opp_enabled=1; // to enable the time meas
cpu_freq_GHz = (double)get_cpu_freq_GHz();
+ cpuf = cpu_freq_GHz;
printf("Detected cpu_freq %f GHz\n",cpu_freq_GHz);
@@ -630,7 +632,7 @@ int main(int argc, char **argv)
fl_show_form (form_enb->lte_phy_scope_enb, FL_PLACE_HOTSPOT, FL_FULLBORDER, title);
}
- UE->pdcch_vars[0]->crnti = 14;
+ UE->pdcch_vars[0][0]->crnti = 14;
UE->frame_parms.soundingrs_ul_config_common.srs_BandwidthConfig = 2;
UE->frame_parms.soundingrs_ul_config_common.srs_SubframeConfig = 7;
diff --git a/openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_device.c b/openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_device.c
index 7a8bd0f86788e94e7dccc31c20098806fa9c8710..77b3c28165f879f182c6204398cd3e0685fe1ca7 100644
--- a/openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_device.c
+++ b/openair2/NAS/DRIVER/CELLULAR/NASMT/nasmt_device.c
@@ -233,9 +233,12 @@ int nasmt_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
// End debug information
-
netif_stop_queue(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev);
+#else
dev->trans_start = jiffies;
+#endif
#ifdef NAS_DEBUG_SEND_DETAIL
printk("nasmt_hard_start_xmit: step 1\n");
#endif
@@ -307,7 +310,11 @@ void nasmt_tx_timeout(struct net_device *dev)
printk("nasmt_tx_timeout: begin\n");
//((struct nas_priv *)(dev->priv))->stats.tx_errors++;
(gpriv->stats).tx_errors++;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev);
+#else
dev->trans_start = jiffies;
+#endif
netif_wake_queue(dev);
printk("nasmt_tx_timeout: transmit timed out %s\n",dev->name);
}
diff --git a/openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_device.c b/openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_device.c
index aaaa95754dcabe873ad8aea0e2a4fcbf18d52b77..970600de214357157b9546eec561d02a846de770 100644
--- a/openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_device.c
+++ b/openair2/NAS/DRIVER/CELLULAR/NASRG/nasrg_device.c
@@ -226,7 +226,11 @@ int nasrg_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
// End debug information
netif_stop_queue(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev);
+#else
dev->trans_start = jiffies;
+#endif
#ifdef NAS_DEBUG_SEND_DETAIL
printk("nasrg_hard_start_xmit: step 1\n");
#endif
@@ -296,7 +300,11 @@ void nasrg_tx_timeout(struct net_device *dev)
printk("nasrg_tx_timeout: begin\n");
// ((struct nas_priv *)(dev->priv))->stats.tx_errors++;
(gpriv->stats).tx_errors++;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev);
+#else
dev->trans_start = jiffies;
+#endif
netif_wake_queue(dev);
printk("nasrg_tx_timeout: transmit timed out %s\n",dev->name);
}
diff --git a/openair2/NETWORK_DRIVER/LITE/device.c b/openair2/NETWORK_DRIVER/LITE/device.c
index 9579ebf249cecd5665a10c8493b4a96c45c4ab6a..616af5e14550c47e52f38c91b292ff64806bcab8 100644
--- a/openair2/NETWORK_DRIVER/LITE/device.c
+++ b/openair2/NETWORK_DRIVER/LITE/device.c
@@ -255,7 +255,11 @@ int oai_nw_drv_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
// End debug information
netif_stop_queue(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev);
+#else
dev->trans_start = jiffies;
+#endif
#ifdef OAI_DRV_DEBUG_DEVICE
printk("[OAI_IP_DRV][%s] step 1\n", __FUNCTION__);
#endif
@@ -328,7 +332,11 @@ void oai_nw_drv_tx_timeout(struct net_device *dev)
printk("[OAI_IP_DRV][%s] begin\n", __FUNCTION__);
// (struct oai_nw_drv_priv *)(dev->priv)->stats.tx_errors++;
(priv->stats).tx_errors++;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev);
+#else
dev->trans_start = jiffies;
+#endif
netif_wake_queue(dev);
printk("[OAI_IP_DRV][%s] transmit timed out %s\n", __FUNCTION__,dev->name);
}
diff --git a/openair2/NETWORK_DRIVER/MESH/classifier.c b/openair2/NETWORK_DRIVER/MESH/classifier.c
index a982faac46b04266fd3cd94ed1b32b7e104b76ce..d477ba3ea907bd67ac9366e20c875871aa5b7058 100644
--- a/openair2/NETWORK_DRIVER/MESH/classifier.c
+++ b/openair2/NETWORK_DRIVER/MESH/classifier.c
@@ -790,7 +790,7 @@ void nas_CLASS_send(struct sk_buff *skb,int inst)
dscp, sprotocol, sp->classref, sfct, sp->rab_id);
#endif
- sp->fct(skb, cx, sp,inst);
+ sp->fct(skb, cx, sp,inst, NULL);
} // if classifier entry match found
@@ -808,7 +808,7 @@ void nas_CLASS_send(struct sk_buff *skb,int inst)
if (no_connection == 1)
printk("NAS_CLASS_SEND: no corresponding connection, so the message is dropped\n");
-#endif NAS_DEBUG_CLASS
+#endif /* NAS_DEBUG_CLASS */
// } // while loop over connections
diff --git a/openair2/NETWORK_DRIVER/MESH/common.c b/openair2/NETWORK_DRIVER/MESH/common.c
index 0a4e3ddfed975167f8ca74180707c8e8b3e61de6..6d10abd3801f64f5b55297f9942a9835c224d80e 100644
--- a/openair2/NETWORK_DRIVER/MESH/common.c
+++ b/openair2/NETWORK_DRIVER/MESH/common.c
@@ -321,10 +321,9 @@ void nas_COMMON_receive(uint16_t dlen,
//---------------------------------------------------------------------------
// Delete the data
-void nas_COMMON_del_send(struct sk_buff *skb, struct cx_entity *cx, struct classifier_entity *sp,int inst)
+void nas_COMMON_del_send(struct sk_buff *skb, struct cx_entity *cx, struct classifier_entity *sp,int inst,struct nas_priv *gpriv)
{
struct nas_priv *priv=netdev_priv(nasdev[inst]);
-
//---------------------------------------------------------------------------
++priv->stats.tx_dropped;
}
@@ -332,7 +331,7 @@ void nas_COMMON_del_send(struct sk_buff *skb, struct cx_entity *cx, struct class
//---------------------------------------------------------------------------
// Request the transfer of data (QoS SAP)
-void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct classifier_entity *gc,int inst)
+void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct classifier_entity *gc,int inst, struct nas_priv *gpriv)
{
//---------------------------------------------------------------------------
struct pdcp_data_req_header_s pdcph;
diff --git a/openair2/NETWORK_DRIVER/MESH/device.c b/openair2/NETWORK_DRIVER/MESH/device.c
index f28b41fc6889ef0e531c9eed210e51261c55a7fe..393fe9f9e01fe3ffd4fe863a7b693ab5d309e4f8 100644
--- a/openair2/NETWORK_DRIVER/MESH/device.c
+++ b/openair2/NETWORK_DRIVER/MESH/device.c
@@ -124,11 +124,8 @@ void *nas_interrupt(void)
int nas_open(struct net_device *dev)
{
//---------------------------------------------------------------------------
- struct nas_priv *priv=netdev_priv(dev);
-
printk("OPEN: begin\n");
// MOD_INC_USE_COUNT;
-
// Address has already been set at init
#ifndef PDCP_USE_NETLINK
@@ -250,7 +247,11 @@ int nas_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
// End debug information
netif_stop_queue(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev);
+#else
dev->trans_start = jiffies;
+#endif
#ifdef DEBUG_DEVICE
printk("HARD_START_XMIT: step 1\n");
#endif
@@ -311,7 +312,11 @@ void nas_tx_timeout(struct net_device *dev)
printk("TX_TIMEOUT: begin\n");
// (struct nas_priv *)(dev->priv)->stats.tx_errors++;
(priv->stats).tx_errors++;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev);
+#else
dev->trans_start = jiffies;
+#endif
netif_wake_queue(dev);
printk("TX_TIMEOUT: transmit timed out %s\n",dev->name);
}
@@ -406,8 +411,8 @@ void nas_init(struct net_device *dev)
nas_TOOL_imei2iid(IMEI, dev->dev_addr);// IMEI to device address (for stateless autoconfiguration address)
nas_TOOL_imei2iid(IMEI, (uint8_t *)priv->cx[0].iid6);
#else
- nas_TOOL_imei2iid(nas_IMEI, dev->dev_addr);// IMEI to device address (for stateless autoconfiguration address)
- nas_TOOL_imei2iid(nas_IMEI, (uint8_t *)priv->cx[0].iid6);
+ nas_TOOL_imei2iid((uint8_t *)nas_IMEI, dev->dev_addr); // IMEI to device address (for stateless autoconfiguration address)
+ nas_TOOL_imei2iid((uint8_t *)nas_IMEI, (uint8_t *)priv->cx[0].iid6);
#endif
// this is more appropriate for user space soft realtime emulation
#else
@@ -478,8 +483,8 @@ int init_module (void)
if (nasdev[inst]) {
nas_mesh_init(inst);
//memcpy(nasdev[inst]->dev_addr,&nas_IMEI[0],8);
- nas_TOOL_imei2iid(nas_IMEI, nasdev[inst]->dev_addr);// IMEI to device address (for stateless autoconfiguration address)
- nas_TOOL_imei2iid(nas_IMEI, (uint8_t *)priv->cx[0].iid6);
+ nas_TOOL_imei2iid((uint8_t *)nas_IMEI, nasdev[inst]->dev_addr);// IMEI to device address (for stateless autoconfiguration address)
+ nas_TOOL_imei2iid((uint8_t *)nas_IMEI, (uint8_t *)priv->cx[0].iid6);
// TO HAVE DIFFERENT HW @
((unsigned char*)nasdev[inst]->dev_addr)[7] = ((unsigned char*)nasdev[inst]->dev_addr)[7] + (unsigned char)inst + 1;
printk("Setting HW addr for INST %d to : %X%X\n",inst,*((unsigned int *)&nasdev[inst]->dev_addr[0]),*((unsigned int *)&nasdev[inst]->dev_addr[4]));
diff --git a/openair2/NETWORK_DRIVER/MESH/ioctl.c b/openair2/NETWORK_DRIVER/MESH/ioctl.c
index 7d4bb10b1f841dc50c2be8d2bf065760d66a3cf7..4045908d93c372fc60bc7bb214eb0f40c6ea5d7e 100644
--- a/openair2/NETWORK_DRIVER/MESH/ioctl.c
+++ b/openair2/NETWORK_DRIVER/MESH/ioctl.c
@@ -853,7 +853,7 @@ int nas_CTL_ioctl(struct net_device *dev,
//---------------------------------------------------------------------------
void nas_CTL_send(struct sk_buff *skb,
struct cx_entity *cx,
- struct classifier_entity *gc)
+ struct classifier_entity *gc, int inst, struct nas_priv *gpriv)
{
//---------------------------------------------------------------------------
printk("NAS_CTL_SEND - void \n");
diff --git a/openair2/NETWORK_DRIVER/MESH/local.h b/openair2/NETWORK_DRIVER/MESH/local.h
index 8db2b550b0defecb5d42fb671f94818174f102b1..0e0a581cbc9590a0cda18fe29caba28a9e91e5b5 100644
--- a/openair2/NETWORK_DRIVER/MESH/local.h
+++ b/openair2/NETWORK_DRIVER/MESH/local.h
@@ -98,6 +98,26 @@ struct cx_entity {
int provider_id[MAX_MEASURE_NB];
};
+//#define NAS_RETRY_LIMIT_DEFAULT 5
+
+struct nas_priv {
+ int irq;
+ struct timer_list timer;
+ spinlock_t lock;
+ struct net_device_stats stats;
+ uint8_t retry_limit;
+ uint32_t timer_establishment;
+ uint32_t timer_release;
+ struct cx_entity cx[NAS_CX_MAX];
+ struct classifier_entity *rclassifier[NAS_DSCP_MAX]; // receive classifier
+ uint16_t nrclassifier;
+ int sap[NAS_SAPI_MAX];
+ struct sock *nl_sk;
+ uint8_t nlmsg[NAS_MAX_LENGTH+sizeof(struct nlmsghdr)];
+ uint8_t xbuffer[NAS_MAX_LENGTH]; // transmition buffer
+ uint8_t rbuffer[NAS_MAX_LENGTH]; // reception buffer
+};
+
struct classifier_entity {
uint32_t classref;
@@ -122,29 +142,7 @@ struct classifier_entity {
struct rb_entity *rb_rx; //pointer to rb_entity for receiving (in case of forwarding rule)
nasRadioBearerId_t rab_id; // RAB identification for sending
nasRadioBearerId_t rab_id_rx; // RAB identification for receiving (in case of forwarding rule)
- void (*fct)(struct sk_buff *skb, struct cx_entity *cx, struct classifier_entity *gc,int inst);
-};
-
-
-
-//#define NAS_RETRY_LIMIT_DEFAULT 5
-
-struct nas_priv {
- int irq;
- struct timer_list timer;
- spinlock_t lock;
- struct net_device_stats stats;
- uint8_t retry_limit;
- uint32_t timer_establishment;
- uint32_t timer_release;
- struct cx_entity cx[NAS_CX_MAX];
- struct classifier_entity *rclassifier[NAS_DSCP_MAX]; // receive classifier
- uint16_t nrclassifier;
- int sap[NAS_SAPI_MAX];
- struct sock *nl_sk;
- uint8_t nlmsg[NAS_MAX_LENGTH+sizeof(struct nlmsghdr)];
- uint8_t xbuffer[NAS_MAX_LENGTH]; // transmition buffer
- uint8_t rbuffer[NAS_MAX_LENGTH]; // reception buffer
+ void (*fct)(struct sk_buff *skb, struct cx_entity *cx, struct classifier_entity *gc,int inst, struct nas_priv *gpriv);
};
struct ipversion {
diff --git a/openair2/NETWORK_DRIVER/MESH/mesh.c b/openair2/NETWORK_DRIVER/MESH/mesh.c
index e934a6eb9501e60114d7d4112faf9c795d7d32ed..9817428c5e98d922d3618f46947239a15d60a858 100644
--- a/openair2/NETWORK_DRIVER/MESH/mesh.c
+++ b/openair2/NETWORK_DRIVER/MESH/mesh.c
@@ -155,9 +155,10 @@ void nas_mesh_start_default_sclassifier(struct cx_entity *cx,struct rb_entity *r
}
//---------------------------------------------------------------------------
-void nas_mesh_timer(unsigned long data,struct nas_priv *gpriv)
+void nas_mesh_timer(unsigned long data)
{
//---------------------------------------------------------------------------
+ struct nas_priv *gpriv=(struct nas_priv *) data;
uint8_t cxi;
struct cx_entity *cx;
struct rb_entity *rb;
@@ -168,7 +169,7 @@ void nas_mesh_timer(unsigned long data,struct nas_priv *gpriv)
(gpriv->timer).function=nas_mesh_timer;
(gpriv->timer).expires=jiffies+NAS_TIMER_TICK;
- (gpriv->timer).data=0L;
+ (gpriv->timer).data=data;
return;
@@ -381,6 +382,7 @@ int nas_mesh_DC_send_cx_release_request(struct cx_entity *cx,
void nas_mesh_DC_send_sig_data_request(struct sk_buff *skb,
struct cx_entity *cx,
struct classifier_entity *gc,
+ int inst,
struct nas_priv *gpriv)
{
//---------------------------------------------------------------------------
diff --git a/openair2/NETWORK_DRIVER/MESH/proto_extern.h b/openair2/NETWORK_DRIVER/MESH/proto_extern.h
index 4c0b89f60fdec3c67ea3b3e97a4af6c8e73273ea..a362876f834fa8227619063bb0f54c0d93e004f9 100644
--- a/openair2/NETWORK_DRIVER/MESH/proto_extern.h
+++ b/openair2/NETWORK_DRIVER/MESH/proto_extern.h
@@ -96,7 +96,7 @@ void nas_COMMON_receive(unsigned short dlen,
*/
void nas_COMMON_QOS_send(struct sk_buff *skb,
struct cx_entity *cx,
- struct classifier_entity *gc,int inst);
+ struct classifier_entity *gc,int inst, struct nas_priv *gpriv);
/**
\fn void nas_COMMON_del_send(struct sk_buff *skb, struct cx_entity *cx, struct classifier_entity *gc,int inst)
@@ -108,7 +108,7 @@ void nas_COMMON_QOS_send(struct sk_buff *skb,
*/
void nas_COMMON_del_send(struct sk_buff *skb,
struct cx_entity *cx,
- struct classifier_entity *gc,int inst);
+ struct classifier_entity *gc,int inst, struct nas_priv *gpriv);
#ifndef PDCP_USE_NETLINK
/**
@@ -195,19 +195,18 @@ void nas_mesh_init(int inst //!< Instance ID
);
-void nas_mesh_timer(unsigned long data,
- struct nas_priv *gpriv);
+void nas_mesh_timer(unsigned long data);
int nas_mesh_DC_receive(struct cx_entity *cx,struct nas_priv *gpriv);
int nas_mesh_GC_receive(struct nas_priv *gpriv);
int nas_mesh_DC_send_cx_establish_request(struct cx_entity *cx,struct nas_priv *gpriv);
int nas_mesh_DC_send_cx_release_request(struct cx_entity *cx,struct nas_priv *gpriv);
-void nas_mesh_DC_send_sig_data_request(struct sk_buff *skb, struct cx_entity *cx, struct classifier_entity *gc,struct nas_priv *gpriv);
+void nas_mesh_DC_send_sig_data_request(struct sk_buff *skb, struct cx_entity *cx, struct classifier_entity *gc,int inst, struct nas_priv *gpriv);
// iocontrol.c
void nas_CTL_send(struct sk_buff *skb,
struct cx_entity *cx,
- struct classifier_entity *gc);
+ struct classifier_entity *gc,int inst, struct nas_priv *gpriv);
//int nas_CTL_receive_authentication(struct ipv6hdr *iph, struct cx-entity *cx, unsigned char sapi);
int nas_CTL_ioctl(struct net_device *dev,
struct ifreq *ifr, int cmd);
diff --git a/openair2/NETWORK_DRIVER/UE_IP/common.c b/openair2/NETWORK_DRIVER/UE_IP/common.c
index 1ea5df0d30c9600b0b3e9009639096350fe6d61c..8c3e4557d36d109efcf7198a41a033a906897108 100644
--- a/openair2/NETWORK_DRIVER/UE_IP/common.c
+++ b/openair2/NETWORK_DRIVER/UE_IP/common.c
@@ -123,9 +123,7 @@ skb_p->mark = rb_idP;
// LG TEST skb_p->ip_summed = CHECKSUM_NONE;
skb_p->ip_summed = CHECKSUM_UNNECESSARY;
-
-
- ipv_p = (struct ipversion*)((void*)&(skb_p->data[hard_header_len]));
+ ipv_p = (ipversion_t *)((void *)&(skb_p->data[hard_header_len]));
switch (ipv_p->version) {
diff --git a/openair2/NETWORK_DRIVER/UE_IP/device.c b/openair2/NETWORK_DRIVER/UE_IP/device.c
index cfd734286222ceeade640147df282ac8a8c32ab5..a4f714d4c5537218896398f5fd6d92dbee44a12e 100644
--- a/openair2/NETWORK_DRIVER/UE_IP/device.c
+++ b/openair2/NETWORK_DRIVER/UE_IP/device.c
@@ -243,7 +243,11 @@ int ue_ip_hard_start_xmit(struct sk_buff *skb_pP, struct net_device *dev_pP)
// End debug information
netif_stop_queue(dev_pP);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev_pP);
+#else
dev_pP->trans_start = jiffies;
+#endif
#ifdef OAI_DRV_DEBUG_DEVICE
printk("[UE_IP_DRV][%s] step 1\n", __FUNCTION__);
#endif
@@ -315,7 +319,11 @@ void ue_ip_tx_timeout(struct net_device *dev_pP)
printk("[UE_IP_DRV][%s] begin\n", __FUNCTION__);
// (ue_ip_priv_t *)(dev_pP->priv_p)->stats.tx_errors++;
(priv_p->stats).tx_errors++;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+ netif_trans_update(dev_pP);
+#else
dev_pP->trans_start = jiffies;
+#endif
netif_wake_queue(dev_pP);
printk("[UE_IP_DRV][%s] transmit timed out %s\n", __FUNCTION__,dev_pP->name);
}
diff --git a/openair3/NAS/TOOLS/network.h b/openair3/NAS/TOOLS/network.h
index 0d60359c57b7d4093e2006e13c5c1f8a57e45619..d7044c8e51436792605078a8d79d04154e921107 100644
--- a/openair3/NAS/TOOLS/network.h
+++ b/openair3/NAS/TOOLS/network.h
@@ -61,7 +61,7 @@ Description Defines a list of PLMN network operators
#define VDF5 11
-#define SELECTED_PLMN OAI_LTEBOX //SFR1
+#define SELECTED_PLMN TEST1 //SFR1
#define TEST_PLMN {0,0,0x0f,1,1,0} // 00101
#define SFR_PLMN_1 {0,2,0x0f,8,0,1} // 20810
diff --git a/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf b/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
index 84ec59a36bcb9906c8f9010a7dabfbfb2e62412e..05db6be4d12130603fec8d272bf102158d8f23a4 100644
--- a/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
+++ b/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
@@ -86,14 +86,14 @@ UE0:
};
SIM: {
- MSIN="0100001111";
- USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f";
+ MSIN="000001234";
+ USIM_API_K="000102030405060708090A0B0C0D0E0F";
OPC="C42449363BBAD02B66D16BC975D77CC1";
- MSISDN="33611123456";
+ MSISDN="000000000000";//"33611123456";
};
# Home PLMN Selector with Access Technology
- HPLMN= "20893";
+ HPLMN= "00101";
# User controlled PLMN Selector with Access Technology
UCPLMN_LIST = ();
diff --git a/targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz.ini b/targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz.ini
new file mode 100755
index 0000000000000000000000000000000000000000..56ff3527373c61963d70b5e0a878b7ef0febeaa4
--- /dev/null
+++ b/targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz.ini
@@ -0,0 +1,1128 @@
+[file_info]
+type=lms7002m_minimal_config
+version=1
+[lms7002_registers_a]
+0x0020=0xFFFD
+0x0021=0x0E9F
+0x0022=0x07FF
+0x0023=0x5550
+0x0024=0xB1E4
+0x0025=0x0101
+0x0026=0x0101
+0x0027=0xB1E4
+0x0028=0x0101
+0x0029=0x0101
+0x002A=0x0086
+0x002B=0x0038
+0x002C=0x0000
+0x002D=0x0000
+0x002E=0x0000
+0x002F=0x3840
+0x0081=0x0000
+0x0082=0x8003
+0x0084=0x0400
+0x0085=0x0001
+0x0086=0x4101
+0x0087=0x0000
+0x0088=0x04B0
+0x0089=0x1090
+0x008A=0x0514
+0x008B=0x2102
+0x008C=0x267B
+0x0092=0x0001
+0x0093=0x0000
+0x0094=0x0000
+0x0095=0x0000
+0x0096=0x0000
+0x0097=0x0000
+0x0098=0x0000
+0x0099=0x6565
+0x009A=0x658C
+0x009B=0x6565
+0x009C=0x658C
+0x009D=0x6565
+0x009E=0x658C
+0x009F=0x658C
+0x00A0=0x6565
+0x00A1=0x6565
+0x00A2=0x6565
+0x00A3=0x6565
+0x00A4=0x6565
+0x00A5=0x6565
+0x00A6=0x000F
+0x00A7=0x6565
+0x00A8=0x0000
+0x00A9=0x0000
+0x00AA=0x0000
+0x00AB=0x0040
+0x00AC=0x0000
+0x00AD=0x03FF
+0x00AE=0x0000
+0x0100=0x3409
+0x0101=0x7800
+0x0102=0x3180
+0x0103=0x0612
+0x0104=0x0088
+0x0105=0x0011
+0x0106=0x318C
+0x0107=0x318C
+0x0108=0x2826
+0x0109=0x6104
+0x010A=0x17BD
+0x010C=0x8865
+0x010D=0x015A
+0x010E=0x0000
+0x010F=0x3042
+0x0110=0x0BFF
+0x0111=0x0083
+0x0112=0x9407
+0x0113=0x0303
+0x0114=0x00D0
+0x0115=0x0009
+0x0116=0x8180
+0x0117=0x1217
+0x0118=0x018C
+0x0119=0x528C
+0x011A=0x3E03
+0x011C=0xAD41
+0x011D=0x2000
+0x011E=0x06E4
+0x011F=0x3640
+0x0120=0xB9FF
+0x0121=0x341C
+0x0122=0x033F
+0x0123=0x267B
+0x0124=0x0000
+0x0200=0x0081
+0x0201=0x07FF
+0x0202=0x07FF
+0x0203=0x0000
+0x0204=0x0000
+0x0205=0x0000
+0x0206=0x0000
+0x0207=0x0000
+0x0208=0x0170
+0x0209=0x0000
+0x020A=0x0080
+0x020B=0x0000
+0x020C=0x8000
+0x0240=0x0020
+0x0241=0x0000
+0x0242=0x0000
+0x0243=0x0000
+0x0244=0x0000
+0x0245=0x0000
+0x0246=0x0000
+0x0247=0x0000
+0x0248=0x0000
+0x0249=0x0000
+0x024A=0x0000
+0x024B=0x0000
+0x024C=0x0000
+0x024D=0x0000
+0x024E=0x0000
+0x024F=0x0000
+0x0250=0x0000
+0x0251=0x0000
+0x0252=0x0000
+0x0253=0x0000
+0x0254=0x0000
+0x0255=0x0000
+0x0256=0x0000
+0x0257=0x0000
+0x0258=0x0000
+0x0259=0x0000
+0x025A=0x0000
+0x025B=0x0000
+0x025C=0x0000
+0x025D=0x0000
+0x025E=0x0000
+0x025F=0x0000
+0x0260=0x0000
+0x0261=0x0000
+0x0280=0x0000
+0x0281=0x0000
+0x0282=0x0000
+0x0283=0x0000
+0x0284=0x0000
+0x0285=0x0000
+0x0286=0x0000
+0x0287=0x0000
+0x0288=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x028B=0x0000
+0x028C=0x0000
+0x028D=0x0000
+0x028E=0x0000
+0x028F=0x0000
+0x0290=0x0000
+0x0291=0x0000
+0x0292=0x0000
+0x0293=0x0000
+0x0294=0x0000
+0x0295=0x0000
+0x0296=0x0000
+0x0297=0x0000
+0x0298=0x0000
+0x0299=0x0000
+0x029A=0x0000
+0x029B=0x0000
+0x029C=0x0000
+0x029D=0x0000
+0x029E=0x0000
+0x029F=0x0000
+0x02A0=0x0000
+0x02A1=0x0000
+0x02A2=0x0000
+0x02A3=0x0000
+0x02A4=0x0000
+0x02A5=0x0000
+0x02A6=0x0000
+0x02A7=0x0000
+0x02C0=0x0000
+0x02C1=0x0000
+0x02C2=0x0000
+0x02C3=0x0000
+0x02C4=0x0000
+0x02C5=0x0000
+0x02C6=0x0000
+0x02C7=0x0000
+0x02C8=0x0000
+0x02C9=0x0000
+0x02CA=0x0000
+0x02CB=0x0000
+0x02CC=0x0000
+0x02CD=0x0000
+0x02CE=0x0000
+0x02CF=0x0000
+0x02D0=0x0000
+0x02D1=0x0000
+0x02D2=0x0000
+0x02D3=0x0000
+0x02D4=0x0000
+0x02D5=0x0000
+0x02D6=0x0000
+0x02D7=0x0000
+0x02D8=0x0000
+0x02D9=0x0000
+0x02DA=0x0000
+0x02DB=0x0000
+0x02DC=0x0000
+0x02DD=0x0000
+0x02DE=0x0000
+0x02DF=0x0000
+0x02E0=0x0000
+0x02E1=0x0000
+0x02E2=0x0000
+0x02E3=0x0000
+0x02E4=0x0000
+0x02E5=0x0000
+0x02E6=0x0000
+0x02E7=0x0000
+0x0300=0x0000
+0x0301=0x0000
+0x0302=0x0000
+0x0303=0x0000
+0x0304=0x0000
+0x0305=0x0000
+0x0306=0x0000
+0x0307=0x0000
+0x0308=0x0000
+0x0309=0x0000
+0x030A=0x0000
+0x030B=0x0000
+0x030C=0x0000
+0x030D=0x0000
+0x030E=0x0000
+0x030F=0x0000
+0x0310=0x0000
+0x0311=0x0000
+0x0312=0x0000
+0x0313=0x0000
+0x0314=0x0000
+0x0315=0x0000
+0x0316=0x0000
+0x0317=0x0000
+0x0318=0x0000
+0x0319=0x0000
+0x031A=0x0000
+0x031B=0x0000
+0x031C=0x0000
+0x031D=0x0000
+0x031E=0x0000
+0x031F=0x0000
+0x0320=0x0000
+0x0321=0x0000
+0x0322=0x0000
+0x0323=0x0000
+0x0324=0x0000
+0x0325=0x0000
+0x0326=0x0000
+0x0327=0x0000
+0x0340=0x0000
+0x0341=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0345=0x0000
+0x0346=0x0000
+0x0347=0x0000
+0x0348=0x0000
+0x0349=0x0000
+0x034A=0x0000
+0x034B=0x0000
+0x034C=0x0000
+0x034D=0x0000
+0x034E=0x0000
+0x034F=0x0000
+0x0350=0x0000
+0x0351=0x0000
+0x0352=0x0000
+0x0353=0x0000
+0x0354=0x0000
+0x0355=0x0000
+0x0356=0x0000
+0x0357=0x0000
+0x0358=0x0000
+0x0359=0x0000
+0x035A=0x0000
+0x035B=0x0000
+0x035C=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x035F=0x0000
+0x0360=0x0000
+0x0361=0x0000
+0x0362=0x0000
+0x0363=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0367=0x0000
+0x0380=0x0000
+0x0381=0x0000
+0x0382=0x0000
+0x0383=0x0000
+0x0384=0x0000
+0x0385=0x0000
+0x0386=0x0000
+0x0387=0x0000
+0x0388=0x0000
+0x0389=0x0000
+0x038A=0x0000
+0x038B=0x0000
+0x038C=0x0000
+0x038D=0x0000
+0x038E=0x0000
+0x038F=0x0000
+0x0390=0x0000
+0x0391=0x0000
+0x0392=0x0000
+0x0393=0x0000
+0x0394=0x0000
+0x0395=0x0000
+0x0396=0x0000
+0x0397=0x0000
+0x0398=0x0000
+0x0399=0x0000
+0x039A=0x0000
+0x039B=0x0000
+0x039C=0x0000
+0x039D=0x0000
+0x039E=0x0000
+0x039F=0x0000
+0x03A0=0x0000
+0x03A1=0x0000
+0x03A2=0x0000
+0x03A3=0x0000
+0x03A4=0x0000
+0x03A5=0x0000
+0x03A6=0x0000
+0x03A7=0x0000
+0x0400=0x8081
+0x0401=0x07FF
+0x0402=0x07FF
+0x0403=0x0000
+0x0404=0x0000
+0x0405=0x0000
+0x0406=0x0000
+0x0407=0x0000
+0x0408=0x0000
+0x0409=0x0000
+0x040A=0x0003
+0x040B=0x000F
+0x040C=0x00F8
+0x040D=0x0000
+0x040E=0x0000
+0x040F=0x0000
+0x0440=0x0020
+0x0441=0x0000
+0x0442=0x2B55
+0x0443=0x5540
+0x0444=0x0000
+0x0445=0x0000
+0x0446=0x0000
+0x0447=0x0000
+0x0448=0x0000
+0x0449=0x0000
+0x044A=0x0000
+0x044B=0x0000
+0x044C=0x0000
+0x044D=0x0000
+0x044E=0x0000
+0x044F=0x0000
+0x0450=0x0000
+0x0451=0x0000
+0x0452=0x0000
+0x0453=0x0000
+0x0454=0x0000
+0x0455=0x0000
+0x0456=0x0000
+0x0457=0x0000
+0x0458=0x0000
+0x0459=0x0000
+0x045A=0x0000
+0x045B=0x0000
+0x045C=0x0000
+0x045D=0x0000
+0x045E=0x0000
+0x045F=0x0000
+0x0460=0x0000
+0x0461=0x0000
+0x0480=0x0000
+0x0481=0x0000
+0x0482=0x0000
+0x0483=0x0000
+0x0484=0x0000
+0x0485=0x0000
+0x0486=0x0000
+0x0487=0x0000
+0x0488=0x0000
+0x0489=0x0000
+0x048A=0x0000
+0x048B=0x0000
+0x048C=0x0000
+0x048D=0x0000
+0x048E=0x0000
+0x048F=0x0000
+0x0490=0x0000
+0x0491=0x0000
+0x0492=0x0000
+0x0493=0x0000
+0x0494=0x0000
+0x0495=0x0000
+0x0496=0x0000
+0x0497=0x0000
+0x0498=0x0000
+0x0499=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x049C=0x0000
+0x049D=0x0000
+0x049E=0x0000
+0x049F=0x0000
+0x04A0=0x0000
+0x04A1=0x0000
+0x04A2=0x0000
+0x04A3=0x0000
+0x04A4=0x0000
+0x04A5=0x0000
+0x04A6=0x0000
+0x04A7=0x0000
+0x04C0=0x0000
+0x04C1=0x0000
+0x04C2=0x0000
+0x04C3=0x0000
+0x04C4=0x0000
+0x04C5=0x0000
+0x04C6=0x0000
+0x04C7=0x0000
+0x04C8=0x0000
+0x04C9=0x0000
+0x04CA=0x0000
+0x04CB=0x0000
+0x04CC=0x0000
+0x04CD=0x0000
+0x04CE=0x0000
+0x04CF=0x0000
+0x04D0=0x0000
+0x04D1=0x0000
+0x04D2=0x0000
+0x04D3=0x0000
+0x04D4=0x0000
+0x04D5=0x0000
+0x04D6=0x0000
+0x04D7=0x0000
+0x04D8=0x0000
+0x04D9=0x0000
+0x04DA=0x0000
+0x04DB=0x0000
+0x04DC=0x0000
+0x04DD=0x0000
+0x04DE=0x0000
+0x04DF=0x0000
+0x04E0=0x0000
+0x04E1=0x0000
+0x04E2=0x0000
+0x04E3=0x0000
+0x04E4=0x0000
+0x04E5=0x0000
+0x04E6=0x0000
+0x04E7=0x0000
+0x0500=0x0000
+0x0501=0x0000
+0x0502=0x0000
+0x0503=0x0000
+0x0504=0x0000
+0x0505=0x0000
+0x0506=0x0000
+0x0507=0x0000
+0x0508=0x0000
+0x0509=0x0000
+0x050A=0x0000
+0x050B=0x0000
+0x050C=0x0000
+0x050D=0x0000
+0x050E=0x0000
+0x050F=0x0000
+0x0510=0x0000
+0x0511=0x0000
+0x0512=0x0000
+0x0513=0x0000
+0x0514=0x0000
+0x0515=0x0000
+0x0516=0x0000
+0x0517=0x0000
+0x0518=0x0000
+0x0519=0x0000
+0x051A=0x0000
+0x051B=0x0000
+0x051C=0x0000
+0x051D=0x0000
+0x051E=0x0000
+0x051F=0x0000
+0x0520=0x0000
+0x0521=0x0000
+0x0522=0x0000
+0x0523=0x0000
+0x0524=0x0000
+0x0525=0x0000
+0x0526=0x0000
+0x0527=0x0000
+0x0540=0x0000
+0x0541=0x0000
+0x0542=0x0000
+0x0543=0x0000
+0x0544=0x0000
+0x0545=0x0000
+0x0546=0x0000
+0x0547=0x0000
+0x0548=0x0000
+0x0549=0x0000
+0x054A=0x0000
+0x054B=0x0000
+0x054C=0x0000
+0x054D=0x0000
+0x054E=0x0000
+0x054F=0x0000
+0x0550=0x0000
+0x0551=0x0000
+0x0552=0x0000
+0x0553=0x0000
+0x0554=0x0000
+0x0555=0x0000
+0x0556=0x0000
+0x0557=0x0000
+0x0558=0x0000
+0x0559=0x0000
+0x055A=0x0000
+0x055B=0x0000
+0x055C=0x0000
+0x055D=0x0000
+0x055E=0x0000
+0x055F=0x0000
+0x0560=0x0000
+0x0561=0x0000
+0x0562=0x0000
+0x0563=0x0000
+0x0564=0x0000
+0x0565=0x0000
+0x0566=0x0000
+0x0567=0x0000
+0x0580=0x0000
+0x0581=0x0000
+0x0582=0x0000
+0x0583=0x0000
+0x0584=0x0000
+0x0585=0x0000
+0x0586=0x0000
+0x0587=0x0000
+0x0588=0x0000
+0x0589=0x0000
+0x058A=0x0000
+0x058B=0x0000
+0x058C=0x0000
+0x058D=0x0000
+0x058E=0x0000
+0x058F=0x0000
+0x0590=0x0000
+0x0591=0x0000
+0x0592=0x0000
+0x0593=0x0000
+0x0594=0x0000
+0x0595=0x0000
+0x0596=0x0000
+0x0597=0x0000
+0x0598=0x0000
+0x0599=0x0000
+0x059A=0x0000
+0x059B=0x0000
+0x059C=0x0000
+0x059D=0x0000
+0x059E=0x0000
+0x059F=0x0000
+0x05A0=0x0000
+0x05A1=0x0000
+0x05A2=0x0000
+0x05A3=0x0000
+0x05A4=0x0000
+0x05A5=0x0000
+0x05A6=0x0000
+0x05A7=0x0000
+[lms7002_registers_b]
+0x0100=0x340F
+0x0101=0x7800
+0x0102=0x3180
+0x0103=0x0612
+0x0104=0x0088
+0x0105=0x001F
+0x0106=0x3182
+0x0107=0x318C
+0x0108=0x9442
+0x0109=0x61C1
+0x010A=0x104C
+0x010C=0x88FF
+0x010D=0x001E
+0x010E=0x2040
+0x010F=0x3042
+0x0110=0x0BF4
+0x0111=0x0083
+0x0112=0x9407
+0x0113=0x03C3
+0x0114=0x00D0
+0x0115=0x000F
+0x0116=0x8180
+0x0117=0x1217
+0x0118=0x018C
+0x0119=0x5280
+0x011A=0x3E03
+0x011C=0xAD41
+0x011D=0x1555
+0x011E=0x0747
+0x011F=0x3640
+0x0120=0xB9FF
+0x0121=0x360C
+0x0122=0x033F
+0x0123=0x267B
+0x0124=0x0000
+0x0200=0x0101
+0x0201=0x07FF
+0x0202=0x07FF
+0x0203=0x0000
+0x0204=0x0000
+0x0205=0x0000
+0x0206=0x0000
+0x0207=0x0000
+0x0208=0x01F0
+0x0209=0x0000
+0x020A=0x0080
+0x020B=0x0000
+0x020C=0x7FFF
+0x0240=0x0020
+0x0241=0x0000
+0x0242=0x0000
+0x0243=0x0000
+0x0244=0x0000
+0x0245=0x0000
+0x0246=0x0000
+0x0247=0x0000
+0x0248=0x0000
+0x0249=0x0000
+0x024A=0x0000
+0x024B=0x0000
+0x024C=0x0000
+0x024D=0x0000
+0x024E=0x0000
+0x024F=0x0000
+0x0250=0x0000
+0x0251=0x0000
+0x0252=0x0000
+0x0253=0x0000
+0x0254=0x0000
+0x0255=0x0000
+0x0256=0x0000
+0x0257=0x0000
+0x0258=0x0000
+0x0259=0x0000
+0x025A=0x0000
+0x025B=0x0000
+0x025C=0x0000
+0x025D=0x0000
+0x025E=0x0000
+0x025F=0x0000
+0x0260=0x0000
+0x0261=0x0000
+0x0280=0x0000
+0x0281=0x0000
+0x0282=0x0000
+0x0283=0x0000
+0x0284=0x0000
+0x0285=0x0000
+0x0286=0x0000
+0x0287=0x0000
+0x0288=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x028B=0x0000
+0x028C=0x0000
+0x028D=0x0000
+0x028E=0x0000
+0x028F=0x0000
+0x0290=0x0000
+0x0291=0x0000
+0x0292=0x0000
+0x0293=0x0000
+0x0294=0x0000
+0x0295=0x0000
+0x0296=0x0000
+0x0297=0x0000
+0x0298=0x0000
+0x0299=0x0000
+0x029A=0x0000
+0x029B=0x0000
+0x029C=0x0000
+0x029D=0x0000
+0x029E=0x0000
+0x029F=0x0000
+0x02A0=0x0000
+0x02A1=0x0000
+0x02A2=0x0000
+0x02A3=0x0000
+0x02A4=0x0000
+0x02A5=0x0000
+0x02A6=0x0000
+0x02A7=0x0000
+0x02C0=0x0000
+0x02C1=0x0000
+0x02C2=0x0000
+0x02C3=0x0000
+0x02C4=0x0000
+0x02C5=0x0000
+0x02C6=0x0000
+0x02C7=0x0000
+0x02C8=0x0000
+0x02C9=0x0000
+0x02CA=0x0000
+0x02CB=0x0000
+0x02CC=0x0000
+0x02CD=0x0000
+0x02CE=0x0000
+0x02CF=0x0000
+0x02D0=0x0000
+0x02D1=0x0000
+0x02D2=0x0000
+0x02D3=0x0000
+0x02D4=0x0000
+0x02D5=0x0000
+0x02D6=0x0000
+0x02D7=0x0000
+0x02D8=0x0000
+0x02D9=0x0000
+0x02DA=0x0000
+0x02DB=0x0000
+0x02DC=0x0000
+0x02DD=0x0000
+0x02DE=0x0000
+0x02DF=0x0000
+0x02E0=0x0000
+0x02E1=0x0000
+0x02E2=0x0000
+0x02E3=0x0000
+0x02E4=0x0000
+0x02E5=0x0000
+0x02E6=0x0000
+0x02E7=0x0000
+0x0300=0x0000
+0x0301=0x0000
+0x0302=0x0000
+0x0303=0x0000
+0x0304=0x0000
+0x0305=0x0000
+0x0306=0x0000
+0x0307=0x0000
+0x0308=0x0000
+0x0309=0x0000
+0x030A=0x0000
+0x030B=0x0000
+0x030C=0x0000
+0x030D=0x0000
+0x030E=0x0000
+0x030F=0x0000
+0x0310=0x0000
+0x0311=0x0000
+0x0312=0x0000
+0x0313=0x0000
+0x0314=0x0000
+0x0315=0x0000
+0x0316=0x0000
+0x0317=0x0000
+0x0318=0x0000
+0x0319=0x0000
+0x031A=0x0000
+0x031B=0x0000
+0x031C=0x0000
+0x031D=0x0000
+0x031E=0x0000
+0x031F=0x0000
+0x0320=0x0000
+0x0321=0x0000
+0x0322=0x0000
+0x0323=0x0000
+0x0324=0x0000
+0x0325=0x0000
+0x0326=0x0000
+0x0327=0x0000
+0x0340=0x0000
+0x0341=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0345=0x0000
+0x0346=0x0000
+0x0347=0x0000
+0x0348=0x0000
+0x0349=0x0000
+0x034A=0x0000
+0x034B=0x0000
+0x034C=0x0000
+0x034D=0x0000
+0x034E=0x0000
+0x034F=0x0000
+0x0350=0x0000
+0x0351=0x0000
+0x0352=0x0000
+0x0353=0x0000
+0x0354=0x0000
+0x0355=0x0000
+0x0356=0x0000
+0x0357=0x0000
+0x0358=0x0000
+0x0359=0x0000
+0x035A=0x0000
+0x035B=0x0000
+0x035C=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x035F=0x0000
+0x0360=0x0000
+0x0361=0x0000
+0x0362=0x0000
+0x0363=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0367=0x0000
+0x0380=0x0000
+0x0381=0x0000
+0x0382=0x0000
+0x0383=0x0000
+0x0384=0x0000
+0x0385=0x0000
+0x0386=0x0000
+0x0387=0x0000
+0x0388=0x0000
+0x0389=0x0000
+0x038A=0x0000
+0x038B=0x0000
+0x038C=0x0000
+0x038D=0x0000
+0x038E=0x0000
+0x038F=0x0000
+0x0390=0x0000
+0x0391=0x0000
+0x0392=0x0000
+0x0393=0x0000
+0x0394=0x0000
+0x0395=0x0000
+0x0396=0x0000
+0x0397=0x0000
+0x0398=0x0000
+0x0399=0x0000
+0x039A=0x0000
+0x039B=0x0000
+0x039C=0x0000
+0x039D=0x0000
+0x039E=0x0000
+0x039F=0x0000
+0x03A0=0x0000
+0x03A1=0x0000
+0x03A2=0x0000
+0x03A3=0x0000
+0x03A4=0x0000
+0x03A5=0x0000
+0x03A6=0x0000
+0x03A7=0x0000
+0x0400=0x0105
+0x0401=0x07FF
+0x0402=0x07FF
+0x0403=0x0000
+0x0404=0x0000
+0x0405=0x0000
+0x0406=0x0000
+0x0407=0x0000
+0x0408=0x0000
+0x0409=0x0000
+0x040A=0x0000
+0x040B=0x7FFF
+0x040C=0x00FF
+0x040D=0x0000
+0x040E=0x0002
+0x040F=0x0000
+0x0440=0x0020
+0x0441=0x0000
+0x0442=0x0000
+0x0443=0x0000
+0x0444=0x0000
+0x0445=0x0000
+0x0446=0x0000
+0x0447=0x0000
+0x0448=0x0000
+0x0449=0x0000
+0x044A=0x0000
+0x044B=0x0000
+0x044C=0x0000
+0x044D=0x0000
+0x044E=0x0000
+0x044F=0x0000
+0x0450=0x0000
+0x0451=0x0000
+0x0452=0x0000
+0x0453=0x0000
+0x0454=0x0000
+0x0455=0x0000
+0x0456=0x0000
+0x0457=0x0000
+0x0458=0x0000
+0x0459=0x0000
+0x045A=0x0000
+0x045B=0x0000
+0x045C=0x0000
+0x045D=0x0000
+0x045E=0x0000
+0x045F=0x0000
+0x0460=0x0000
+0x0461=0x0000
+0x0480=0x0000
+0x0481=0x0000
+0x0482=0x0000
+0x0483=0x0000
+0x0484=0x0000
+0x0485=0x0000
+0x0486=0x0000
+0x0487=0x0000
+0x0488=0x0000
+0x0489=0x0000
+0x048A=0x0000
+0x048B=0x0000
+0x048C=0x0000
+0x048D=0x0000
+0x048E=0x0000
+0x048F=0x0000
+0x0490=0x0000
+0x0491=0x0000
+0x0492=0x0000
+0x0493=0x0000
+0x0494=0x0000
+0x0495=0x0000
+0x0496=0x0000
+0x0497=0x0000
+0x0498=0x0000
+0x0499=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x049C=0x0000
+0x049D=0x0000
+0x049E=0x0000
+0x049F=0x0000
+0x04A0=0x0000
+0x04A1=0x0000
+0x04A2=0x0000
+0x04A3=0x0000
+0x04A4=0x0000
+0x04A5=0x0000
+0x04A6=0x0000
+0x04A7=0x0000
+0x04C0=0x0000
+0x04C1=0x0000
+0x04C2=0x0000
+0x04C3=0x0000
+0x04C4=0x0000
+0x04C5=0x0000
+0x04C6=0x0000
+0x04C7=0x0000
+0x04C8=0x0000
+0x04C9=0x0000
+0x04CA=0x0000
+0x04CB=0x0000
+0x04CC=0x0000
+0x04CD=0x0000
+0x04CE=0x0000
+0x04CF=0x0000
+0x04D0=0x0000
+0x04D1=0x0000
+0x04D2=0x0000
+0x04D3=0x0000
+0x04D4=0x0000
+0x04D5=0x0000
+0x04D6=0x0000
+0x04D7=0x0000
+0x04D8=0x0000
+0x04D9=0x0000
+0x04DA=0x0000
+0x04DB=0x0000
+0x04DC=0x0000
+0x04DD=0x0000
+0x04DE=0x0000
+0x04DF=0x0000
+0x04E0=0x0000
+0x04E1=0x0000
+0x04E2=0x0000
+0x04E3=0x0000
+0x04E4=0x0000
+0x04E5=0x0000
+0x04E6=0x0000
+0x04E7=0x0000
+0x0500=0x0000
+0x0501=0x0000
+0x0502=0x0000
+0x0503=0x0000
+0x0504=0x0000
+0x0505=0x0000
+0x0506=0x0000
+0x0507=0x0000
+0x0508=0x0000
+0x0509=0x0000
+0x050A=0x0000
+0x050B=0x0000
+0x050C=0x0000
+0x050D=0x0000
+0x050E=0x0000
+0x050F=0x0000
+0x0510=0x0000
+0x0511=0x0000
+0x0512=0x0000
+0x0513=0x0000
+0x0514=0x0000
+0x0515=0x0000
+0x0516=0x0000
+0x0517=0x0000
+0x0518=0x0000
+0x0519=0x0000
+0x051A=0x0000
+0x051B=0x0000
+0x051C=0x0000
+0x051D=0x0000
+0x051E=0x0000
+0x051F=0x0000
+0x0520=0x0000
+0x0521=0x0000
+0x0522=0x0000
+0x0523=0x0000
+0x0524=0x0000
+0x0525=0x0000
+0x0526=0x0000
+0x0527=0x0000
+0x0540=0x0000
+0x0541=0x0000
+0x0542=0x0000
+0x0543=0x0000
+0x0544=0x0000
+0x0545=0x0000
+0x0546=0x0000
+0x0547=0x0000
+0x0548=0x0000
+0x0549=0x0000
+0x054A=0x0000
+0x054B=0x0000
+0x054C=0x0000
+0x054D=0x0000
+0x054E=0x0000
+0x054F=0x0000
+0x0550=0x0000
+0x0551=0x0000
+0x0552=0x0000
+0x0553=0x0000
+0x0554=0x0000
+0x0555=0x0000
+0x0556=0x0000
+0x0557=0x0000
+0x0558=0x0000
+0x0559=0x0000
+0x055A=0x0000
+0x055B=0x0000
+0x055C=0x0000
+0x055D=0x0000
+0x055E=0x0000
+0x055F=0x0000
+0x0560=0x0000
+0x0561=0x0000
+0x0562=0x0000
+0x0563=0x0000
+0x0564=0x0000
+0x0565=0x0000
+0x0566=0x0000
+0x0567=0x0000
+0x0580=0x0000
+0x0581=0x0000
+0x0582=0x0000
+0x0583=0x0000
+0x0584=0x0000
+0x0585=0x0000
+0x0586=0x0000
+0x0587=0x0000
+0x0588=0x0000
+0x0589=0x0000
+0x058A=0x0000
+0x058B=0x0000
+0x058C=0x0000
+0x058D=0x0000
+0x058E=0x0000
+0x058F=0x0000
+0x0590=0x0000
+0x0591=0x0000
+0x0592=0x0000
+0x0593=0x0000
+0x0594=0x0000
+0x0595=0x0000
+0x0596=0x0000
+0x0597=0x0000
+0x0598=0x0000
+0x0599=0x0000
+0x059A=0x0000
+0x059B=0x0000
+0x059C=0x0000
+0x059D=0x0000
+0x059E=0x0000
+0x059F=0x0000
+0x05A0=0x0000
+0x05A1=0x0000
+0x05A2=0x0000
+0x05A3=0x0000
+0x05A4=0x0000
+0x05A5=0x0000
+0x05A6=0x0000
+0x05A7=0x0000
+[reference_clocks]
+sxt_ref_clk_mhz=30.72
+sxr_ref_clk_mhz=30.72
diff --git a/targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz_1v4.ini b/targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz_1v4.ini
new file mode 100755
index 0000000000000000000000000000000000000000..9503891fb9220223c5f2808d00686112e73c3735
--- /dev/null
+++ b/targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz_1v4.ini
@@ -0,0 +1,1128 @@
+[file_info]
+type=lms7002m_minimal_config
+version=1
+[lms7002_registers_a]
+0x0020=0xFFFD
+0x0021=0x0E9F
+0x0022=0x07FF
+0x0023=0x5550
+0x0024=0xB1E4
+0x0025=0x0101
+0x0026=0x0101
+0x0027=0xB1E4
+0x0028=0x0101
+0x0029=0x0101
+0x002A=0x0086
+0x002B=0x0038
+0x002C=0x0000
+0x002D=0x0000
+0x002E=0x0000
+0x002F=0x3840
+0x0081=0x0000
+0x0082=0x800B
+0x0084=0x0400
+0x0085=0x0001
+0x0086=0x4101
+0x0087=0x0000
+0x0088=0x04B0
+0x0089=0x1090
+0x008A=0x0514
+0x008B=0x2136
+0x008C=0x267B
+0x0092=0x0001
+0x0093=0x0000
+0x0094=0x0000
+0x0095=0x0000
+0x0096=0x0000
+0x0097=0x0000
+0x0098=0x0000
+0x0099=0x6565
+0x009A=0x658C
+0x009B=0x6565
+0x009C=0x658C
+0x009D=0x6565
+0x009E=0x658C
+0x009F=0x658C
+0x00A0=0x6565
+0x00A1=0x6565
+0x00A2=0x6565
+0x00A3=0x6565
+0x00A4=0x6565
+0x00A5=0x6565
+0x00A6=0x000F
+0x00A7=0x6565
+0x00A8=0x0000
+0x00A9=0x0000
+0x00AA=0x0000
+0x00AB=0x0040
+0x00AC=0x0000
+0x00AD=0x03FF
+0x00AE=0x0000
+0x0100=0x3409
+0x0101=0x7800
+0x0102=0x3180
+0x0103=0x0612
+0x0104=0x0088
+0x0105=0x0011
+0x0106=0x318C
+0x0107=0x318C
+0x0108=0x218C
+0x0109=0x6104
+0x010A=0x17BD
+0x010C=0x8865
+0x010D=0x00DE
+0x010E=0x0000
+0x010F=0x30C6
+0x0110=0x0BFF
+0x0111=0x0083
+0x0112=0x9407
+0x0113=0x0303
+0x0114=0x00D0
+0x0115=0x0009
+0x0116=0x8180
+0x0117=0x1217
+0x0118=0x018C
+0x0119=0x528C
+0x011A=0x3E03
+0x011C=0xAD41
+0x011D=0x2000
+0x011E=0x06E4
+0x011F=0x3640
+0x0120=0xB9FF
+0x0121=0x341C
+0x0122=0x033F
+0x0123=0x267B
+0x0124=0x0000
+0x0200=0x0081
+0x0201=0x07FF
+0x0202=0x07FF
+0x0203=0x0000
+0x0204=0x0000
+0x0205=0x0000
+0x0206=0x0000
+0x0207=0x0000
+0x0208=0x0170
+0x0209=0x0000
+0x020A=0x0080
+0x020B=0x0000
+0x020C=0x8000
+0x0240=0x0020
+0x0241=0x0000
+0x0242=0x0000
+0x0243=0x0000
+0x0244=0x0000
+0x0245=0x0000
+0x0246=0x0000
+0x0247=0x0000
+0x0248=0x0000
+0x0249=0x0000
+0x024A=0x0000
+0x024B=0x0000
+0x024C=0x0000
+0x024D=0x0000
+0x024E=0x0000
+0x024F=0x0000
+0x0250=0x0000
+0x0251=0x0000
+0x0252=0x0000
+0x0253=0x0000
+0x0254=0x0000
+0x0255=0x0000
+0x0256=0x0000
+0x0257=0x0000
+0x0258=0x0000
+0x0259=0x0000
+0x025A=0x0000
+0x025B=0x0000
+0x025C=0x0000
+0x025D=0x0000
+0x025E=0x0000
+0x025F=0x0000
+0x0260=0x0000
+0x0261=0x0000
+0x0280=0x0000
+0x0281=0x0000
+0x0282=0x0000
+0x0283=0x0000
+0x0284=0x0000
+0x0285=0x0000
+0x0286=0x0000
+0x0287=0x0000
+0x0288=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x028B=0x0000
+0x028C=0x0000
+0x028D=0x0000
+0x028E=0x0000
+0x028F=0x0000
+0x0290=0x0000
+0x0291=0x0000
+0x0292=0x0000
+0x0293=0x0000
+0x0294=0x0000
+0x0295=0x0000
+0x0296=0x0000
+0x0297=0x0000
+0x0298=0x0000
+0x0299=0x0000
+0x029A=0x0000
+0x029B=0x0000
+0x029C=0x0000
+0x029D=0x0000
+0x029E=0x0000
+0x029F=0x0000
+0x02A0=0x0000
+0x02A1=0x0000
+0x02A2=0x0000
+0x02A3=0x0000
+0x02A4=0x0000
+0x02A5=0x0000
+0x02A6=0x0000
+0x02A7=0x0000
+0x02C0=0x0000
+0x02C1=0x0000
+0x02C2=0x0000
+0x02C3=0x0000
+0x02C4=0x0000
+0x02C5=0x0000
+0x02C6=0x0000
+0x02C7=0x0000
+0x02C8=0x0000
+0x02C9=0x0000
+0x02CA=0x0000
+0x02CB=0x0000
+0x02CC=0x0000
+0x02CD=0x0000
+0x02CE=0x0000
+0x02CF=0x0000
+0x02D0=0x0000
+0x02D1=0x0000
+0x02D2=0x0000
+0x02D3=0x0000
+0x02D4=0x0000
+0x02D5=0x0000
+0x02D6=0x0000
+0x02D7=0x0000
+0x02D8=0x0000
+0x02D9=0x0000
+0x02DA=0x0000
+0x02DB=0x0000
+0x02DC=0x0000
+0x02DD=0x0000
+0x02DE=0x0000
+0x02DF=0x0000
+0x02E0=0x0000
+0x02E1=0x0000
+0x02E2=0x0000
+0x02E3=0x0000
+0x02E4=0x0000
+0x02E5=0x0000
+0x02E6=0x0000
+0x02E7=0x0000
+0x0300=0x0000
+0x0301=0x0000
+0x0302=0x0000
+0x0303=0x0000
+0x0304=0x0000
+0x0305=0x0000
+0x0306=0x0000
+0x0307=0x0000
+0x0308=0x0000
+0x0309=0x0000
+0x030A=0x0000
+0x030B=0x0000
+0x030C=0x0000
+0x030D=0x0000
+0x030E=0x0000
+0x030F=0x0000
+0x0310=0x0000
+0x0311=0x0000
+0x0312=0x0000
+0x0313=0x0000
+0x0314=0x0000
+0x0315=0x0000
+0x0316=0x0000
+0x0317=0x0000
+0x0318=0x0000
+0x0319=0x0000
+0x031A=0x0000
+0x031B=0x0000
+0x031C=0x0000
+0x031D=0x0000
+0x031E=0x0000
+0x031F=0x0000
+0x0320=0x0000
+0x0321=0x0000
+0x0322=0x0000
+0x0323=0x0000
+0x0324=0x0000
+0x0325=0x0000
+0x0326=0x0000
+0x0327=0x0000
+0x0340=0x0000
+0x0341=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0345=0x0000
+0x0346=0x0000
+0x0347=0x0000
+0x0348=0x0000
+0x0349=0x0000
+0x034A=0x0000
+0x034B=0x0000
+0x034C=0x0000
+0x034D=0x0000
+0x034E=0x0000
+0x034F=0x0000
+0x0350=0x0000
+0x0351=0x0000
+0x0352=0x0000
+0x0353=0x0000
+0x0354=0x0000
+0x0355=0x0000
+0x0356=0x0000
+0x0357=0x0000
+0x0358=0x0000
+0x0359=0x0000
+0x035A=0x0000
+0x035B=0x0000
+0x035C=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x035F=0x0000
+0x0360=0x0000
+0x0361=0x0000
+0x0362=0x0000
+0x0363=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0367=0x0000
+0x0380=0x0000
+0x0381=0x0000
+0x0382=0x0000
+0x0383=0x0000
+0x0384=0x0000
+0x0385=0x0000
+0x0386=0x0000
+0x0387=0x0000
+0x0388=0x0000
+0x0389=0x0000
+0x038A=0x0000
+0x038B=0x0000
+0x038C=0x0000
+0x038D=0x0000
+0x038E=0x0000
+0x038F=0x0000
+0x0390=0x0000
+0x0391=0x0000
+0x0392=0x0000
+0x0393=0x0000
+0x0394=0x0000
+0x0395=0x0000
+0x0396=0x0000
+0x0397=0x0000
+0x0398=0x0000
+0x0399=0x0000
+0x039A=0x0000
+0x039B=0x0000
+0x039C=0x0000
+0x039D=0x0000
+0x039E=0x0000
+0x039F=0x0000
+0x03A0=0x0000
+0x03A1=0x0000
+0x03A2=0x0000
+0x03A3=0x0000
+0x03A4=0x0000
+0x03A5=0x0000
+0x03A6=0x0000
+0x03A7=0x0000
+0x0400=0x8081
+0x0401=0x07FF
+0x0402=0x07FF
+0x0403=0x0000
+0x0404=0x0000
+0x0405=0x0000
+0x0406=0x0000
+0x0407=0x0000
+0x0408=0x0000
+0x0409=0x0000
+0x040A=0x0003
+0x040B=0x000F
+0x040C=0x00F8
+0x040D=0x0000
+0x040E=0x0000
+0x040F=0x0000
+0x0440=0x0020
+0x0441=0x0000
+0x0442=0x2B55
+0x0443=0x5540
+0x0444=0x0000
+0x0445=0x0000
+0x0446=0x0000
+0x0447=0x0000
+0x0448=0x0000
+0x0449=0x0000
+0x044A=0x0000
+0x044B=0x0000
+0x044C=0x0000
+0x044D=0x0000
+0x044E=0x0000
+0x044F=0x0000
+0x0450=0x0000
+0x0451=0x0000
+0x0452=0x0000
+0x0453=0x0000
+0x0454=0x0000
+0x0455=0x0000
+0x0456=0x0000
+0x0457=0x0000
+0x0458=0x0000
+0x0459=0x0000
+0x045A=0x0000
+0x045B=0x0000
+0x045C=0x0000
+0x045D=0x0000
+0x045E=0x0000
+0x045F=0x0000
+0x0460=0x0000
+0x0461=0x0000
+0x0480=0x0000
+0x0481=0x0000
+0x0482=0x0000
+0x0483=0x0000
+0x0484=0x0000
+0x0485=0x0000
+0x0486=0x0000
+0x0487=0x0000
+0x0488=0x0000
+0x0489=0x0000
+0x048A=0x0000
+0x048B=0x0000
+0x048C=0x0000
+0x048D=0x0000
+0x048E=0x0000
+0x048F=0x0000
+0x0490=0x0000
+0x0491=0x0000
+0x0492=0x0000
+0x0493=0x0000
+0x0494=0x0000
+0x0495=0x0000
+0x0496=0x0000
+0x0497=0x0000
+0x0498=0x0000
+0x0499=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x049C=0x0000
+0x049D=0x0000
+0x049E=0x0000
+0x049F=0x0000
+0x04A0=0x0000
+0x04A1=0x0000
+0x04A2=0x0000
+0x04A3=0x0000
+0x04A4=0x0000
+0x04A5=0x0000
+0x04A6=0x0000
+0x04A7=0x0000
+0x04C0=0x0000
+0x04C1=0x0000
+0x04C2=0x0000
+0x04C3=0x0000
+0x04C4=0x0000
+0x04C5=0x0000
+0x04C6=0x0000
+0x04C7=0x0000
+0x04C8=0x0000
+0x04C9=0x0000
+0x04CA=0x0000
+0x04CB=0x0000
+0x04CC=0x0000
+0x04CD=0x0000
+0x04CE=0x0000
+0x04CF=0x0000
+0x04D0=0x0000
+0x04D1=0x0000
+0x04D2=0x0000
+0x04D3=0x0000
+0x04D4=0x0000
+0x04D5=0x0000
+0x04D6=0x0000
+0x04D7=0x0000
+0x04D8=0x0000
+0x04D9=0x0000
+0x04DA=0x0000
+0x04DB=0x0000
+0x04DC=0x0000
+0x04DD=0x0000
+0x04DE=0x0000
+0x04DF=0x0000
+0x04E0=0x0000
+0x04E1=0x0000
+0x04E2=0x0000
+0x04E3=0x0000
+0x04E4=0x0000
+0x04E5=0x0000
+0x04E6=0x0000
+0x04E7=0x0000
+0x0500=0x0000
+0x0501=0x0000
+0x0502=0x0000
+0x0503=0x0000
+0x0504=0x0000
+0x0505=0x0000
+0x0506=0x0000
+0x0507=0x0000
+0x0508=0x0000
+0x0509=0x0000
+0x050A=0x0000
+0x050B=0x0000
+0x050C=0x0000
+0x050D=0x0000
+0x050E=0x0000
+0x050F=0x0000
+0x0510=0x0000
+0x0511=0x0000
+0x0512=0x0000
+0x0513=0x0000
+0x0514=0x0000
+0x0515=0x0000
+0x0516=0x0000
+0x0517=0x0000
+0x0518=0x0000
+0x0519=0x0000
+0x051A=0x0000
+0x051B=0x0000
+0x051C=0x0000
+0x051D=0x0000
+0x051E=0x0000
+0x051F=0x0000
+0x0520=0x0000
+0x0521=0x0000
+0x0522=0x0000
+0x0523=0x0000
+0x0524=0x0000
+0x0525=0x0000
+0x0526=0x0000
+0x0527=0x0000
+0x0540=0x0000
+0x0541=0x0000
+0x0542=0x0000
+0x0543=0x0000
+0x0544=0x0000
+0x0545=0x0000
+0x0546=0x0000
+0x0547=0x0000
+0x0548=0x0000
+0x0549=0x0000
+0x054A=0x0000
+0x054B=0x0000
+0x054C=0x0000
+0x054D=0x0000
+0x054E=0x0000
+0x054F=0x0000
+0x0550=0x0000
+0x0551=0x0000
+0x0552=0x0000
+0x0553=0x0000
+0x0554=0x0000
+0x0555=0x0000
+0x0556=0x0000
+0x0557=0x0000
+0x0558=0x0000
+0x0559=0x0000
+0x055A=0x0000
+0x055B=0x0000
+0x055C=0x0000
+0x055D=0x0000
+0x055E=0x0000
+0x055F=0x0000
+0x0560=0x0000
+0x0561=0x0000
+0x0562=0x0000
+0x0563=0x0000
+0x0564=0x0000
+0x0565=0x0000
+0x0566=0x0000
+0x0567=0x0000
+0x0580=0x0000
+0x0581=0x0000
+0x0582=0x0000
+0x0583=0x0000
+0x0584=0x0000
+0x0585=0x0000
+0x0586=0x0000
+0x0587=0x0000
+0x0588=0x0000
+0x0589=0x0000
+0x058A=0x0000
+0x058B=0x0000
+0x058C=0x0000
+0x058D=0x0000
+0x058E=0x0000
+0x058F=0x0000
+0x0590=0x0000
+0x0591=0x0000
+0x0592=0x0000
+0x0593=0x0000
+0x0594=0x0000
+0x0595=0x0000
+0x0596=0x0000
+0x0597=0x0000
+0x0598=0x0000
+0x0599=0x0000
+0x059A=0x0000
+0x059B=0x0000
+0x059C=0x0000
+0x059D=0x0000
+0x059E=0x0000
+0x059F=0x0000
+0x05A0=0x0000
+0x05A1=0x0000
+0x05A2=0x0000
+0x05A3=0x0000
+0x05A4=0x0000
+0x05A5=0x0000
+0x05A6=0x0000
+0x05A7=0x0000
+[lms7002_registers_b]
+0x0100=0x340F
+0x0101=0x7800
+0x0102=0x3180
+0x0103=0x0612
+0x0104=0x0088
+0x0105=0x001F
+0x0106=0x3182
+0x0107=0x318C
+0x0108=0x9442
+0x0109=0x61C1
+0x010A=0x104C
+0x010C=0x88FF
+0x010D=0x001E
+0x010E=0x2040
+0x010F=0x3042
+0x0110=0x0BF4
+0x0111=0x0083
+0x0112=0x9407
+0x0113=0x03C3
+0x0114=0x00D0
+0x0115=0x000F
+0x0116=0x8180
+0x0117=0x1217
+0x0118=0x018C
+0x0119=0x5280
+0x011A=0x3E03
+0x011C=0xAD41
+0x011D=0x1555
+0x011E=0x0747
+0x011F=0x3640
+0x0120=0xB9FF
+0x0121=0x360C
+0x0122=0x033F
+0x0123=0x267B
+0x0124=0x0000
+0x0200=0x0101
+0x0201=0x07FF
+0x0202=0x07FF
+0x0203=0x0000
+0x0204=0x0000
+0x0205=0x0000
+0x0206=0x0000
+0x0207=0x0000
+0x0208=0x01F0
+0x0209=0x0000
+0x020A=0x0080
+0x020B=0x0000
+0x020C=0x7FFF
+0x0240=0x0020
+0x0241=0x0000
+0x0242=0x0000
+0x0243=0x0000
+0x0244=0x0000
+0x0245=0x0000
+0x0246=0x0000
+0x0247=0x0000
+0x0248=0x0000
+0x0249=0x0000
+0x024A=0x0000
+0x024B=0x0000
+0x024C=0x0000
+0x024D=0x0000
+0x024E=0x0000
+0x024F=0x0000
+0x0250=0x0000
+0x0251=0x0000
+0x0252=0x0000
+0x0253=0x0000
+0x0254=0x0000
+0x0255=0x0000
+0x0256=0x0000
+0x0257=0x0000
+0x0258=0x0000
+0x0259=0x0000
+0x025A=0x0000
+0x025B=0x0000
+0x025C=0x0000
+0x025D=0x0000
+0x025E=0x0000
+0x025F=0x0000
+0x0260=0x0000
+0x0261=0x0000
+0x0280=0x0000
+0x0281=0x0000
+0x0282=0x0000
+0x0283=0x0000
+0x0284=0x0000
+0x0285=0x0000
+0x0286=0x0000
+0x0287=0x0000
+0x0288=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x028B=0x0000
+0x028C=0x0000
+0x028D=0x0000
+0x028E=0x0000
+0x028F=0x0000
+0x0290=0x0000
+0x0291=0x0000
+0x0292=0x0000
+0x0293=0x0000
+0x0294=0x0000
+0x0295=0x0000
+0x0296=0x0000
+0x0297=0x0000
+0x0298=0x0000
+0x0299=0x0000
+0x029A=0x0000
+0x029B=0x0000
+0x029C=0x0000
+0x029D=0x0000
+0x029E=0x0000
+0x029F=0x0000
+0x02A0=0x0000
+0x02A1=0x0000
+0x02A2=0x0000
+0x02A3=0x0000
+0x02A4=0x0000
+0x02A5=0x0000
+0x02A6=0x0000
+0x02A7=0x0000
+0x02C0=0x0000
+0x02C1=0x0000
+0x02C2=0x0000
+0x02C3=0x0000
+0x02C4=0x0000
+0x02C5=0x0000
+0x02C6=0x0000
+0x02C7=0x0000
+0x02C8=0x0000
+0x02C9=0x0000
+0x02CA=0x0000
+0x02CB=0x0000
+0x02CC=0x0000
+0x02CD=0x0000
+0x02CE=0x0000
+0x02CF=0x0000
+0x02D0=0x0000
+0x02D1=0x0000
+0x02D2=0x0000
+0x02D3=0x0000
+0x02D4=0x0000
+0x02D5=0x0000
+0x02D6=0x0000
+0x02D7=0x0000
+0x02D8=0x0000
+0x02D9=0x0000
+0x02DA=0x0000
+0x02DB=0x0000
+0x02DC=0x0000
+0x02DD=0x0000
+0x02DE=0x0000
+0x02DF=0x0000
+0x02E0=0x0000
+0x02E1=0x0000
+0x02E2=0x0000
+0x02E3=0x0000
+0x02E4=0x0000
+0x02E5=0x0000
+0x02E6=0x0000
+0x02E7=0x0000
+0x0300=0x0000
+0x0301=0x0000
+0x0302=0x0000
+0x0303=0x0000
+0x0304=0x0000
+0x0305=0x0000
+0x0306=0x0000
+0x0307=0x0000
+0x0308=0x0000
+0x0309=0x0000
+0x030A=0x0000
+0x030B=0x0000
+0x030C=0x0000
+0x030D=0x0000
+0x030E=0x0000
+0x030F=0x0000
+0x0310=0x0000
+0x0311=0x0000
+0x0312=0x0000
+0x0313=0x0000
+0x0314=0x0000
+0x0315=0x0000
+0x0316=0x0000
+0x0317=0x0000
+0x0318=0x0000
+0x0319=0x0000
+0x031A=0x0000
+0x031B=0x0000
+0x031C=0x0000
+0x031D=0x0000
+0x031E=0x0000
+0x031F=0x0000
+0x0320=0x0000
+0x0321=0x0000
+0x0322=0x0000
+0x0323=0x0000
+0x0324=0x0000
+0x0325=0x0000
+0x0326=0x0000
+0x0327=0x0000
+0x0340=0x0000
+0x0341=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0345=0x0000
+0x0346=0x0000
+0x0347=0x0000
+0x0348=0x0000
+0x0349=0x0000
+0x034A=0x0000
+0x034B=0x0000
+0x034C=0x0000
+0x034D=0x0000
+0x034E=0x0000
+0x034F=0x0000
+0x0350=0x0000
+0x0351=0x0000
+0x0352=0x0000
+0x0353=0x0000
+0x0354=0x0000
+0x0355=0x0000
+0x0356=0x0000
+0x0357=0x0000
+0x0358=0x0000
+0x0359=0x0000
+0x035A=0x0000
+0x035B=0x0000
+0x035C=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x035F=0x0000
+0x0360=0x0000
+0x0361=0x0000
+0x0362=0x0000
+0x0363=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0367=0x0000
+0x0380=0x0000
+0x0381=0x0000
+0x0382=0x0000
+0x0383=0x0000
+0x0384=0x0000
+0x0385=0x0000
+0x0386=0x0000
+0x0387=0x0000
+0x0388=0x0000
+0x0389=0x0000
+0x038A=0x0000
+0x038B=0x0000
+0x038C=0x0000
+0x038D=0x0000
+0x038E=0x0000
+0x038F=0x0000
+0x0390=0x0000
+0x0391=0x0000
+0x0392=0x0000
+0x0393=0x0000
+0x0394=0x0000
+0x0395=0x0000
+0x0396=0x0000
+0x0397=0x0000
+0x0398=0x0000
+0x0399=0x0000
+0x039A=0x0000
+0x039B=0x0000
+0x039C=0x0000
+0x039D=0x0000
+0x039E=0x0000
+0x039F=0x0000
+0x03A0=0x0000
+0x03A1=0x0000
+0x03A2=0x0000
+0x03A3=0x0000
+0x03A4=0x0000
+0x03A5=0x0000
+0x03A6=0x0000
+0x03A7=0x0000
+0x0400=0x0105
+0x0401=0x07FF
+0x0402=0x07FF
+0x0403=0x0000
+0x0404=0x0000
+0x0405=0x0000
+0x0406=0x0000
+0x0407=0x0000
+0x0408=0x0000
+0x0409=0x0000
+0x040A=0x0000
+0x040B=0x7FFF
+0x040C=0x00FF
+0x040D=0x0000
+0x040E=0x0002
+0x040F=0x0000
+0x0440=0x0020
+0x0441=0x0000
+0x0442=0x0000
+0x0443=0x0000
+0x0444=0x0000
+0x0445=0x0000
+0x0446=0x0000
+0x0447=0x0000
+0x0448=0x0000
+0x0449=0x0000
+0x044A=0x0000
+0x044B=0x0000
+0x044C=0x0000
+0x044D=0x0000
+0x044E=0x0000
+0x044F=0x0000
+0x0450=0x0000
+0x0451=0x0000
+0x0452=0x0000
+0x0453=0x0000
+0x0454=0x0000
+0x0455=0x0000
+0x0456=0x0000
+0x0457=0x0000
+0x0458=0x0000
+0x0459=0x0000
+0x045A=0x0000
+0x045B=0x0000
+0x045C=0x0000
+0x045D=0x0000
+0x045E=0x0000
+0x045F=0x0000
+0x0460=0x0000
+0x0461=0x0000
+0x0480=0x0000
+0x0481=0x0000
+0x0482=0x0000
+0x0483=0x0000
+0x0484=0x0000
+0x0485=0x0000
+0x0486=0x0000
+0x0487=0x0000
+0x0488=0x0000
+0x0489=0x0000
+0x048A=0x0000
+0x048B=0x0000
+0x048C=0x0000
+0x048D=0x0000
+0x048E=0x0000
+0x048F=0x0000
+0x0490=0x0000
+0x0491=0x0000
+0x0492=0x0000
+0x0493=0x0000
+0x0494=0x0000
+0x0495=0x0000
+0x0496=0x0000
+0x0497=0x0000
+0x0498=0x0000
+0x0499=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x049C=0x0000
+0x049D=0x0000
+0x049E=0x0000
+0x049F=0x0000
+0x04A0=0x0000
+0x04A1=0x0000
+0x04A2=0x0000
+0x04A3=0x0000
+0x04A4=0x0000
+0x04A5=0x0000
+0x04A6=0x0000
+0x04A7=0x0000
+0x04C0=0x0000
+0x04C1=0x0000
+0x04C2=0x0000
+0x04C3=0x0000
+0x04C4=0x0000
+0x04C5=0x0000
+0x04C6=0x0000
+0x04C7=0x0000
+0x04C8=0x0000
+0x04C9=0x0000
+0x04CA=0x0000
+0x04CB=0x0000
+0x04CC=0x0000
+0x04CD=0x0000
+0x04CE=0x0000
+0x04CF=0x0000
+0x04D0=0x0000
+0x04D1=0x0000
+0x04D2=0x0000
+0x04D3=0x0000
+0x04D4=0x0000
+0x04D5=0x0000
+0x04D6=0x0000
+0x04D7=0x0000
+0x04D8=0x0000
+0x04D9=0x0000
+0x04DA=0x0000
+0x04DB=0x0000
+0x04DC=0x0000
+0x04DD=0x0000
+0x04DE=0x0000
+0x04DF=0x0000
+0x04E0=0x0000
+0x04E1=0x0000
+0x04E2=0x0000
+0x04E3=0x0000
+0x04E4=0x0000
+0x04E5=0x0000
+0x04E6=0x0000
+0x04E7=0x0000
+0x0500=0x0000
+0x0501=0x0000
+0x0502=0x0000
+0x0503=0x0000
+0x0504=0x0000
+0x0505=0x0000
+0x0506=0x0000
+0x0507=0x0000
+0x0508=0x0000
+0x0509=0x0000
+0x050A=0x0000
+0x050B=0x0000
+0x050C=0x0000
+0x050D=0x0000
+0x050E=0x0000
+0x050F=0x0000
+0x0510=0x0000
+0x0511=0x0000
+0x0512=0x0000
+0x0513=0x0000
+0x0514=0x0000
+0x0515=0x0000
+0x0516=0x0000
+0x0517=0x0000
+0x0518=0x0000
+0x0519=0x0000
+0x051A=0x0000
+0x051B=0x0000
+0x051C=0x0000
+0x051D=0x0000
+0x051E=0x0000
+0x051F=0x0000
+0x0520=0x0000
+0x0521=0x0000
+0x0522=0x0000
+0x0523=0x0000
+0x0524=0x0000
+0x0525=0x0000
+0x0526=0x0000
+0x0527=0x0000
+0x0540=0x0000
+0x0541=0x0000
+0x0542=0x0000
+0x0543=0x0000
+0x0544=0x0000
+0x0545=0x0000
+0x0546=0x0000
+0x0547=0x0000
+0x0548=0x0000
+0x0549=0x0000
+0x054A=0x0000
+0x054B=0x0000
+0x054C=0x0000
+0x054D=0x0000
+0x054E=0x0000
+0x054F=0x0000
+0x0550=0x0000
+0x0551=0x0000
+0x0552=0x0000
+0x0553=0x0000
+0x0554=0x0000
+0x0555=0x0000
+0x0556=0x0000
+0x0557=0x0000
+0x0558=0x0000
+0x0559=0x0000
+0x055A=0x0000
+0x055B=0x0000
+0x055C=0x0000
+0x055D=0x0000
+0x055E=0x0000
+0x055F=0x0000
+0x0560=0x0000
+0x0561=0x0000
+0x0562=0x0000
+0x0563=0x0000
+0x0564=0x0000
+0x0565=0x0000
+0x0566=0x0000
+0x0567=0x0000
+0x0580=0x0000
+0x0581=0x0000
+0x0582=0x0000
+0x0583=0x0000
+0x0584=0x0000
+0x0585=0x0000
+0x0586=0x0000
+0x0587=0x0000
+0x0588=0x0000
+0x0589=0x0000
+0x058A=0x0000
+0x058B=0x0000
+0x058C=0x0000
+0x058D=0x0000
+0x058E=0x0000
+0x058F=0x0000
+0x0590=0x0000
+0x0591=0x0000
+0x0592=0x0000
+0x0593=0x0000
+0x0594=0x0000
+0x0595=0x0000
+0x0596=0x0000
+0x0597=0x0000
+0x0598=0x0000
+0x0599=0x0000
+0x059A=0x0000
+0x059B=0x0000
+0x059C=0x0000
+0x059D=0x0000
+0x059E=0x0000
+0x059F=0x0000
+0x05A0=0x0000
+0x05A1=0x0000
+0x05A2=0x0000
+0x05A3=0x0000
+0x05A4=0x0000
+0x05A5=0x0000
+0x05A6=0x0000
+0x05A7=0x0000
+[reference_clocks]
+sxt_ref_clk_mhz=30.72
+sxr_ref_clk_mhz=30.72
diff --git a/targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz.ini b/targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz.ini
new file mode 100755
index 0000000000000000000000000000000000000000..dda51f7f27d97511d742cef79f99c99f208dc310
--- /dev/null
+++ b/targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz.ini
@@ -0,0 +1,1128 @@
+[file_info]
+type=lms7002m_minimal_config
+version=1
+[lms7002_registers_a]
+0x0020=0xFFFD
+0x0021=0x0E9F
+0x0022=0x07FF
+0x0023=0x5550
+0x0024=0xB1E4
+0x0025=0x0101
+0x0026=0x0101
+0x0027=0xB1E4
+0x0028=0x0101
+0x0029=0x0101
+0x002A=0x0086
+0x002B=0x0038
+0x002C=0x0000
+0x002D=0x0000
+0x002E=0x0000
+0x002F=0x3840
+0x0081=0x0000
+0x0082=0x8003
+0x0084=0x0400
+0x0085=0x0001
+0x0086=0x4101
+0x0087=0x0000
+0x0088=0x04B0
+0x0089=0x1090
+0x008A=0x0514
+0x008B=0x2102
+0x008C=0x267B
+0x0092=0x0001
+0x0093=0x0000
+0x0094=0x0000
+0x0095=0x0000
+0x0096=0x0000
+0x0097=0x0000
+0x0098=0x0000
+0x0099=0x6565
+0x009A=0x658C
+0x009B=0x6565
+0x009C=0x658C
+0x009D=0x6565
+0x009E=0x658C
+0x009F=0x658C
+0x00A0=0x6565
+0x00A1=0x6565
+0x00A2=0x6565
+0x00A3=0x6565
+0x00A4=0x6565
+0x00A5=0x6565
+0x00A6=0x000F
+0x00A7=0x6565
+0x00A8=0x0000
+0x00A9=0x0000
+0x00AA=0x0000
+0x00AB=0x0040
+0x00AC=0x0000
+0x00AD=0x03FF
+0x00AE=0x0000
+0x0100=0x3409
+0x0101=0x7800
+0x0102=0x3180
+0x0103=0x0A12
+0x0104=0x0088
+0x0105=0x0011
+0x0106=0x318C
+0x0107=0x318C
+0x0108=0x2826
+0x0109=0x6104
+0x010A=0x17BD
+0x010C=0x8865
+0x010D=0x01DC
+0x010E=0x0000
+0x010F=0x3042
+0x0110=0x0BFF
+0x0111=0x0083
+0x0112=0x9407
+0x0113=0x0303
+0x0114=0x00D0
+0x0115=0x0009
+0x0116=0x8180
+0x0117=0x1217
+0x0118=0x018C
+0x0119=0x528C
+0x011A=0x3E03
+0x011C=0xAD41
+0x011D=0xC000
+0x011E=0x068F
+0x011F=0x3680
+0x0120=0xB9FF
+0x0121=0x3234
+0x0122=0x033F
+0x0123=0x267B
+0x0124=0x0000
+0x0200=0x0081
+0x0201=0x07FF
+0x0202=0x07FF
+0x0203=0x0000
+0x0204=0x0000
+0x0205=0x0000
+0x0206=0x0000
+0x0207=0x0000
+0x0208=0x0170
+0x0209=0x0000
+0x020A=0x0080
+0x020B=0x0000
+0x020C=0x8000
+0x0240=0x0020
+0x0241=0x0000
+0x0242=0x0000
+0x0243=0x0000
+0x0244=0x0000
+0x0245=0x0000
+0x0246=0x0000
+0x0247=0x0000
+0x0248=0x0000
+0x0249=0x0000
+0x024A=0x0000
+0x024B=0x0000
+0x024C=0x0000
+0x024D=0x0000
+0x024E=0x0000
+0x024F=0x0000
+0x0250=0x0000
+0x0251=0x0000
+0x0252=0x0000
+0x0253=0x0000
+0x0254=0x0000
+0x0255=0x0000
+0x0256=0x0000
+0x0257=0x0000
+0x0258=0x0000
+0x0259=0x0000
+0x025A=0x0000
+0x025B=0x0000
+0x025C=0x0000
+0x025D=0x0000
+0x025E=0x0000
+0x025F=0x0000
+0x0260=0x0000
+0x0261=0x0000
+0x0280=0x0000
+0x0281=0x0000
+0x0282=0x0000
+0x0283=0x0000
+0x0284=0x0000
+0x0285=0x0000
+0x0286=0x0000
+0x0287=0x0000
+0x0288=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x028B=0x0000
+0x028C=0x0000
+0x028D=0x0000
+0x028E=0x0000
+0x028F=0x0000
+0x0290=0x0000
+0x0291=0x0000
+0x0292=0x0000
+0x0293=0x0000
+0x0294=0x0000
+0x0295=0x0000
+0x0296=0x0000
+0x0297=0x0000
+0x0298=0x0000
+0x0299=0x0000
+0x029A=0x0000
+0x029B=0x0000
+0x029C=0x0000
+0x029D=0x0000
+0x029E=0x0000
+0x029F=0x0000
+0x02A0=0x0000
+0x02A1=0x0000
+0x02A2=0x0000
+0x02A3=0x0000
+0x02A4=0x0000
+0x02A5=0x0000
+0x02A6=0x0000
+0x02A7=0x0000
+0x02C0=0x0000
+0x02C1=0x0000
+0x02C2=0x0000
+0x02C3=0x0000
+0x02C4=0x0000
+0x02C5=0x0000
+0x02C6=0x0000
+0x02C7=0x0000
+0x02C8=0x0000
+0x02C9=0x0000
+0x02CA=0x0000
+0x02CB=0x0000
+0x02CC=0x0000
+0x02CD=0x0000
+0x02CE=0x0000
+0x02CF=0x0000
+0x02D0=0x0000
+0x02D1=0x0000
+0x02D2=0x0000
+0x02D3=0x0000
+0x02D4=0x0000
+0x02D5=0x0000
+0x02D6=0x0000
+0x02D7=0x0000
+0x02D8=0x0000
+0x02D9=0x0000
+0x02DA=0x0000
+0x02DB=0x0000
+0x02DC=0x0000
+0x02DD=0x0000
+0x02DE=0x0000
+0x02DF=0x0000
+0x02E0=0x0000
+0x02E1=0x0000
+0x02E2=0x0000
+0x02E3=0x0000
+0x02E4=0x0000
+0x02E5=0x0000
+0x02E6=0x0000
+0x02E7=0x0000
+0x0300=0x0000
+0x0301=0x0000
+0x0302=0x0000
+0x0303=0x0000
+0x0304=0x0000
+0x0305=0x0000
+0x0306=0x0000
+0x0307=0x0000
+0x0308=0x0000
+0x0309=0x0000
+0x030A=0x0000
+0x030B=0x0000
+0x030C=0x0000
+0x030D=0x0000
+0x030E=0x0000
+0x030F=0x0000
+0x0310=0x0000
+0x0311=0x0000
+0x0312=0x0000
+0x0313=0x0000
+0x0314=0x0000
+0x0315=0x0000
+0x0316=0x0000
+0x0317=0x0000
+0x0318=0x0000
+0x0319=0x0000
+0x031A=0x0000
+0x031B=0x0000
+0x031C=0x0000
+0x031D=0x0000
+0x031E=0x0000
+0x031F=0x0000
+0x0320=0x0000
+0x0321=0x0000
+0x0322=0x0000
+0x0323=0x0000
+0x0324=0x0000
+0x0325=0x0000
+0x0326=0x0000
+0x0327=0x0000
+0x0340=0x0000
+0x0341=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0345=0x0000
+0x0346=0x0000
+0x0347=0x0000
+0x0348=0x0000
+0x0349=0x0000
+0x034A=0x0000
+0x034B=0x0000
+0x034C=0x0000
+0x034D=0x0000
+0x034E=0x0000
+0x034F=0x0000
+0x0350=0x0000
+0x0351=0x0000
+0x0352=0x0000
+0x0353=0x0000
+0x0354=0x0000
+0x0355=0x0000
+0x0356=0x0000
+0x0357=0x0000
+0x0358=0x0000
+0x0359=0x0000
+0x035A=0x0000
+0x035B=0x0000
+0x035C=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x035F=0x0000
+0x0360=0x0000
+0x0361=0x0000
+0x0362=0x0000
+0x0363=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0367=0x0000
+0x0380=0x0000
+0x0381=0x0000
+0x0382=0x0000
+0x0383=0x0000
+0x0384=0x0000
+0x0385=0x0000
+0x0386=0x0000
+0x0387=0x0000
+0x0388=0x0000
+0x0389=0x0000
+0x038A=0x0000
+0x038B=0x0000
+0x038C=0x0000
+0x038D=0x0000
+0x038E=0x0000
+0x038F=0x0000
+0x0390=0x0000
+0x0391=0x0000
+0x0392=0x0000
+0x0393=0x0000
+0x0394=0x0000
+0x0395=0x0000
+0x0396=0x0000
+0x0397=0x0000
+0x0398=0x0000
+0x0399=0x0000
+0x039A=0x0000
+0x039B=0x0000
+0x039C=0x0000
+0x039D=0x0000
+0x039E=0x0000
+0x039F=0x0000
+0x03A0=0x0000
+0x03A1=0x0000
+0x03A2=0x0000
+0x03A3=0x0000
+0x03A4=0x0000
+0x03A5=0x0000
+0x03A6=0x0000
+0x03A7=0x0000
+0x0400=0x8081
+0x0401=0x07FF
+0x0402=0x07FF
+0x0403=0x0000
+0x0404=0x0000
+0x0405=0x0000
+0x0406=0x0000
+0x0407=0x0000
+0x0408=0x0000
+0x0409=0x0000
+0x040A=0x0003
+0x040B=0x000F
+0x040C=0x00F8
+0x040D=0x0000
+0x040E=0x0000
+0x040F=0x0000
+0x0440=0x0020
+0x0441=0x0000
+0x0442=0x2B55
+0x0443=0x5540
+0x0444=0x0000
+0x0445=0x0000
+0x0446=0x0000
+0x0447=0x0000
+0x0448=0x0000
+0x0449=0x0000
+0x044A=0x0000
+0x044B=0x0000
+0x044C=0x0000
+0x044D=0x0000
+0x044E=0x0000
+0x044F=0x0000
+0x0450=0x0000
+0x0451=0x0000
+0x0452=0x0000
+0x0453=0x0000
+0x0454=0x0000
+0x0455=0x0000
+0x0456=0x0000
+0x0457=0x0000
+0x0458=0x0000
+0x0459=0x0000
+0x045A=0x0000
+0x045B=0x0000
+0x045C=0x0000
+0x045D=0x0000
+0x045E=0x0000
+0x045F=0x0000
+0x0460=0x0000
+0x0461=0x0000
+0x0480=0x0000
+0x0481=0x0000
+0x0482=0x0000
+0x0483=0x0000
+0x0484=0x0000
+0x0485=0x0000
+0x0486=0x0000
+0x0487=0x0000
+0x0488=0x0000
+0x0489=0x0000
+0x048A=0x0000
+0x048B=0x0000
+0x048C=0x0000
+0x048D=0x0000
+0x048E=0x0000
+0x048F=0x0000
+0x0490=0x0000
+0x0491=0x0000
+0x0492=0x0000
+0x0493=0x0000
+0x0494=0x0000
+0x0495=0x0000
+0x0496=0x0000
+0x0497=0x0000
+0x0498=0x0000
+0x0499=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x049C=0x0000
+0x049D=0x0000
+0x049E=0x0000
+0x049F=0x0000
+0x04A0=0x0000
+0x04A1=0x0000
+0x04A2=0x0000
+0x04A3=0x0000
+0x04A4=0x0000
+0x04A5=0x0000
+0x04A6=0x0000
+0x04A7=0x0000
+0x04C0=0x0000
+0x04C1=0x0000
+0x04C2=0x0000
+0x04C3=0x0000
+0x04C4=0x0000
+0x04C5=0x0000
+0x04C6=0x0000
+0x04C7=0x0000
+0x04C8=0x0000
+0x04C9=0x0000
+0x04CA=0x0000
+0x04CB=0x0000
+0x04CC=0x0000
+0x04CD=0x0000
+0x04CE=0x0000
+0x04CF=0x0000
+0x04D0=0x0000
+0x04D1=0x0000
+0x04D2=0x0000
+0x04D3=0x0000
+0x04D4=0x0000
+0x04D5=0x0000
+0x04D6=0x0000
+0x04D7=0x0000
+0x04D8=0x0000
+0x04D9=0x0000
+0x04DA=0x0000
+0x04DB=0x0000
+0x04DC=0x0000
+0x04DD=0x0000
+0x04DE=0x0000
+0x04DF=0x0000
+0x04E0=0x0000
+0x04E1=0x0000
+0x04E2=0x0000
+0x04E3=0x0000
+0x04E4=0x0000
+0x04E5=0x0000
+0x04E6=0x0000
+0x04E7=0x0000
+0x0500=0x0000
+0x0501=0x0000
+0x0502=0x0000
+0x0503=0x0000
+0x0504=0x0000
+0x0505=0x0000
+0x0506=0x0000
+0x0507=0x0000
+0x0508=0x0000
+0x0509=0x0000
+0x050A=0x0000
+0x050B=0x0000
+0x050C=0x0000
+0x050D=0x0000
+0x050E=0x0000
+0x050F=0x0000
+0x0510=0x0000
+0x0511=0x0000
+0x0512=0x0000
+0x0513=0x0000
+0x0514=0x0000
+0x0515=0x0000
+0x0516=0x0000
+0x0517=0x0000
+0x0518=0x0000
+0x0519=0x0000
+0x051A=0x0000
+0x051B=0x0000
+0x051C=0x0000
+0x051D=0x0000
+0x051E=0x0000
+0x051F=0x0000
+0x0520=0x0000
+0x0521=0x0000
+0x0522=0x0000
+0x0523=0x0000
+0x0524=0x0000
+0x0525=0x0000
+0x0526=0x0000
+0x0527=0x0000
+0x0540=0x0000
+0x0541=0x0000
+0x0542=0x0000
+0x0543=0x0000
+0x0544=0x0000
+0x0545=0x0000
+0x0546=0x0000
+0x0547=0x0000
+0x0548=0x0000
+0x0549=0x0000
+0x054A=0x0000
+0x054B=0x0000
+0x054C=0x0000
+0x054D=0x0000
+0x054E=0x0000
+0x054F=0x0000
+0x0550=0x0000
+0x0551=0x0000
+0x0552=0x0000
+0x0553=0x0000
+0x0554=0x0000
+0x0555=0x0000
+0x0556=0x0000
+0x0557=0x0000
+0x0558=0x0000
+0x0559=0x0000
+0x055A=0x0000
+0x055B=0x0000
+0x055C=0x0000
+0x055D=0x0000
+0x055E=0x0000
+0x055F=0x0000
+0x0560=0x0000
+0x0561=0x0000
+0x0562=0x0000
+0x0563=0x0000
+0x0564=0x0000
+0x0565=0x0000
+0x0566=0x0000
+0x0567=0x0000
+0x0580=0x0000
+0x0581=0x0000
+0x0582=0x0000
+0x0583=0x0000
+0x0584=0x0000
+0x0585=0x0000
+0x0586=0x0000
+0x0587=0x0000
+0x0588=0x0000
+0x0589=0x0000
+0x058A=0x0000
+0x058B=0x0000
+0x058C=0x0000
+0x058D=0x0000
+0x058E=0x0000
+0x058F=0x0000
+0x0590=0x0000
+0x0591=0x0000
+0x0592=0x0000
+0x0593=0x0000
+0x0594=0x0000
+0x0595=0x0000
+0x0596=0x0000
+0x0597=0x0000
+0x0598=0x0000
+0x0599=0x0000
+0x059A=0x0000
+0x059B=0x0000
+0x059C=0x0000
+0x059D=0x0000
+0x059E=0x0000
+0x059F=0x0000
+0x05A0=0x0000
+0x05A1=0x0000
+0x05A2=0x0000
+0x05A3=0x0000
+0x05A4=0x0000
+0x05A5=0x0000
+0x05A6=0x0000
+0x05A7=0x0000
+[lms7002_registers_b]
+0x0100=0x340F
+0x0101=0x7800
+0x0102=0x3180
+0x0103=0x0612
+0x0104=0x0088
+0x0105=0x001F
+0x0106=0x3182
+0x0107=0x318C
+0x0108=0x9442
+0x0109=0x61C1
+0x010A=0x104C
+0x010C=0x88FF
+0x010D=0x001E
+0x010E=0x2040
+0x010F=0x3042
+0x0110=0x0BF4
+0x0111=0x0083
+0x0112=0x9407
+0x0113=0x03C3
+0x0114=0x00D0
+0x0115=0x000F
+0x0116=0x8180
+0x0117=0x1217
+0x0118=0x018C
+0x0119=0x5280
+0x011A=0x3E03
+0x011C=0xAD41
+0x011D=0xC000
+0x011E=0x06F3
+0x011F=0x3680
+0x0120=0xB9FF
+0x0121=0x346C
+0x0122=0x033F
+0x0123=0x267B
+0x0124=0x0000
+0x0200=0x0101
+0x0201=0x07FF
+0x0202=0x07FF
+0x0203=0x0000
+0x0204=0x0000
+0x0205=0x0000
+0x0206=0x0000
+0x0207=0x0000
+0x0208=0x01F0
+0x0209=0x0000
+0x020A=0x0080
+0x020B=0x0000
+0x020C=0x7FFF
+0x0240=0x0020
+0x0241=0x0000
+0x0242=0x0000
+0x0243=0x0000
+0x0244=0x0000
+0x0245=0x0000
+0x0246=0x0000
+0x0247=0x0000
+0x0248=0x0000
+0x0249=0x0000
+0x024A=0x0000
+0x024B=0x0000
+0x024C=0x0000
+0x024D=0x0000
+0x024E=0x0000
+0x024F=0x0000
+0x0250=0x0000
+0x0251=0x0000
+0x0252=0x0000
+0x0253=0x0000
+0x0254=0x0000
+0x0255=0x0000
+0x0256=0x0000
+0x0257=0x0000
+0x0258=0x0000
+0x0259=0x0000
+0x025A=0x0000
+0x025B=0x0000
+0x025C=0x0000
+0x025D=0x0000
+0x025E=0x0000
+0x025F=0x0000
+0x0260=0x0000
+0x0261=0x0000
+0x0280=0x0000
+0x0281=0x0000
+0x0282=0x0000
+0x0283=0x0000
+0x0284=0x0000
+0x0285=0x0000
+0x0286=0x0000
+0x0287=0x0000
+0x0288=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x028B=0x0000
+0x028C=0x0000
+0x028D=0x0000
+0x028E=0x0000
+0x028F=0x0000
+0x0290=0x0000
+0x0291=0x0000
+0x0292=0x0000
+0x0293=0x0000
+0x0294=0x0000
+0x0295=0x0000
+0x0296=0x0000
+0x0297=0x0000
+0x0298=0x0000
+0x0299=0x0000
+0x029A=0x0000
+0x029B=0x0000
+0x029C=0x0000
+0x029D=0x0000
+0x029E=0x0000
+0x029F=0x0000
+0x02A0=0x0000
+0x02A1=0x0000
+0x02A2=0x0000
+0x02A3=0x0000
+0x02A4=0x0000
+0x02A5=0x0000
+0x02A6=0x0000
+0x02A7=0x0000
+0x02C0=0x0000
+0x02C1=0x0000
+0x02C2=0x0000
+0x02C3=0x0000
+0x02C4=0x0000
+0x02C5=0x0000
+0x02C6=0x0000
+0x02C7=0x0000
+0x02C8=0x0000
+0x02C9=0x0000
+0x02CA=0x0000
+0x02CB=0x0000
+0x02CC=0x0000
+0x02CD=0x0000
+0x02CE=0x0000
+0x02CF=0x0000
+0x02D0=0x0000
+0x02D1=0x0000
+0x02D2=0x0000
+0x02D3=0x0000
+0x02D4=0x0000
+0x02D5=0x0000
+0x02D6=0x0000
+0x02D7=0x0000
+0x02D8=0x0000
+0x02D9=0x0000
+0x02DA=0x0000
+0x02DB=0x0000
+0x02DC=0x0000
+0x02DD=0x0000
+0x02DE=0x0000
+0x02DF=0x0000
+0x02E0=0x0000
+0x02E1=0x0000
+0x02E2=0x0000
+0x02E3=0x0000
+0x02E4=0x0000
+0x02E5=0x0000
+0x02E6=0x0000
+0x02E7=0x0000
+0x0300=0x0000
+0x0301=0x0000
+0x0302=0x0000
+0x0303=0x0000
+0x0304=0x0000
+0x0305=0x0000
+0x0306=0x0000
+0x0307=0x0000
+0x0308=0x0000
+0x0309=0x0000
+0x030A=0x0000
+0x030B=0x0000
+0x030C=0x0000
+0x030D=0x0000
+0x030E=0x0000
+0x030F=0x0000
+0x0310=0x0000
+0x0311=0x0000
+0x0312=0x0000
+0x0313=0x0000
+0x0314=0x0000
+0x0315=0x0000
+0x0316=0x0000
+0x0317=0x0000
+0x0318=0x0000
+0x0319=0x0000
+0x031A=0x0000
+0x031B=0x0000
+0x031C=0x0000
+0x031D=0x0000
+0x031E=0x0000
+0x031F=0x0000
+0x0320=0x0000
+0x0321=0x0000
+0x0322=0x0000
+0x0323=0x0000
+0x0324=0x0000
+0x0325=0x0000
+0x0326=0x0000
+0x0327=0x0000
+0x0340=0x0000
+0x0341=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0345=0x0000
+0x0346=0x0000
+0x0347=0x0000
+0x0348=0x0000
+0x0349=0x0000
+0x034A=0x0000
+0x034B=0x0000
+0x034C=0x0000
+0x034D=0x0000
+0x034E=0x0000
+0x034F=0x0000
+0x0350=0x0000
+0x0351=0x0000
+0x0352=0x0000
+0x0353=0x0000
+0x0354=0x0000
+0x0355=0x0000
+0x0356=0x0000
+0x0357=0x0000
+0x0358=0x0000
+0x0359=0x0000
+0x035A=0x0000
+0x035B=0x0000
+0x035C=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x035F=0x0000
+0x0360=0x0000
+0x0361=0x0000
+0x0362=0x0000
+0x0363=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0367=0x0000
+0x0380=0x0000
+0x0381=0x0000
+0x0382=0x0000
+0x0383=0x0000
+0x0384=0x0000
+0x0385=0x0000
+0x0386=0x0000
+0x0387=0x0000
+0x0388=0x0000
+0x0389=0x0000
+0x038A=0x0000
+0x038B=0x0000
+0x038C=0x0000
+0x038D=0x0000
+0x038E=0x0000
+0x038F=0x0000
+0x0390=0x0000
+0x0391=0x0000
+0x0392=0x0000
+0x0393=0x0000
+0x0394=0x0000
+0x0395=0x0000
+0x0396=0x0000
+0x0397=0x0000
+0x0398=0x0000
+0x0399=0x0000
+0x039A=0x0000
+0x039B=0x0000
+0x039C=0x0000
+0x039D=0x0000
+0x039E=0x0000
+0x039F=0x0000
+0x03A0=0x0000
+0x03A1=0x0000
+0x03A2=0x0000
+0x03A3=0x0000
+0x03A4=0x0000
+0x03A5=0x0000
+0x03A6=0x0000
+0x03A7=0x0000
+0x0400=0x0105
+0x0401=0x07FF
+0x0402=0x07FF
+0x0403=0x0000
+0x0404=0x0000
+0x0405=0x0000
+0x0406=0x0000
+0x0407=0x0000
+0x0408=0x0000
+0x0409=0x0000
+0x040A=0x0000
+0x040B=0x7FFF
+0x040C=0x00FF
+0x040D=0x0000
+0x040E=0x0002
+0x040F=0x0000
+0x0440=0x0020
+0x0441=0x0000
+0x0442=0x0000
+0x0443=0x0000
+0x0444=0x0000
+0x0445=0x0000
+0x0446=0x0000
+0x0447=0x0000
+0x0448=0x0000
+0x0449=0x0000
+0x044A=0x0000
+0x044B=0x0000
+0x044C=0x0000
+0x044D=0x0000
+0x044E=0x0000
+0x044F=0x0000
+0x0450=0x0000
+0x0451=0x0000
+0x0452=0x0000
+0x0453=0x0000
+0x0454=0x0000
+0x0455=0x0000
+0x0456=0x0000
+0x0457=0x0000
+0x0458=0x0000
+0x0459=0x0000
+0x045A=0x0000
+0x045B=0x0000
+0x045C=0x0000
+0x045D=0x0000
+0x045E=0x0000
+0x045F=0x0000
+0x0460=0x0000
+0x0461=0x0000
+0x0480=0x0000
+0x0481=0x0000
+0x0482=0x0000
+0x0483=0x0000
+0x0484=0x0000
+0x0485=0x0000
+0x0486=0x0000
+0x0487=0x0000
+0x0488=0x0000
+0x0489=0x0000
+0x048A=0x0000
+0x048B=0x0000
+0x048C=0x0000
+0x048D=0x0000
+0x048E=0x0000
+0x048F=0x0000
+0x0490=0x0000
+0x0491=0x0000
+0x0492=0x0000
+0x0493=0x0000
+0x0494=0x0000
+0x0495=0x0000
+0x0496=0x0000
+0x0497=0x0000
+0x0498=0x0000
+0x0499=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x049C=0x0000
+0x049D=0x0000
+0x049E=0x0000
+0x049F=0x0000
+0x04A0=0x0000
+0x04A1=0x0000
+0x04A2=0x0000
+0x04A3=0x0000
+0x04A4=0x0000
+0x04A5=0x0000
+0x04A6=0x0000
+0x04A7=0x0000
+0x04C0=0x0000
+0x04C1=0x0000
+0x04C2=0x0000
+0x04C3=0x0000
+0x04C4=0x0000
+0x04C5=0x0000
+0x04C6=0x0000
+0x04C7=0x0000
+0x04C8=0x0000
+0x04C9=0x0000
+0x04CA=0x0000
+0x04CB=0x0000
+0x04CC=0x0000
+0x04CD=0x0000
+0x04CE=0x0000
+0x04CF=0x0000
+0x04D0=0x0000
+0x04D1=0x0000
+0x04D2=0x0000
+0x04D3=0x0000
+0x04D4=0x0000
+0x04D5=0x0000
+0x04D6=0x0000
+0x04D7=0x0000
+0x04D8=0x0000
+0x04D9=0x0000
+0x04DA=0x0000
+0x04DB=0x0000
+0x04DC=0x0000
+0x04DD=0x0000
+0x04DE=0x0000
+0x04DF=0x0000
+0x04E0=0x0000
+0x04E1=0x0000
+0x04E2=0x0000
+0x04E3=0x0000
+0x04E4=0x0000
+0x04E5=0x0000
+0x04E6=0x0000
+0x04E7=0x0000
+0x0500=0x0000
+0x0501=0x0000
+0x0502=0x0000
+0x0503=0x0000
+0x0504=0x0000
+0x0505=0x0000
+0x0506=0x0000
+0x0507=0x0000
+0x0508=0x0000
+0x0509=0x0000
+0x050A=0x0000
+0x050B=0x0000
+0x050C=0x0000
+0x050D=0x0000
+0x050E=0x0000
+0x050F=0x0000
+0x0510=0x0000
+0x0511=0x0000
+0x0512=0x0000
+0x0513=0x0000
+0x0514=0x0000
+0x0515=0x0000
+0x0516=0x0000
+0x0517=0x0000
+0x0518=0x0000
+0x0519=0x0000
+0x051A=0x0000
+0x051B=0x0000
+0x051C=0x0000
+0x051D=0x0000
+0x051E=0x0000
+0x051F=0x0000
+0x0520=0x0000
+0x0521=0x0000
+0x0522=0x0000
+0x0523=0x0000
+0x0524=0x0000
+0x0525=0x0000
+0x0526=0x0000
+0x0527=0x0000
+0x0540=0x0000
+0x0541=0x0000
+0x0542=0x0000
+0x0543=0x0000
+0x0544=0x0000
+0x0545=0x0000
+0x0546=0x0000
+0x0547=0x0000
+0x0548=0x0000
+0x0549=0x0000
+0x054A=0x0000
+0x054B=0x0000
+0x054C=0x0000
+0x054D=0x0000
+0x054E=0x0000
+0x054F=0x0000
+0x0550=0x0000
+0x0551=0x0000
+0x0552=0x0000
+0x0553=0x0000
+0x0554=0x0000
+0x0555=0x0000
+0x0556=0x0000
+0x0557=0x0000
+0x0558=0x0000
+0x0559=0x0000
+0x055A=0x0000
+0x055B=0x0000
+0x055C=0x0000
+0x055D=0x0000
+0x055E=0x0000
+0x055F=0x0000
+0x0560=0x0000
+0x0561=0x0000
+0x0562=0x0000
+0x0563=0x0000
+0x0564=0x0000
+0x0565=0x0000
+0x0566=0x0000
+0x0567=0x0000
+0x0580=0x0000
+0x0581=0x0000
+0x0582=0x0000
+0x0583=0x0000
+0x0584=0x0000
+0x0585=0x0000
+0x0586=0x0000
+0x0587=0x0000
+0x0588=0x0000
+0x0589=0x0000
+0x058A=0x0000
+0x058B=0x0000
+0x058C=0x0000
+0x058D=0x0000
+0x058E=0x0000
+0x058F=0x0000
+0x0590=0x0000
+0x0591=0x0000
+0x0592=0x0000
+0x0593=0x0000
+0x0594=0x0000
+0x0595=0x0000
+0x0596=0x0000
+0x0597=0x0000
+0x0598=0x0000
+0x0599=0x0000
+0x059A=0x0000
+0x059B=0x0000
+0x059C=0x0000
+0x059D=0x0000
+0x059E=0x0000
+0x059F=0x0000
+0x05A0=0x0000
+0x05A1=0x0000
+0x05A2=0x0000
+0x05A3=0x0000
+0x05A4=0x0000
+0x05A5=0x0000
+0x05A6=0x0000
+0x05A7=0x0000
+[reference_clocks]
+sxt_ref_clk_mhz=30.72
+sxr_ref_clk_mhz=30.72
diff --git a/targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz_1v4.ini b/targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz_1v4.ini
new file mode 100755
index 0000000000000000000000000000000000000000..7c94b3dd5bf801dc3370a07bb6c38a4aafd6a29e
--- /dev/null
+++ b/targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz_1v4.ini
@@ -0,0 +1,1128 @@
+[file_info]
+type=lms7002m_minimal_config
+version=1
+[lms7002_registers_a]
+0x0020=0xFFFD
+0x0021=0x0E9F
+0x0022=0x07FF
+0x0023=0x5550
+0x0024=0xB1E4
+0x0025=0x0101
+0x0026=0x0101
+0x0027=0xB1E4
+0x0028=0x0101
+0x0029=0x0101
+0x002A=0x0086
+0x002B=0x0038
+0x002C=0x0000
+0x002D=0x0000
+0x002E=0x0000
+0x002F=0x3841
+0x0081=0x0000
+0x0082=0x800B
+0x0084=0x0400
+0x0085=0x0001
+0x0086=0x4101
+0x0087=0x0000
+0x0088=0x04B0
+0x0089=0x1090
+0x008A=0x0514
+0x008B=0x2138
+0x008C=0x267B
+0x0092=0x0001
+0x0093=0x0000
+0x0094=0x0000
+0x0095=0x0000
+0x0096=0x0000
+0x0097=0x0000
+0x0098=0x0000
+0x0099=0x6565
+0x009A=0x658C
+0x009B=0x6565
+0x009C=0x658C
+0x009D=0x6565
+0x009E=0x658C
+0x009F=0x658C
+0x00A0=0x6565
+0x00A1=0x6565
+0x00A2=0x6565
+0x00A3=0x6565
+0x00A4=0x6565
+0x00A5=0x6565
+0x00A6=0x000F
+0x00A7=0x6565
+0x00A8=0x0000
+0x00A9=0x0000
+0x00AA=0x0000
+0x00AB=0x0040
+0x00AC=0x0000
+0x00AD=0x03FF
+0x00AE=0x0000
+0x0100=0x3409
+0x0101=0x7800
+0x0102=0x3180
+0x0103=0x0A12
+0x0104=0x0088
+0x0105=0x0011
+0x0106=0x318C
+0x0107=0x318C
+0x0108=0x298C
+0x0109=0x6104
+0x010A=0x17BD
+0x010C=0x8865
+0x010D=0x015A
+0x010E=0x0000
+0x010F=0x30C6
+0x0110=0x0BFF
+0x0111=0x0083
+0x0112=0x9407
+0x0113=0x0303
+0x0114=0x00D0
+0x0115=0x0009
+0x0116=0x8180
+0x0117=0x1217
+0x0118=0x018C
+0x0119=0x528C
+0x011A=0x3E03
+0x011C=0xAD41
+0x011D=0xC000
+0x011E=0x068F
+0x011F=0x3680
+0x0120=0xB9FF
+0x0121=0x3234
+0x0122=0x033F
+0x0123=0x267B
+0x0124=0x0000
+0x0200=0x0081
+0x0201=0x07FF
+0x0202=0x07FF
+0x0203=0x0000
+0x0204=0x0000
+0x0205=0x0000
+0x0206=0x0000
+0x0207=0x0000
+0x0208=0x0170
+0x0209=0x0000
+0x020A=0x0080
+0x020B=0x0000
+0x020C=0x8000
+0x0240=0x0020
+0x0241=0x0000
+0x0242=0x0000
+0x0243=0x0000
+0x0244=0x0000
+0x0245=0x0000
+0x0246=0x0000
+0x0247=0x0000
+0x0248=0x0000
+0x0249=0x0000
+0x024A=0x0000
+0x024B=0x0000
+0x024C=0x0000
+0x024D=0x0000
+0x024E=0x0000
+0x024F=0x0000
+0x0250=0x0000
+0x0251=0x0000
+0x0252=0x0000
+0x0253=0x0000
+0x0254=0x0000
+0x0255=0x0000
+0x0256=0x0000
+0x0257=0x0000
+0x0258=0x0000
+0x0259=0x0000
+0x025A=0x0000
+0x025B=0x0000
+0x025C=0x0000
+0x025D=0x0000
+0x025E=0x0000
+0x025F=0x0000
+0x0260=0x0000
+0x0261=0x0000
+0x0280=0x0000
+0x0281=0x0000
+0x0282=0x0000
+0x0283=0x0000
+0x0284=0x0000
+0x0285=0x0000
+0x0286=0x0000
+0x0287=0x0000
+0x0288=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x028B=0x0000
+0x028C=0x0000
+0x028D=0x0000
+0x028E=0x0000
+0x028F=0x0000
+0x0290=0x0000
+0x0291=0x0000
+0x0292=0x0000
+0x0293=0x0000
+0x0294=0x0000
+0x0295=0x0000
+0x0296=0x0000
+0x0297=0x0000
+0x0298=0x0000
+0x0299=0x0000
+0x029A=0x0000
+0x029B=0x0000
+0x029C=0x0000
+0x029D=0x0000
+0x029E=0x0000
+0x029F=0x0000
+0x02A0=0x0000
+0x02A1=0x0000
+0x02A2=0x0000
+0x02A3=0x0000
+0x02A4=0x0000
+0x02A5=0x0000
+0x02A6=0x0000
+0x02A7=0x0000
+0x02C0=0x0000
+0x02C1=0x0000
+0x02C2=0x0000
+0x02C3=0x0000
+0x02C4=0x0000
+0x02C5=0x0000
+0x02C6=0x0000
+0x02C7=0x0000
+0x02C8=0x0000
+0x02C9=0x0000
+0x02CA=0x0000
+0x02CB=0x0000
+0x02CC=0x0000
+0x02CD=0x0000
+0x02CE=0x0000
+0x02CF=0x0000
+0x02D0=0x0000
+0x02D1=0x0000
+0x02D2=0x0000
+0x02D3=0x0000
+0x02D4=0x0000
+0x02D5=0x0000
+0x02D6=0x0000
+0x02D7=0x0000
+0x02D8=0x0000
+0x02D9=0x0000
+0x02DA=0x0000
+0x02DB=0x0000
+0x02DC=0x0000
+0x02DD=0x0000
+0x02DE=0x0000
+0x02DF=0x0000
+0x02E0=0x0000
+0x02E1=0x0000
+0x02E2=0x0000
+0x02E3=0x0000
+0x02E4=0x0000
+0x02E5=0x0000
+0x02E6=0x0000
+0x02E7=0x0000
+0x0300=0x0000
+0x0301=0x0000
+0x0302=0x0000
+0x0303=0x0000
+0x0304=0x0000
+0x0305=0x0000
+0x0306=0x0000
+0x0307=0x0000
+0x0308=0x0000
+0x0309=0x0000
+0x030A=0x0000
+0x030B=0x0000
+0x030C=0x0000
+0x030D=0x0000
+0x030E=0x0000
+0x030F=0x0000
+0x0310=0x0000
+0x0311=0x0000
+0x0312=0x0000
+0x0313=0x0000
+0x0314=0x0000
+0x0315=0x0000
+0x0316=0x0000
+0x0317=0x0000
+0x0318=0x0000
+0x0319=0x0000
+0x031A=0x0000
+0x031B=0x0000
+0x031C=0x0000
+0x031D=0x0000
+0x031E=0x0000
+0x031F=0x0000
+0x0320=0x0000
+0x0321=0x0000
+0x0322=0x0000
+0x0323=0x0000
+0x0324=0x0000
+0x0325=0x0000
+0x0326=0x0000
+0x0327=0x0000
+0x0340=0x0000
+0x0341=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0345=0x0000
+0x0346=0x0000
+0x0347=0x0000
+0x0348=0x0000
+0x0349=0x0000
+0x034A=0x0000
+0x034B=0x0000
+0x034C=0x0000
+0x034D=0x0000
+0x034E=0x0000
+0x034F=0x0000
+0x0350=0x0000
+0x0351=0x0000
+0x0352=0x0000
+0x0353=0x0000
+0x0354=0x0000
+0x0355=0x0000
+0x0356=0x0000
+0x0357=0x0000
+0x0358=0x0000
+0x0359=0x0000
+0x035A=0x0000
+0x035B=0x0000
+0x035C=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x035F=0x0000
+0x0360=0x0000
+0x0361=0x0000
+0x0362=0x0000
+0x0363=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0367=0x0000
+0x0380=0x0000
+0x0381=0x0000
+0x0382=0x0000
+0x0383=0x0000
+0x0384=0x0000
+0x0385=0x0000
+0x0386=0x0000
+0x0387=0x0000
+0x0388=0x0000
+0x0389=0x0000
+0x038A=0x0000
+0x038B=0x0000
+0x038C=0x0000
+0x038D=0x0000
+0x038E=0x0000
+0x038F=0x0000
+0x0390=0x0000
+0x0391=0x0000
+0x0392=0x0000
+0x0393=0x0000
+0x0394=0x0000
+0x0395=0x0000
+0x0396=0x0000
+0x0397=0x0000
+0x0398=0x0000
+0x0399=0x0000
+0x039A=0x0000
+0x039B=0x0000
+0x039C=0x0000
+0x039D=0x0000
+0x039E=0x0000
+0x039F=0x0000
+0x03A0=0x0000
+0x03A1=0x0000
+0x03A2=0x0000
+0x03A3=0x0000
+0x03A4=0x0000
+0x03A5=0x0000
+0x03A6=0x0000
+0x03A7=0x0000
+0x0400=0x8081
+0x0401=0x07FF
+0x0402=0x07FF
+0x0403=0x0000
+0x0404=0x0000
+0x0405=0x0000
+0x0406=0x0000
+0x0407=0x0000
+0x0408=0x0000
+0x0409=0x0000
+0x040A=0x0003
+0x040B=0x000F
+0x040C=0x00F8
+0x040D=0x0000
+0x040E=0x0000
+0x040F=0x0000
+0x0440=0x0020
+0x0441=0x0000
+0x0442=0x2B55
+0x0443=0x5540
+0x0444=0x0000
+0x0445=0x0000
+0x0446=0x0000
+0x0447=0x0000
+0x0448=0x0000
+0x0449=0x0000
+0x044A=0x0000
+0x044B=0x0000
+0x044C=0x0000
+0x044D=0x0000
+0x044E=0x0000
+0x044F=0x0000
+0x0450=0x0000
+0x0451=0x0000
+0x0452=0x0000
+0x0453=0x0000
+0x0454=0x0000
+0x0455=0x0000
+0x0456=0x0000
+0x0457=0x0000
+0x0458=0x0000
+0x0459=0x0000
+0x045A=0x0000
+0x045B=0x0000
+0x045C=0x0000
+0x045D=0x0000
+0x045E=0x0000
+0x045F=0x0000
+0x0460=0x0000
+0x0461=0x0000
+0x0480=0x0000
+0x0481=0x0000
+0x0482=0x0000
+0x0483=0x0000
+0x0484=0x0000
+0x0485=0x0000
+0x0486=0x0000
+0x0487=0x0000
+0x0488=0x0000
+0x0489=0x0000
+0x048A=0x0000
+0x048B=0x0000
+0x048C=0x0000
+0x048D=0x0000
+0x048E=0x0000
+0x048F=0x0000
+0x0490=0x0000
+0x0491=0x0000
+0x0492=0x0000
+0x0493=0x0000
+0x0494=0x0000
+0x0495=0x0000
+0x0496=0x0000
+0x0497=0x0000
+0x0498=0x0000
+0x0499=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x049C=0x0000
+0x049D=0x0000
+0x049E=0x0000
+0x049F=0x0000
+0x04A0=0x0000
+0x04A1=0x0000
+0x04A2=0x0000
+0x04A3=0x0000
+0x04A4=0x0000
+0x04A5=0x0000
+0x04A6=0x0000
+0x04A7=0x0000
+0x04C0=0x0000
+0x04C1=0x0000
+0x04C2=0x0000
+0x04C3=0x0000
+0x04C4=0x0000
+0x04C5=0x0000
+0x04C6=0x0000
+0x04C7=0x0000
+0x04C8=0x0000
+0x04C9=0x0000
+0x04CA=0x0000
+0x04CB=0x0000
+0x04CC=0x0000
+0x04CD=0x0000
+0x04CE=0x0000
+0x04CF=0x0000
+0x04D0=0x0000
+0x04D1=0x0000
+0x04D2=0x0000
+0x04D3=0x0000
+0x04D4=0x0000
+0x04D5=0x0000
+0x04D6=0x0000
+0x04D7=0x0000
+0x04D8=0x0000
+0x04D9=0x0000
+0x04DA=0x0000
+0x04DB=0x0000
+0x04DC=0x0000
+0x04DD=0x0000
+0x04DE=0x0000
+0x04DF=0x0000
+0x04E0=0x0000
+0x04E1=0x0000
+0x04E2=0x0000
+0x04E3=0x0000
+0x04E4=0x0000
+0x04E5=0x0000
+0x04E6=0x0000
+0x04E7=0x0000
+0x0500=0x0000
+0x0501=0x0000
+0x0502=0x0000
+0x0503=0x0000
+0x0504=0x0000
+0x0505=0x0000
+0x0506=0x0000
+0x0507=0x0000
+0x0508=0x0000
+0x0509=0x0000
+0x050A=0x0000
+0x050B=0x0000
+0x050C=0x0000
+0x050D=0x0000
+0x050E=0x0000
+0x050F=0x0000
+0x0510=0x0000
+0x0511=0x0000
+0x0512=0x0000
+0x0513=0x0000
+0x0514=0x0000
+0x0515=0x0000
+0x0516=0x0000
+0x0517=0x0000
+0x0518=0x0000
+0x0519=0x0000
+0x051A=0x0000
+0x051B=0x0000
+0x051C=0x0000
+0x051D=0x0000
+0x051E=0x0000
+0x051F=0x0000
+0x0520=0x0000
+0x0521=0x0000
+0x0522=0x0000
+0x0523=0x0000
+0x0524=0x0000
+0x0525=0x0000
+0x0526=0x0000
+0x0527=0x0000
+0x0540=0x0000
+0x0541=0x0000
+0x0542=0x0000
+0x0543=0x0000
+0x0544=0x0000
+0x0545=0x0000
+0x0546=0x0000
+0x0547=0x0000
+0x0548=0x0000
+0x0549=0x0000
+0x054A=0x0000
+0x054B=0x0000
+0x054C=0x0000
+0x054D=0x0000
+0x054E=0x0000
+0x054F=0x0000
+0x0550=0x0000
+0x0551=0x0000
+0x0552=0x0000
+0x0553=0x0000
+0x0554=0x0000
+0x0555=0x0000
+0x0556=0x0000
+0x0557=0x0000
+0x0558=0x0000
+0x0559=0x0000
+0x055A=0x0000
+0x055B=0x0000
+0x055C=0x0000
+0x055D=0x0000
+0x055E=0x0000
+0x055F=0x0000
+0x0560=0x0000
+0x0561=0x0000
+0x0562=0x0000
+0x0563=0x0000
+0x0564=0x0000
+0x0565=0x0000
+0x0566=0x0000
+0x0567=0x0000
+0x0580=0x0000
+0x0581=0x0000
+0x0582=0x0000
+0x0583=0x0000
+0x0584=0x0000
+0x0585=0x0000
+0x0586=0x0000
+0x0587=0x0000
+0x0588=0x0000
+0x0589=0x0000
+0x058A=0x0000
+0x058B=0x0000
+0x058C=0x0000
+0x058D=0x0000
+0x058E=0x0000
+0x058F=0x0000
+0x0590=0x0000
+0x0591=0x0000
+0x0592=0x0000
+0x0593=0x0000
+0x0594=0x0000
+0x0595=0x0000
+0x0596=0x0000
+0x0597=0x0000
+0x0598=0x0000
+0x0599=0x0000
+0x059A=0x0000
+0x059B=0x0000
+0x059C=0x0000
+0x059D=0x0000
+0x059E=0x0000
+0x059F=0x0000
+0x05A0=0x0000
+0x05A1=0x0000
+0x05A2=0x0000
+0x05A3=0x0000
+0x05A4=0x0000
+0x05A5=0x0000
+0x05A6=0x0000
+0x05A7=0x0000
+[lms7002_registers_b]
+0x0100=0x340F
+0x0101=0x7800
+0x0102=0x3180
+0x0103=0x0612
+0x0104=0x0088
+0x0105=0x001F
+0x0106=0x3182
+0x0107=0x318C
+0x0108=0x9442
+0x0109=0x61C1
+0x010A=0x104C
+0x010C=0x88FF
+0x010D=0x001E
+0x010E=0x2040
+0x010F=0x3042
+0x0110=0x0BF4
+0x0111=0x0083
+0x0112=0x9407
+0x0113=0x03C3
+0x0114=0x00D0
+0x0115=0x000F
+0x0116=0x8180
+0x0117=0x1217
+0x0118=0x018C
+0x0119=0x5280
+0x011A=0x3E03
+0x011C=0xAD41
+0x011D=0xC000
+0x011E=0x06F3
+0x011F=0x3680
+0x0120=0xB9FF
+0x0121=0x346C
+0x0122=0x033F
+0x0123=0x267B
+0x0124=0x0000
+0x0200=0x0101
+0x0201=0x07FF
+0x0202=0x07FF
+0x0203=0x0000
+0x0204=0x0000
+0x0205=0x0000
+0x0206=0x0000
+0x0207=0x0000
+0x0208=0x01F0
+0x0209=0x0000
+0x020A=0x0080
+0x020B=0x0000
+0x020C=0x7FFF
+0x0240=0x0020
+0x0241=0x0000
+0x0242=0x0000
+0x0243=0x0000
+0x0244=0x0000
+0x0245=0x0000
+0x0246=0x0000
+0x0247=0x0000
+0x0248=0x0000
+0x0249=0x0000
+0x024A=0x0000
+0x024B=0x0000
+0x024C=0x0000
+0x024D=0x0000
+0x024E=0x0000
+0x024F=0x0000
+0x0250=0x0000
+0x0251=0x0000
+0x0252=0x0000
+0x0253=0x0000
+0x0254=0x0000
+0x0255=0x0000
+0x0256=0x0000
+0x0257=0x0000
+0x0258=0x0000
+0x0259=0x0000
+0x025A=0x0000
+0x025B=0x0000
+0x025C=0x0000
+0x025D=0x0000
+0x025E=0x0000
+0x025F=0x0000
+0x0260=0x0000
+0x0261=0x0000
+0x0280=0x0000
+0x0281=0x0000
+0x0282=0x0000
+0x0283=0x0000
+0x0284=0x0000
+0x0285=0x0000
+0x0286=0x0000
+0x0287=0x0000
+0x0288=0x0000
+0x0289=0x0000
+0x028A=0x0000
+0x028B=0x0000
+0x028C=0x0000
+0x028D=0x0000
+0x028E=0x0000
+0x028F=0x0000
+0x0290=0x0000
+0x0291=0x0000
+0x0292=0x0000
+0x0293=0x0000
+0x0294=0x0000
+0x0295=0x0000
+0x0296=0x0000
+0x0297=0x0000
+0x0298=0x0000
+0x0299=0x0000
+0x029A=0x0000
+0x029B=0x0000
+0x029C=0x0000
+0x029D=0x0000
+0x029E=0x0000
+0x029F=0x0000
+0x02A0=0x0000
+0x02A1=0x0000
+0x02A2=0x0000
+0x02A3=0x0000
+0x02A4=0x0000
+0x02A5=0x0000
+0x02A6=0x0000
+0x02A7=0x0000
+0x02C0=0x0000
+0x02C1=0x0000
+0x02C2=0x0000
+0x02C3=0x0000
+0x02C4=0x0000
+0x02C5=0x0000
+0x02C6=0x0000
+0x02C7=0x0000
+0x02C8=0x0000
+0x02C9=0x0000
+0x02CA=0x0000
+0x02CB=0x0000
+0x02CC=0x0000
+0x02CD=0x0000
+0x02CE=0x0000
+0x02CF=0x0000
+0x02D0=0x0000
+0x02D1=0x0000
+0x02D2=0x0000
+0x02D3=0x0000
+0x02D4=0x0000
+0x02D5=0x0000
+0x02D6=0x0000
+0x02D7=0x0000
+0x02D8=0x0000
+0x02D9=0x0000
+0x02DA=0x0000
+0x02DB=0x0000
+0x02DC=0x0000
+0x02DD=0x0000
+0x02DE=0x0000
+0x02DF=0x0000
+0x02E0=0x0000
+0x02E1=0x0000
+0x02E2=0x0000
+0x02E3=0x0000
+0x02E4=0x0000
+0x02E5=0x0000
+0x02E6=0x0000
+0x02E7=0x0000
+0x0300=0x0000
+0x0301=0x0000
+0x0302=0x0000
+0x0303=0x0000
+0x0304=0x0000
+0x0305=0x0000
+0x0306=0x0000
+0x0307=0x0000
+0x0308=0x0000
+0x0309=0x0000
+0x030A=0x0000
+0x030B=0x0000
+0x030C=0x0000
+0x030D=0x0000
+0x030E=0x0000
+0x030F=0x0000
+0x0310=0x0000
+0x0311=0x0000
+0x0312=0x0000
+0x0313=0x0000
+0x0314=0x0000
+0x0315=0x0000
+0x0316=0x0000
+0x0317=0x0000
+0x0318=0x0000
+0x0319=0x0000
+0x031A=0x0000
+0x031B=0x0000
+0x031C=0x0000
+0x031D=0x0000
+0x031E=0x0000
+0x031F=0x0000
+0x0320=0x0000
+0x0321=0x0000
+0x0322=0x0000
+0x0323=0x0000
+0x0324=0x0000
+0x0325=0x0000
+0x0326=0x0000
+0x0327=0x0000
+0x0340=0x0000
+0x0341=0x0000
+0x0342=0x0000
+0x0343=0x0000
+0x0344=0x0000
+0x0345=0x0000
+0x0346=0x0000
+0x0347=0x0000
+0x0348=0x0000
+0x0349=0x0000
+0x034A=0x0000
+0x034B=0x0000
+0x034C=0x0000
+0x034D=0x0000
+0x034E=0x0000
+0x034F=0x0000
+0x0350=0x0000
+0x0351=0x0000
+0x0352=0x0000
+0x0353=0x0000
+0x0354=0x0000
+0x0355=0x0000
+0x0356=0x0000
+0x0357=0x0000
+0x0358=0x0000
+0x0359=0x0000
+0x035A=0x0000
+0x035B=0x0000
+0x035C=0x0000
+0x035D=0x0000
+0x035E=0x0000
+0x035F=0x0000
+0x0360=0x0000
+0x0361=0x0000
+0x0362=0x0000
+0x0363=0x0000
+0x0364=0x0000
+0x0365=0x0000
+0x0366=0x0000
+0x0367=0x0000
+0x0380=0x0000
+0x0381=0x0000
+0x0382=0x0000
+0x0383=0x0000
+0x0384=0x0000
+0x0385=0x0000
+0x0386=0x0000
+0x0387=0x0000
+0x0388=0x0000
+0x0389=0x0000
+0x038A=0x0000
+0x038B=0x0000
+0x038C=0x0000
+0x038D=0x0000
+0x038E=0x0000
+0x038F=0x0000
+0x0390=0x0000
+0x0391=0x0000
+0x0392=0x0000
+0x0393=0x0000
+0x0394=0x0000
+0x0395=0x0000
+0x0396=0x0000
+0x0397=0x0000
+0x0398=0x0000
+0x0399=0x0000
+0x039A=0x0000
+0x039B=0x0000
+0x039C=0x0000
+0x039D=0x0000
+0x039E=0x0000
+0x039F=0x0000
+0x03A0=0x0000
+0x03A1=0x0000
+0x03A2=0x0000
+0x03A3=0x0000
+0x03A4=0x0000
+0x03A5=0x0000
+0x03A6=0x0000
+0x03A7=0x0000
+0x0400=0x0105
+0x0401=0x07FF
+0x0402=0x07FF
+0x0403=0x0000
+0x0404=0x0000
+0x0405=0x0000
+0x0406=0x0000
+0x0407=0x0000
+0x0408=0x0000
+0x0409=0x0000
+0x040A=0x0000
+0x040B=0x7FFF
+0x040C=0x00FF
+0x040D=0x0000
+0x040E=0x0002
+0x040F=0x0000
+0x0440=0x0020
+0x0441=0x0000
+0x0442=0x0000
+0x0443=0x0000
+0x0444=0x0000
+0x0445=0x0000
+0x0446=0x0000
+0x0447=0x0000
+0x0448=0x0000
+0x0449=0x0000
+0x044A=0x0000
+0x044B=0x0000
+0x044C=0x0000
+0x044D=0x0000
+0x044E=0x0000
+0x044F=0x0000
+0x0450=0x0000
+0x0451=0x0000
+0x0452=0x0000
+0x0453=0x0000
+0x0454=0x0000
+0x0455=0x0000
+0x0456=0x0000
+0x0457=0x0000
+0x0458=0x0000
+0x0459=0x0000
+0x045A=0x0000
+0x045B=0x0000
+0x045C=0x0000
+0x045D=0x0000
+0x045E=0x0000
+0x045F=0x0000
+0x0460=0x0000
+0x0461=0x0000
+0x0480=0x0000
+0x0481=0x0000
+0x0482=0x0000
+0x0483=0x0000
+0x0484=0x0000
+0x0485=0x0000
+0x0486=0x0000
+0x0487=0x0000
+0x0488=0x0000
+0x0489=0x0000
+0x048A=0x0000
+0x048B=0x0000
+0x048C=0x0000
+0x048D=0x0000
+0x048E=0x0000
+0x048F=0x0000
+0x0490=0x0000
+0x0491=0x0000
+0x0492=0x0000
+0x0493=0x0000
+0x0494=0x0000
+0x0495=0x0000
+0x0496=0x0000
+0x0497=0x0000
+0x0498=0x0000
+0x0499=0x0000
+0x049A=0x0000
+0x049B=0x0000
+0x049C=0x0000
+0x049D=0x0000
+0x049E=0x0000
+0x049F=0x0000
+0x04A0=0x0000
+0x04A1=0x0000
+0x04A2=0x0000
+0x04A3=0x0000
+0x04A4=0x0000
+0x04A5=0x0000
+0x04A6=0x0000
+0x04A7=0x0000
+0x04C0=0x0000
+0x04C1=0x0000
+0x04C2=0x0000
+0x04C3=0x0000
+0x04C4=0x0000
+0x04C5=0x0000
+0x04C6=0x0000
+0x04C7=0x0000
+0x04C8=0x0000
+0x04C9=0x0000
+0x04CA=0x0000
+0x04CB=0x0000
+0x04CC=0x0000
+0x04CD=0x0000
+0x04CE=0x0000
+0x04CF=0x0000
+0x04D0=0x0000
+0x04D1=0x0000
+0x04D2=0x0000
+0x04D3=0x0000
+0x04D4=0x0000
+0x04D5=0x0000
+0x04D6=0x0000
+0x04D7=0x0000
+0x04D8=0x0000
+0x04D9=0x0000
+0x04DA=0x0000
+0x04DB=0x0000
+0x04DC=0x0000
+0x04DD=0x0000
+0x04DE=0x0000
+0x04DF=0x0000
+0x04E0=0x0000
+0x04E1=0x0000
+0x04E2=0x0000
+0x04E3=0x0000
+0x04E4=0x0000
+0x04E5=0x0000
+0x04E6=0x0000
+0x04E7=0x0000
+0x0500=0x0000
+0x0501=0x0000
+0x0502=0x0000
+0x0503=0x0000
+0x0504=0x0000
+0x0505=0x0000
+0x0506=0x0000
+0x0507=0x0000
+0x0508=0x0000
+0x0509=0x0000
+0x050A=0x0000
+0x050B=0x0000
+0x050C=0x0000
+0x050D=0x0000
+0x050E=0x0000
+0x050F=0x0000
+0x0510=0x0000
+0x0511=0x0000
+0x0512=0x0000
+0x0513=0x0000
+0x0514=0x0000
+0x0515=0x0000
+0x0516=0x0000
+0x0517=0x0000
+0x0518=0x0000
+0x0519=0x0000
+0x051A=0x0000
+0x051B=0x0000
+0x051C=0x0000
+0x051D=0x0000
+0x051E=0x0000
+0x051F=0x0000
+0x0520=0x0000
+0x0521=0x0000
+0x0522=0x0000
+0x0523=0x0000
+0x0524=0x0000
+0x0525=0x0000
+0x0526=0x0000
+0x0527=0x0000
+0x0540=0x0000
+0x0541=0x0000
+0x0542=0x0000
+0x0543=0x0000
+0x0544=0x0000
+0x0545=0x0000
+0x0546=0x0000
+0x0547=0x0000
+0x0548=0x0000
+0x0549=0x0000
+0x054A=0x0000
+0x054B=0x0000
+0x054C=0x0000
+0x054D=0x0000
+0x054E=0x0000
+0x054F=0x0000
+0x0550=0x0000
+0x0551=0x0000
+0x0552=0x0000
+0x0553=0x0000
+0x0554=0x0000
+0x0555=0x0000
+0x0556=0x0000
+0x0557=0x0000
+0x0558=0x0000
+0x0559=0x0000
+0x055A=0x0000
+0x055B=0x0000
+0x055C=0x0000
+0x055D=0x0000
+0x055E=0x0000
+0x055F=0x0000
+0x0560=0x0000
+0x0561=0x0000
+0x0562=0x0000
+0x0563=0x0000
+0x0564=0x0000
+0x0565=0x0000
+0x0566=0x0000
+0x0567=0x0000
+0x0580=0x0000
+0x0581=0x0000
+0x0582=0x0000
+0x0583=0x0000
+0x0584=0x0000
+0x0585=0x0000
+0x0586=0x0000
+0x0587=0x0000
+0x0588=0x0000
+0x0589=0x0000
+0x058A=0x0000
+0x058B=0x0000
+0x058C=0x0000
+0x058D=0x0000
+0x058E=0x0000
+0x058F=0x0000
+0x0590=0x0000
+0x0591=0x0000
+0x0592=0x0000
+0x0593=0x0000
+0x0594=0x0000
+0x0595=0x0000
+0x0596=0x0000
+0x0597=0x0000
+0x0598=0x0000
+0x0599=0x0000
+0x059A=0x0000
+0x059B=0x0000
+0x059C=0x0000
+0x059D=0x0000
+0x059E=0x0000
+0x059F=0x0000
+0x05A0=0x0000
+0x05A1=0x0000
+0x05A2=0x0000
+0x05A3=0x0000
+0x05A4=0x0000
+0x05A5=0x0000
+0x05A6=0x0000
+0x05A7=0x0000
+[reference_clocks]
+sxt_ref_clk_mhz=30.72
+sxr_ref_clk_mhz=30.72
diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
index 3a9878e82b182c670602344442321b6ffdb52804..f2d2af55c7ee35697f193ba75667b1cac70f80d8 100644
--- a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
@@ -128,30 +128,20 @@ void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index) {
/*! \brief Set Gains (TX/RX) on LMSSDR
* \param device the hardware to use
* \param openair0_cfg openair0 Config structure
- * \returns 0 in success
+ * \returns 0 in success, -1 on error
*/
int trx_lms_set_gains(openair0_device* device, openair0_config_t *openair0_cfg) {
+ int ret = 0;
- LMS_SetNormalizedGain(lms_device, LMS_CH_TX, 0, openair0_cfg[0].tx_gain[0]/100.0);
-
- // RX gains, use low-level setting
-
- double gv = openair0_cfg[0].rx_gain[0] - openair0_cfg[0].rx_gain_offset[0];
- if (gv > 31) {
- printf("RX Gain 0 too high, reduce by %f dB\n",gv-31);
- gv = 31;
- }
- if (gv < 0) {
- printf("RX Gain 0 too low, increase by %f dB\n",-gv);
- gv = 0;
- }
- printf("[LMS] Setting 7002M G_PGA_RBB to %d\n", (int16_t)gv);
- LMS7002M lms7;
- lms7.SetConnection(lms7.GetConnection());
- lms7.Modify_SPI_Reg_bits(LMS7param(G_PGA_RBB),(int16_t)gv);
-
+ if (openair0_cfg->rx_gain[0] > 70+openair0_cfg->rx_gain_offset[0]) {
+ printf("[LMS] Reduce RX Gain 0 by %f dB\n",openair0_cfg->rx_gain[0]-openair0_cfg->rx_gain_offset[0]-70);
+ ret = -1;
+ }
+
+ LMS_SetGaindB(lms_device, LMS_CH_TX, 0, openair0_cfg->tx_gain[0]);
+ LMS_SetGaindB(lms_device, LMS_CH_RX, 0, openair0_cfg->rx_gain[0]-openair0_cfg->rx_gain_offset[0]);
- return(0);
+ return(ret);
}
/*! \brief Start LMSSDR
@@ -212,10 +202,11 @@ int trx_lms_start(openair0_device *device){
}
printf("Set TX frequency %f MHz\n",device->openair0_cfg[0].tx_freq[0]/1e6);
+ /*
printf("Override antenna settings to: RX1_H, TXA_2");
LMS_SetAntenna(lms_device, LMS_CH_RX, 0, 1);
LMS_SetAntenna(lms_device, LMS_CH_TX, 0, 2);
-
+ */
for (int i = 0; i< device->openair0_cfg->rx_num_channels; i++)
@@ -292,12 +283,21 @@ int trx_lms_set_freq(openair0_device* device, openair0_config_t *openair0_cfg,in
// 31 = 19 dB => 105 dB total gain @ 2.6 GHz
/*! \brief calibration table for LMSSDR */
+// V1.2 board
+rx_gain_calib_table_t calib_table_lmssdr_1v2[] = {
+ {3500000000.0,44.0}, // on L PAD
+ {2660000000.0,55.0}, // on L PAD
+ {2300000000.0,54.0}, // on L PAD
+ {1880000000.0,54.0}, // on L PAD
+ {816000000.0,79.0}, // on W PAD
+ {-1,0}};
+// V1.4 board
rx_gain_calib_table_t calib_table_lmssdr[] = {
- {3500000000.0,70.0},
- {2660000000.0,80.0},
- {2300000000.0,80.0},
- {1880000000.0,74.0}, // on W PAD
- {816000000.0,76.0}, // on W PAD
+ {3500000000.0,44.0}, // on H PAD
+ {2660000000.0,55.0}, // on H PAD
+ {2300000000.0,54.0}, // on H PAD
+ {1880000000.0,54.0}, // on H PAD
+ {816000000.0,79.0}, // on L PAD
{-1,0}};
@@ -344,7 +344,7 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg){
device->type=LMSSDR_DEV;
printf("LMSSDR: Initializing openair0_device for %s ...\n", ((device->host_type == BBU_HOST) ? "BBU": "RRH"));
-
+ openair0_cfg[0].iq_txshift = 0;
switch ((int)openair0_cfg[0].sample_rate) {
case 30720000:
// from usrp_time_offset
@@ -355,9 +355,9 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg){
break;
case 15360000:
openair0_cfg[0].samples_per_packet = 2048;
- openair0_cfg[0].tx_sample_advance = 70;
- openair0_cfg[0].tx_bw = 10e6;
- openair0_cfg[0].rx_bw = 10e6;
+ openair0_cfg[0].tx_sample_advance = 450;
+ openair0_cfg[0].tx_bw = 15.36e6;
+ openair0_cfg[0].rx_bw = 15.36e6;
break;
case 7680000:
openair0_cfg[0].samples_per_packet = 1024;
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.25PRB.lmssdr.conf
similarity index 95%
rename from targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.lmssdr.conf
rename to targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.25PRB.lmssdr.conf
index 266e5aae25bb3281f27ef9d074d7ede2a31bc98a..3315b953da2c065cb043b78a7fc63801c94eca15 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.lmssdr.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.25PRB.lmssdr.conf
@@ -35,8 +35,8 @@ eNBs =
Nid_cell_mbsfn = 0;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
- tx_gain = 90;
- rx_gain = 107;
+ tx_gain = 70;
+ rx_gain = 116;
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
@@ -46,7 +46,7 @@ eNBs =
pucch_nRB_CQI = 1;
pucch_nCS_AN = 0;
pucch_n1_AN = 32;
- pdsch_referenceSignalPower = -17;
+ pdsch_referenceSignalPower = -30;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
@@ -64,9 +64,9 @@ eNBs =
srs_ackNackST =;
srs_MaxUpPts =;*/
- pusch_p0_Nominal = -90;
+ pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
- pucch_p0_Nominal = -96;
+ pucch_p0_Nominal = -104;
msg3_delta_Preamble = 6;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1b = "deltaF3";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.lmssdr.conf
index b81ac861f616f8c844300f40cd15321226b815a5..1083aa382a47d2428945792ebc5d19be973a827b 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.lmssdr.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.lmssdr.conf
@@ -23,85 +23,89 @@ eNBs =
component_carriers = (
{
- frame_type = "FDD";
- tdd_config = 3;
- tdd_config_s = 0;
- prefix_type = "NORMAL";
- eutra_band = 13;
- downlink_frequency = 751000000L;
- uplink_frequency_offset = 31000000;
- Nid_cell = 0;
- N_RB_DL = 50;
- Nid_cell_mbsfn = 0;
- nb_antennas_tx = 1;
- nb_antennas_rx = 1;
- tx_gain = 90;
- rx_gain = 125;
- prach_root = 0;
- prach_config_index = 0;
- prach_high_speed = "DISABLE";
- prach_zero_correlation = 1;
- prach_freq_offset = 2;
- pucch_delta_shift = 1;
- pucch_nRB_CQI = 1;
- pucch_nCS_AN = 0;
- pucch_n1_AN = 32;
- pdsch_referenceSignalPower = -20;
- pdsch_p_b = 0;
- pusch_n_SB = 1;
- pusch_enable64QAM = "DISABLE";
- pusch_hoppingMode = "interSubFrame";
- pusch_hoppingOffset = 0;
- pusch_groupHoppingEnabled = "ENABLE";
- pusch_groupAssignment = 0;
- pusch_sequenceHoppingEnabled = "DISABLE";
- pusch_nDMRS1 = 1;
- phich_duration = "NORMAL";
- phich_resource = "ONESIXTH";
- srs_enable = "DISABLE";
- /* srs_BandwidthConfig =;
- srs_SubframeConfig =;
- srs_ackNackST =;
- srs_MaxUpPts =;*/
-
- pusch_p0_Nominal = -90;
- pusch_alpha = "AL1";
- pucch_p0_Nominal = -96;
- msg3_delta_Preamble = 6;
- pucch_deltaF_Format1 = "deltaF2";
- pucch_deltaF_Format1b = "deltaF3";
- pucch_deltaF_Format2 = "deltaF0";
- pucch_deltaF_Format2a = "deltaF0";
- pucch_deltaF_Format2b = "deltaF0";
-
- rach_numberOfRA_Preambles = 64;
- rach_preamblesGroupAConfig = "DISABLE";
- /*
- rach_sizeOfRA_PreamblesGroupA = ;
- rach_messageSizeGroupA = ;
- rach_messagePowerOffsetGroupB = ;
- */
- rach_powerRampingStep = 4;
- rach_preambleInitialReceivedTargetPower = -108;
- rach_preambleTransMax = 10;
- rach_raResponseWindowSize = 10;
- rach_macContentionResolutionTimer = 48;
- rach_maxHARQ_Msg3Tx = 4;
-
- pcch_default_PagingCycle = 128;
- pcch_nB = "oneT";
- bcch_modificationPeriodCoeff = 2;
- ue_TimersAndConstants_t300 = 1000;
- ue_TimersAndConstants_t301 = 1000;
- ue_TimersAndConstants_t310 = 1000;
- ue_TimersAndConstants_t311 = 10000;
- ue_TimersAndConstants_n310 = 20;
- ue_TimersAndConstants_n311 = 1;
-
+ node_function = "eNodeB_3GPP";
+ node_timing = "synch_to_ext_device";
+ node_synch_ref = 0;
+ frame_type = "FDD";
+ tdd_config = 3;
+ tdd_config_s = 0;
+ prefix_type = "NORMAL";
+ eutra_band = 13;
+ downlink_frequency = 751000000L;
+ uplink_frequency_offset = 31000000;
+ Nid_cell = 0;
+ N_RB_DL = 50;
+ Nid_cell_mbsfn = 0;
+ nb_antenna_ports = 1;
+ nb_antennas_tx = 1;
+ nb_antennas_rx = 1;
+ tx_gain = 20;
+ rx_gain = 100;
+ prach_root = 0;
+ prach_config_index = 0;
+ prach_high_speed = "DISABLE";
+ prach_zero_correlation = 1;
+ prach_freq_offset = 2;
+ pucch_delta_shift = 1;
+ pucch_nRB_CQI = 1;
+ pucch_nCS_AN = 0;
+ pucch_n1_AN = 32;
+ pdsch_referenceSignalPower = -30;
+ pdsch_p_b = 0;
+ pusch_n_SB = 1;
+ pusch_enable64QAM = "DISABLE";
+ pusch_hoppingMode = "interSubFrame";
+ pusch_hoppingOffset = 0;
+ pusch_groupHoppingEnabled = "ENABLE";
+ pusch_groupAssignment = 0;
+ pusch_sequenceHoppingEnabled = "DISABLE";
+ pusch_nDMRS1 = 1;
+ phich_duration = "NORMAL";
+ phich_resource = "ONESIXTH";
+ srs_enable = "DISABLE";
+ /* srs_BandwidthConfig =;
+ srs_SubframeConfig =;
+ srs_ackNackST =;
+ srs_MaxUpPts =;*/
+
+ pusch_p0_Nominal = -96;
+ pusch_alpha = "AL1";
+ pucch_p0_Nominal = -104;
+ msg3_delta_Preamble = 6;
+ pucch_deltaF_Format1 = "deltaF2";
+ pucch_deltaF_Format1b = "deltaF3";
+ pucch_deltaF_Format2 = "deltaF0";
+ pucch_deltaF_Format2a = "deltaF0";
+ pucch_deltaF_Format2b = "deltaF0";
+
+ rach_numberOfRA_Preambles = 64;
+ rach_preamblesGroupAConfig = "DISABLE";
+ /*
+ rach_sizeOfRA_PreamblesGroupA = ;
+ rach_messageSizeGroupA = ;
+ rach_messagePowerOffsetGroupB = ;
+ */
+ rach_powerRampingStep = 4;
+ rach_preambleInitialReceivedTargetPower = -104;
+ rach_preambleTransMax = 10;
+ rach_raResponseWindowSize = 10;
+ rach_macContentionResolutionTimer = 48;
+ rach_maxHARQ_Msg3Tx = 4;
+
+ pcch_default_PagingCycle = 128;
+ pcch_nB = "oneT";
+ bcch_modificationPeriodCoeff = 2;
+ ue_TimersAndConstants_t300 = 1000;
+ ue_TimersAndConstants_t301 = 1000;
+ ue_TimersAndConstants_t310 = 1000;
+ ue_TimersAndConstants_t311 = 10000;
+ ue_TimersAndConstants_n310 = 20;
+ ue_TimersAndConstants_n311 = 1;
+
+ ue_TransmissionMode = 1;
}
);
-
srb1_parameters :
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
@@ -131,7 +135,6 @@ eNBs =
SCTP_OUTSTREAMS = 2;
};
-
////////// MME parameters:
mme_ip_address = ( { ipv4 = "127.0.0.3";
ipv6 = "192:168:30::17";
@@ -146,7 +149,7 @@ eNBs =
ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24";
ENB_INTERFACE_NAME_FOR_S1U = "lo";
- ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.4/24";
+ ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.lmssdr.conf
new file mode 100644
index 0000000000000000000000000000000000000000..00f875ec4e2a27e50e7c9625a39c34d57a8d8ff1
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.lmssdr.conf
@@ -0,0 +1,174 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+ ////////// Identification parameters:
+ eNB_ID = 0xe00;
+
+ cell_type = "CELL_MACRO_ENB";
+
+ eNB_name = "eNB_Eurecom_LTEBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = "1";
+
+ mobile_country_code = "208";
+
+ mobile_network_code = "93";
+
+ ////////// Physical parameters:
+
+ component_carriers = (
+ {
+ node_function = "eNodeB_3GPP";
+ node_timing = "synch_to_ext_device";
+ node_synch_ref = 0;
+ frame_type = "FDD";
+ tdd_config = 3;
+ tdd_config_s = 0;
+ prefix_type = "NORMAL";
+ eutra_band = 7;
+ downlink_frequency = 2680000000L;
+ uplink_frequency_offset = -120000000;
+ Nid_cell = 0;
+ N_RB_DL = 25;
+ Nid_cell_mbsfn = 0;
+ nb_antenna_ports = 1;
+ nb_antennas_tx = 1;
+ nb_antennas_rx = 1;
+ tx_gain = 7;
+ rx_gain = 116;
+ prach_root = 0;
+ prach_config_index = 0;
+ prach_high_speed = "DISABLE";
+ prach_zero_correlation = 1;
+ prach_freq_offset = 2;
+ pucch_delta_shift = 1;
+ pucch_nRB_CQI = 1;
+ pucch_nCS_AN = 0;
+ pucch_n1_AN = 32;
+ pdsch_referenceSignalPower = -34;
+ pdsch_p_b = 0;
+ pusch_n_SB = 1;
+ pusch_enable64QAM = "DISABLE";
+ pusch_hoppingMode = "interSubFrame";
+ pusch_hoppingOffset = 0;
+ pusch_groupHoppingEnabled = "ENABLE";
+ pusch_groupAssignment = 0;
+ pusch_sequenceHoppingEnabled = "DISABLE";
+ pusch_nDMRS1 = 1;
+ phich_duration = "NORMAL";
+ phich_resource = "ONESIXTH";
+ srs_enable = "DISABLE";
+ /* srs_BandwidthConfig =;
+ srs_SubframeConfig =;
+ srs_ackNackST =;
+ srs_MaxUpPts =;*/
+
+ pusch_p0_Nominal = -96;
+ pusch_alpha = "AL1";
+ pucch_p0_Nominal = -104;
+ msg3_delta_Preamble = 6;
+ pucch_deltaF_Format1 = "deltaF2";
+ pucch_deltaF_Format1b = "deltaF3";
+ pucch_deltaF_Format2 = "deltaF0";
+ pucch_deltaF_Format2a = "deltaF0";
+ pucch_deltaF_Format2b = "deltaF0";
+
+ rach_numberOfRA_Preambles = 64;
+ rach_preamblesGroupAConfig = "DISABLE";
+ /*
+ rach_sizeOfRA_PreamblesGroupA = ;
+ rach_messageSizeGroupA = ;
+ rach_messagePowerOffsetGroupB = ;
+ */
+ rach_powerRampingStep = 4;
+ rach_preambleInitialReceivedTargetPower = -104;
+ rach_preambleTransMax = 10;
+ rach_raResponseWindowSize = 10;
+ rach_macContentionResolutionTimer = 48;
+ rach_maxHARQ_Msg3Tx = 4;
+
+ pcch_default_PagingCycle = 128;
+ pcch_nB = "oneT";
+ bcch_modificationPeriodCoeff = 2;
+ ue_TimersAndConstants_t300 = 1000;
+ ue_TimersAndConstants_t301 = 1000;
+ ue_TimersAndConstants_t310 = 1000;
+ ue_TimersAndConstants_t311 = 10000;
+ ue_TimersAndConstants_n310 = 20;
+ ue_TimersAndConstants_n311 = 1;
+
+ ue_TransmissionMode = 1;
+ }
+ );
+
+ srb1_parameters :
+ {
+ # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+ timer_poll_retransmit = 80;
+
+ # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+ timer_reordering = 35;
+
+ # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+ timer_status_prohibit = 0;
+
+ # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+ poll_pdu = 4;
+
+ # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+ poll_byte = 99999;
+
+ # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+ max_retx_threshold = 4;
+ }
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "192.168.12.148";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+ ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.150/24";
+
+ ENB_INTERFACE_NAME_FOR_S1U = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.150/24";
+ ENB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+
+ log_config :
+ {
+ global_log_level ="info";
+ global_log_verbosity ="medium";
+ hw_log_level ="info";
+ hw_log_verbosity ="medium";
+ phy_log_level ="info";
+ phy_log_verbosity ="medium";
+ mac_log_level ="info";
+ mac_log_verbosity ="high";
+ rlc_log_level ="info";
+ rlc_log_verbosity ="medium";
+ pdcp_log_level ="info";
+ pdcp_log_verbosity ="medium";
+ rrc_log_level ="info";
+ rrc_log_verbosity ="medium";
+ };
+ }
+);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf
index e12acef70340404256fb63ee2538fc7a1f97b130..2d0e0f3702d8a7c43a40392aa068220234419b8f 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf
@@ -39,8 +39,8 @@ eNBs =
nb_antenna_ports = 1;
nb_antennas_tx = 1;
nb_antennas_rx = 1;
- tx_gain = 100;
- rx_gain = 111;
+ tx_gain = 20;
+ rx_gain = 116;
prach_root = 0;
prach_config_index = 0;
prach_high_speed = "DISABLE";
@@ -50,7 +50,7 @@ eNBs =
pucch_nRB_CQI = 1;
pucch_nCS_AN = 0;
pucch_n1_AN = 32;
- pdsch_referenceSignalPower = -30;
+ pdsch_referenceSignalPower = -35;
pdsch_p_b = 0;
pusch_n_SB = 1;
pusch_enable64QAM = "DISABLE";
@@ -136,7 +136,7 @@ eNBs =
};
////////// MME parameters:
- mme_ip_address = ( { ipv4 = "127.0.0.3";
+ mme_ip_address = ( { ipv4 = "192.168.12.148";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
@@ -145,11 +145,11 @@ eNBs =
NETWORK_INTERFACES :
{
- ENB_INTERFACE_NAME_FOR_S1_MME = "lo";
- ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24";
+ ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.150/24";
- ENB_INTERFACE_NAME_FOR_S1U = "lo";
- ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24";
+ ENB_INTERFACE_NAME_FOR_S1U = "eth0";
+ ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.150/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
};
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf
deleted file mode 100644
index 4cd761645b3e339c9b4cff404e974352a5f1f832..0000000000000000000000000000000000000000
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf
+++ /dev/null
@@ -1,192 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
- ////////// Identification parameters:
- eNB_ID = 0xe00;
-
- cell_type = "CELL_MACRO_ENB";
-
- eNB_name = "eNB_Eurecom_LTEBox";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
- tracking_area_code = "1";
-
- mobile_country_code = "208";
-
- mobile_network_code = "93";
-
- ////////// Physical parameters:
-
- component_carriers = (
- {
- frame_type = "FDD";
- tdd_config = 3;
- tdd_config_s = 0;
- prefix_type = "NORMAL";
- eutra_band = 7;
- downlink_frequency = 2660000000L;
- uplink_frequency_offset = -120000000;
- Nid_cell = 0;
- N_RB_DL = 50;
- Nid_cell_mbsfn = 0;
- nb_antennas_tx = 1;
- nb_antennas_rx = 1;
- tx_gain = 60;
- rx_gain = 111;
- prach_root = 0;
- prach_config_index = 0;
- prach_high_speed = "DISABLE";
- prach_zero_correlation = 1;
- prach_freq_offset = 2;
- pucch_delta_shift = 1;
- pucch_nRB_CQI = 1;
- pucch_nCS_AN = 0;
- pucch_n1_AN = 32;
- pdsch_referenceSignalPower = -29;
- pdsch_p_b = 0;
- pusch_n_SB = 1;
- pusch_enable64QAM = "DISABLE";
- pusch_hoppingMode = "interSubFrame";
- pusch_hoppingOffset = 0;
- pusch_groupHoppingEnabled = "ENABLE";
- pusch_groupAssignment = 0;
- pusch_sequenceHoppingEnabled = "DISABLE";
- pusch_nDMRS1 = 1;
- phich_duration = "NORMAL";
- phich_resource = "ONESIXTH";
- srs_enable = "DISABLE";
- /* srs_BandwidthConfig =;
- srs_SubframeConfig =;
- srs_ackNackST =;
- srs_MaxUpPts =;*/
-
- pusch_p0_Nominal = -85;
- pusch_alpha = "AL1";
- pucch_p0_Nominal = -96;
- msg3_delta_Preamble = 6;
- pucch_deltaF_Format1 = "deltaF2";
- pucch_deltaF_Format1b = "deltaF3";
- pucch_deltaF_Format2 = "deltaF0";
- pucch_deltaF_Format2a = "deltaF0";
- pucch_deltaF_Format2b = "deltaF0";
-
- rach_numberOfRA_Preambles = 64;
- rach_preamblesGroupAConfig = "DISABLE";
-/*
- rach_sizeOfRA_PreamblesGroupA = ;
- rach_messageSizeGroupA = ;
- rach_messagePowerOffsetGroupB = ;
-*/
- rach_powerRampingStep = 4;
- rach_preambleInitialReceivedTargetPower = -100;
- rach_preambleTransMax = 10;
- rach_raResponseWindowSize = 10;
- rach_macContentionResolutionTimer = 48;
- rach_maxHARQ_Msg3Tx = 4;
-
- pcch_default_PagingCycle = 128;
- pcch_nB = "oneT";
- bcch_modificationPeriodCoeff = 2;
- ue_TimersAndConstants_t300 = 1000;
- ue_TimersAndConstants_t301 = 1000;
- ue_TimersAndConstants_t310 = 1000;
- ue_TimersAndConstants_t311 = 10000;
- ue_TimersAndConstants_n310 = 20;
- ue_TimersAndConstants_n311 = 1;
-
- }
- );
-
-
- srb1_parameters :
- {
- # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
- timer_poll_retransmit = 80;
-
- # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
- timer_reordering = 35;
-
- # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
- timer_status_prohibit = 0;
-
- # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
- poll_pdu = 4;
-
- # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
- poll_byte = 99999;
-
- # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
- max_retx_threshold = 4;
- }
-
- # ------- SCTP definitions
- SCTP :
- {
- # Number of streams to use in input/output
- SCTP_INSTREAMS = 2;
- SCTP_OUTSTREAMS = 2;
- };
-
-
- ////////// MME parameters:
- mme_ip_address = ( { ipv4 = "192.168.12.170";
- ipv6 = "192:168:30::17";
- active = "yes";
- preference = "ipv4";
- }
- );
-
-rrh_gw_config = (
- {
- local_if_name = "eth0";
- #remote_address = "169.254.10.158";
- #local_address = "169.254.8.15";
- remote_address = "74:d4:35:cc:88:45";
- local_address = "d4:be:d9:22:0a:ac";
- local_port = 50000; #for raw option local port must be the same to remote
- remote_port = 50000;
- rrh_gw_active = "yes";
- tr_preference = "raw";
- rf_preference = "lmssdr";
- iq_txshift = 0;
- tx_sample_advance = 45;
- tx_scheduling_advance = 8;
-
-}
-);
-
- NETWORK_INTERFACES :
- {
- ENB_INTERFACE_NAME_FOR_S1_MME = "eth6";
- ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.118/24";
-
- ENB_INTERFACE_NAME_FOR_S1U = "eth6";
-
-
- ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.118/24";
- ENB_PORT_FOR_S1U = 2152; # Spec 2152
- };
-
- log_config :
- {
- global_log_level ="info";
- global_log_verbosity ="medium";
- hw_log_level ="info";
- hw_log_verbosity ="medium";
- phy_log_level ="info";
- phy_log_verbosity ="medium";
- mac_log_level ="info";
- mac_log_verbosity ="high";
- rlc_log_level ="info";
- rlc_log_verbosity ="medium";
- pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
- rrc_log_level ="info";
- rrc_log_verbosity ="medium";
- };
- }
-);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.lmssdr.conf
deleted file mode 100644
index d912b1a10213a42d9332a00199e4c3c3a88df14b..0000000000000000000000000000000000000000
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.lmssdr.conf
+++ /dev/null
@@ -1,176 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
- ////////// Identification parameters:
- eNB_ID = 0xe00;
-
- cell_type = "CELL_MACRO_ENB";
-
- eNB_name = "eNB_Eurecom_LTEBox";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
- tracking_area_code = "1";
-
- mobile_country_code = "208";
-
- mobile_network_code = "92";
-
- ////////// Physical parameters:
-
- component_carriers = (
- {
- node_function = "eNodeB_3GPP";
- node_timing = "synch_to_ext_device";
- node_synch_ref = 0;
- frame_type = "FDD";
- tdd_config = 3;
- tdd_config_s = 0;
- prefix_type = "NORMAL";
- eutra_band = 7;
- downlink_frequency = 2660000000L;
- uplink_frequency_offset = -120000000;
- Nid_cell = 0;
- N_RB_DL = 25;
- Nid_cell_mbsfn = 0;
- nb_antennas_ports = 1;
- nb_antennas_tx = 1;
- nb_antennas_rx = 1;
- tx_gain = 100;
- rx_gain = 111;
- prach_root = 0;
- prach_config_index = 0;
- prach_high_speed = "DISABLE";
- prach_zero_correlation = 1;
- prach_freq_offset = 2;
- pucch_delta_shift = 1;
- pucch_nRB_CQI = 1;
- pucch_nCS_AN = 0;
- pucch_n1_AN = 32;
- pdsch_referenceSignalPower = -29;
- pdsch_p_b = 0;
- pusch_n_SB = 1;
- pusch_enable64QAM = "DISABLE";
- pusch_hoppingMode = "interSubFrame";
- pusch_hoppingOffset = 0;
- pusch_groupHoppingEnabled = "ENABLE";
- pusch_groupAssignment = 0;
- pusch_sequenceHoppingEnabled = "DISABLE";
- pusch_nDMRS1 = 1;
- phich_duration = "NORMAL";
- phich_resource = "ONESIXTH";
- srs_enable = "DISABLE";
- /* srs_BandwidthConfig =;
- srs_SubframeConfig =;
- srs_ackNackST =;
- srs_MaxUpPts =;*/
-
- pusch_p0_Nominal = -85;
- pusch_alpha = "AL1";
- pucch_p0_Nominal = -96;
- msg3_delta_Preamble = 6;
- pucch_deltaF_Format1 = "deltaF2";
- pucch_deltaF_Format1b = "deltaF3";
- pucch_deltaF_Format2 = "deltaF0";
- pucch_deltaF_Format2a = "deltaF0";
- pucch_deltaF_Format2b = "deltaF0";
-
- rach_numberOfRA_Preambles = 64;
- rach_preamblesGroupAConfig = "DISABLE";
-/*
- rach_sizeOfRA_PreamblesGroupA = ;
- rach_messageSizeGroupA = ;
- rach_messagePowerOffsetGroupB = ;
-*/
- rach_powerRampingStep = 4;
- rach_preambleInitialReceivedTargetPower = -100;
- rach_preambleTransMax = 10;
- rach_raResponseWindowSize = 10;
- rach_macContentionResolutionTimer = 48;
- rach_maxHARQ_Msg3Tx = 4;
-
- pcch_default_PagingCycle = 128;
- pcch_nB = "oneT";
- bcch_modificationPeriodCoeff = 2;
- ue_TimersAndConstants_t300 = 1000;
- ue_TimersAndConstants_t301 = 1000;
- ue_TimersAndConstants_t310 = 1000;
- ue_TimersAndConstants_t311 = 10000;
- ue_TimersAndConstants_n310 = 20;
- ue_TimersAndConstants_n311 = 1;
-
- ue_TransmissionMode = 1;
- }
- );
-
-
- srb1_parameters :
- {
- # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
- timer_poll_retransmit = 80;
-
- # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
- timer_reordering = 35;
-
- # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
- timer_status_prohibit = 0;
-
- # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
- poll_pdu = 4;
-
- # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
- poll_byte = 99999;
-
- # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
- max_retx_threshold = 4;
- }
-
- # ------- SCTP definitions
- SCTP :
- {
- # Number of streams to use in input/output
- SCTP_INSTREAMS = 2;
- SCTP_OUTSTREAMS = 2;
- };
-
- ////////// MME parameters:
- mme_ip_address = ( { ipv4 = "192.168.12.170";
- ipv6 = "192:168:30::17";
- active = "yes";
- preference = "ipv4";
- }
- );
-
- NETWORK_INTERFACES :
- {
- ENB_INTERFACE_NAME_FOR_S1_MME = "eth4";
- ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.242/24";
-
- ENB_INTERFACE_NAME_FOR_S1U = "eth4";
- ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.242/24";
- ENB_PORT_FOR_S1U = 2152; # Spec 2152
- };
-
- log_config :
- {
- global_log_level ="info";
- global_log_verbosity ="medium";
- hw_log_level ="info";
- hw_log_verbosity ="medium";
- phy_log_level ="info";
- phy_log_verbosity ="medium";
- mac_log_level ="info";
- mac_log_verbosity ="high";
- rlc_log_level ="info";
- rlc_log_verbosity ="medium";
- pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
- rrc_log_level ="info";
- rrc_log_verbosity ="medium";
- };
-
- }
-);
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf
deleted file mode 100644
index 9b052bf7ba9a888bb1b26cc8f654191513524982..0000000000000000000000000000000000000000
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf
+++ /dev/null
@@ -1,192 +0,0 @@
-Active_eNBs = ( "eNB_Eurecom_LTEBox");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-eNBs =
-(
- {
- ////////// Identification parameters:
- eNB_ID = 0xe00;
-
- cell_type = "CELL_MACRO_ENB";
-
- eNB_name = "eNB_Eurecom_LTEBox";
-
- // Tracking area code, 0x0000 and 0xfffe are reserved values
- tracking_area_code = "1";
-
- mobile_country_code = "208";
-
- mobile_network_code = "92";
-
- ////////// Physical parameters:
-
- component_carriers = (
- {
- frame_type = "FDD";
- tdd_config = 3;
- tdd_config_s = 0;
- prefix_type = "NORMAL";
- eutra_band = 7;
- downlink_frequency = 2660000000L;
- uplink_frequency_offset = -120000000;
- Nid_cell = 0;
- N_RB_DL = 25;
- Nid_cell_mbsfn = 0;
- nb_antennas_tx = 1;
- nb_antennas_rx = 1;
- tx_gain = 60;
- rx_gain = 111;
- prach_root = 0;
- prach_config_index = 0;
- prach_high_speed = "DISABLE";
- prach_zero_correlation = 1;
- prach_freq_offset = 2;
- pucch_delta_shift = 1;
- pucch_nRB_CQI = 1;
- pucch_nCS_AN = 0;
- pucch_n1_AN = 32;
- pdsch_referenceSignalPower = -29;
- pdsch_p_b = 0;
- pusch_n_SB = 1;
- pusch_enable64QAM = "DISABLE";
- pusch_hoppingMode = "interSubFrame";
- pusch_hoppingOffset = 0;
- pusch_groupHoppingEnabled = "ENABLE";
- pusch_groupAssignment = 0;
- pusch_sequenceHoppingEnabled = "DISABLE";
- pusch_nDMRS1 = 1;
- phich_duration = "NORMAL";
- phich_resource = "ONESIXTH";
- srs_enable = "DISABLE";
- /* srs_BandwidthConfig =;
- srs_SubframeConfig =;
- srs_ackNackST =;
- srs_MaxUpPts =;*/
-
- pusch_p0_Nominal = -85;
- pusch_alpha = "AL1";
- pucch_p0_Nominal = -96;
- msg3_delta_Preamble = 6;
- pucch_deltaF_Format1 = "deltaF2";
- pucch_deltaF_Format1b = "deltaF3";
- pucch_deltaF_Format2 = "deltaF0";
- pucch_deltaF_Format2a = "deltaF0";
- pucch_deltaF_Format2b = "deltaF0";
-
- rach_numberOfRA_Preambles = 64;
- rach_preamblesGroupAConfig = "DISABLE";
-/*
- rach_sizeOfRA_PreamblesGroupA = ;
- rach_messageSizeGroupA = ;
- rach_messagePowerOffsetGroupB = ;
-*/
- rach_powerRampingStep = 4;
- rach_preambleInitialReceivedTargetPower = -100;
- rach_preambleTransMax = 10;
- rach_raResponseWindowSize = 10;
- rach_macContentionResolutionTimer = 48;
- rach_maxHARQ_Msg3Tx = 4;
-
- pcch_default_PagingCycle = 128;
- pcch_nB = "oneT";
- bcch_modificationPeriodCoeff = 2;
- ue_TimersAndConstants_t300 = 1000;
- ue_TimersAndConstants_t301 = 1000;
- ue_TimersAndConstants_t310 = 1000;
- ue_TimersAndConstants_t311 = 10000;
- ue_TimersAndConstants_n310 = 20;
- ue_TimersAndConstants_n311 = 1;
-
- }
- );
-
-
- srb1_parameters :
- {
- # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
- timer_poll_retransmit = 80;
-
- # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
- timer_reordering = 35;
-
- # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
- timer_status_prohibit = 0;
-
- # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
- poll_pdu = 4;
-
- # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
- poll_byte = 99999;
-
- # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
- max_retx_threshold = 4;
- }
-
- # ------- SCTP definitions
- SCTP :
- {
- # Number of streams to use in input/output
- SCTP_INSTREAMS = 2;
- SCTP_OUTSTREAMS = 2;
- };
-
-
- ////////// MME parameters:
- mme_ip_address = ( { ipv4 = "192.168.12.170";
- ipv6 = "192:168:30::17";
- active = "yes";
- preference = "ipv4";
- }
- );
-
-rrh_gw_config = (
- {
- local_if_name = "eth0";
- #remote_address = "169.254.10.158";
- #local_address = "169.254.8.15";
- remote_address = "74:d4:35:cc:88:45";
- local_address = "d4:be:d9:22:0a:ac";
- local_port = 50000; #for raw option local port must be the same to remote
- remote_port = 50000;
- rrh_gw_active = "yes";
- tr_preference = "raw";
- rf_preference = "lmssdr";
- iq_txshift = 0;
- tx_sample_advance = 70;
- tx_scheduling_advance = 8;
-
-}
-);
-
- NETWORK_INTERFACES :
- {
- ENB_INTERFACE_NAME_FOR_S1_MME = "eth6";
- ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.118/24";
-
- ENB_INTERFACE_NAME_FOR_S1U = "eth6";
-
-
- ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.118/24";
- ENB_PORT_FOR_S1U = 2152; # Spec 2152
- };
-
- log_config :
- {
- global_log_level ="info";
- global_log_verbosity ="medium";
- hw_log_level ="info";
- hw_log_verbosity ="medium";
- phy_log_level ="info";
- phy_log_verbosity ="medium";
- mac_log_level ="info";
- mac_log_verbosity ="high";
- rlc_log_level ="info";
- rlc_log_verbosity ="medium";
- pdcp_log_level ="info";
- pdcp_log_verbosity ="medium";
- rrc_log_level ="info";
- rrc_log_verbosity ="medium";
- };
- }
-);
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index 189bb87d497fd3243b1d573229a78edac6d2d178..21d34d40b194720ea2f5fa85cbf9a702707edf92 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -1004,6 +1004,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
start_rf_prev_ts = start_rf_new_ts;
clock_gettime( CLOCK_MONOTONIC, &start_rf_new);
start_rf_new_ts = ts;
+ LOG_D(PHY,"rx_rf: first_rx %d received ts %"PRId64" (sptti %d)\n",proc->first_rx,ts,fp->samples_per_tti);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 );
proc->timestamp_rx = ts-eNB->ts_offset;
@@ -1020,7 +1021,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
else {
if (proc->timestamp_rx - old_ts != fp->samples_per_tti) {
- LOG_I(PHY,"rx_rf: rfdevice timing drift of %"PRId64" samples\n",proc->timestamp_rx - old_ts - fp->samples_per_tti);
+ LOG_I(PHY,"rx_rf: rfdevice timing drift of %"PRId64" samples (ts_off %"PRId64")\n",proc->timestamp_rx - old_ts - fp->samples_per_tti,eNB->ts_offset);
eNB->ts_offset += (proc->timestamp_rx - old_ts - fp->samples_per_tti);
proc->timestamp_rx = ts-eNB->ts_offset;
}
@@ -1559,7 +1560,7 @@ static void* eNB_thread_single( void* param ) {
wait_sync("eNB_thread_single");
#if defined(ENABLE_ITTI) && defined(ENABLE_USE_MME)
- if (eNB->node_function < NGFI_RRU_IF5)
+ if ((eNB->node_function < NGFI_RRU_IF5) && (eNB->mac_enabled==1))
wait_system_ready ("Waiting for eNB application to be ready %s\r", &start_eNB);
#endif
@@ -1723,7 +1724,7 @@ void init_eNB_proc(int inst) {
proc->CC_id = CC_id;
proc->instance_cnt_synch = -1;
- proc->first_rx=1;
+ proc->first_rx=2;
proc->first_tx=1;
proc->frame_offset = 0;
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 65f578fd2552b2a332061048fd85b0b22d024224..03f6ba1a2eddfbc02ca337d6572457e3ecd10f60 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -1579,9 +1579,15 @@ int main( int argc, char **argv ) {
UE[CC_id]->X_u);
if (UE[CC_id]->mac_enabled == 1)
- UE[CC_id]->pdcch_vars[0]->crnti = 0x1234;
+ {
+ UE[CC_id]->pdcch_vars[0][0]->crnti = 0x1234;
+ UE[CC_id]->pdcch_vars[1][0]->crnti = 0x1234;
+ }
else
- UE[CC_id]->pdcch_vars[0]->crnti = 0x1235;
+ {
+ UE[CC_id]->pdcch_vars[0][0]->crnti = 0x1235;
+ UE[CC_id]->pdcch_vars[1][0]->crnti = 0x1235;
+ }
UE[CC_id]->rx_total_gain_dB = (int)rx_gain[CC_id][0] + rx_gain_off;
UE[CC_id]->tx_power_max_dBm = tx_max_power[CC_id];
@@ -1733,7 +1739,7 @@ int main( int argc, char **argv ) {
#if defined(ENABLE_ITTI)
if ((UE_flag == 1)||
- (node_function[0]<NGFI_RAU_IF4p5))
+ ((node_function[0]<NGFI_RAU_IF4p5)&&(phy_test==0)))
// don't create if node doesn't connect to RRC/S1/GTP
if (create_tasks(UE_flag ? 0 : 1, UE_flag ? 1 : 0) < 0) {
printf("cannot create ITTI tasks\n");
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 49093ed2def4f22334c7870ff358abc938ce70f3..8a0b646fc35204a6b136f2202a39b50d5741b87a 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -269,7 +269,7 @@ static void *UE_thread_synch(void *arg) {
}
}
- AssertFatal(UE->rfdevice.trx_start_func(&UE->rfdevice) == 0, "Could not start the device\n");
+ // AssertFatal(UE->rfdevice.trx_start_func(&UE->rfdevice) == 0, "Could not start the device\n");
while (oai_exit==0) {
AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
@@ -368,13 +368,13 @@ static void *UE_thread_synch(void *arg) {
UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0],0);
//UE->rfdevice.trx_set_gains_func(&openair0,&openair0_cfg[0]);
- UE->rfdevice.trx_stop_func(&UE->rfdevice);
+ //UE->rfdevice.trx_stop_func(&UE->rfdevice);
sleep(1);
init_frame_parms(&UE->frame_parms,1);
- if (UE->rfdevice.trx_start_func(&UE->rfdevice) != 0 ) {
+ /*if (UE->rfdevice.trx_start_func(&UE->rfdevice) != 0 ) {
LOG_E(HW,"Could not start the device\n");
oai_exit=1;
- }
+ }*/
} else {
AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
UE->is_synchronized = 1;
@@ -647,6 +647,7 @@ void *UE_thread(void *arg) {
int sub_frame=-1;
//int cumulated_shift=0;
+ AssertFatal(UE->rfdevice.trx_start_func(&UE->rfdevice) == 0, "Could not start the device\n");
while (!oai_exit) {
AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
int instance_cnt_synch = UE->proc.instance_cnt_synch;
diff --git a/targets/SIMU/USER/channel_sim.c b/targets/SIMU/USER/channel_sim.c
index aff1f789eeefe8486457c3b44a2344fdc1320e3e..3913de60168524e8db18af473563c521e3fd95c1 100644
--- a/targets/SIMU/USER/channel_sim.c
+++ b/targets/SIMU/USER/channel_sim.c
@@ -145,7 +145,7 @@ void do_DL_sig(channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX][MAX_N
// find out which eNB the UE is attached to
for (eNB_id=0; eNB_id<NB_eNB_INST; eNB_id++) {
- if (find_ue(PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[0]->crnti,PHY_vars_eNB_g[eNB_id][CC_id])>=0) {
+ if (find_ue(PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[0][0]->crnti,PHY_vars_eNB_g[eNB_id][CC_id])>=0) {
// UE with UE_id is connected to eNb with eNB_id
att_eNB_id=eNB_id;
LOG_D(OCM,"A: UE attached to eNB (UE%d->eNB%d)\n",UE_id,eNB_id);
diff --git a/targets/SIMU/USER/init_lte.c b/targets/SIMU/USER/init_lte.c
index a99ccf2c09f40866ec31acd82fc74c65886e758e..3baf8fdad66b285b0019d4e7fb08cad62a499c4a 100644
--- a/targets/SIMU/USER/init_lte.c
+++ b/targets/SIMU/USER/init_lte.c
@@ -161,9 +161,9 @@ PHY_VARS_UE* init_lte_UE(LTE_DL_FRAME_PARMS *frame_parms,
memcpy(&(PHY_vars_UE->frame_parms), frame_parms, sizeof(LTE_DL_FRAME_PARMS));
phy_init_lte_ue(PHY_vars_UE,1,abstraction_flag);
- for (int l=0; l<2; l++) {
- for (i=0; i<NUMBER_OF_CONNECTED_eNB_MAX; i++) {
- for (j=0; j<2; j++) {
+ for (i=0; i<NUMBER_OF_CONNECTED_eNB_MAX; i++) {
+ for (j=0; j<2; j++) { // 2CWs
+ for (int l=0; l<2; l++){ // 2Threads
PHY_vars_UE->dlsch[l][i][j] = new_ue_dlsch(1,NUMBER_OF_HARQ_PID_MAX,NSOFT,MAX_TURBO_ITERATIONS,frame_parms->N_RB_DL, abstraction_flag);
if (!PHY_vars_UE->dlsch[l][i][j]) {
@@ -172,21 +172,21 @@ PHY_VARS_UE* init_lte_UE(LTE_DL_FRAME_PARMS *frame_parms,
} else
LOG_D(PHY,"dlsch[%d][%d] => %p\n",UE_id,i,PHY_vars_UE->dlsch[l][i][j]);
}
+ }
- PHY_vars_UE->ulsch[i] = new_ue_ulsch(frame_parms->N_RB_UL, abstraction_flag);
+ PHY_vars_UE->ulsch[i] = new_ue_ulsch(frame_parms->N_RB_UL, abstraction_flag);
- if (!PHY_vars_UE->ulsch[i]) {
- LOG_E(PHY,"Can't get ue ulsch structures\n");
- exit(-1);
- }
+ if (!PHY_vars_UE->ulsch[i]) {
+ LOG_E(PHY,"Can't get ue ulsch structures\n");
+ exit(-1);
+ }
- PHY_vars_UE->dlsch_SI[i] = new_ue_dlsch(1,1,NSOFT,MAX_TURBO_ITERATIONS,frame_parms->N_RB_DL, abstraction_flag);
- PHY_vars_UE->dlsch_ra[i] = new_ue_dlsch(1,1,NSOFT,MAX_TURBO_ITERATIONS,frame_parms->N_RB_DL, abstraction_flag);
+ PHY_vars_UE->dlsch_SI[i] = new_ue_dlsch(1,1,NSOFT,MAX_TURBO_ITERATIONS,frame_parms->N_RB_DL, abstraction_flag);
+ PHY_vars_UE->dlsch_ra[i] = new_ue_dlsch(1,1,NSOFT,MAX_TURBO_ITERATIONS,frame_parms->N_RB_DL, abstraction_flag);
- PHY_vars_UE->transmission_mode[i] = frame_parms->nb_antenna_ports_eNB==1 ? 1 : 2;
- }
+ PHY_vars_UE->transmission_mode[i] = frame_parms->nb_antenna_ports_eNB==1 ? 1 : 2;
}
PHY_vars_UE->frame_parms.pucch_config_common.deltaPUCCH_Shift = 1;
diff --git a/targets/SIMU/USER/oaisim.c b/targets/SIMU/USER/oaisim.c
index 7c1ea1a3c886bc07f2d90f8fc508216c7c073176..f1b3944a164609631d38ad1c6312289f478b1bfd 100644
--- a/targets/SIMU/USER/oaisim.c
+++ b/targets/SIMU/USER/oaisim.c
@@ -1332,6 +1332,8 @@ main (int argc, char **argv)
if (oai_emulation.info.opp_enabled == 1)
reset_opp_meas_oaisim ();
+ cpuf=get_cpu_freq_GHz();
+
init_time ();
init_slot_isr ();
diff --git a/targets/SIMU/USER/oaisim_functions.c b/targets/SIMU/USER/oaisim_functions.c
index c47dc10caf11d95cfa71addff2b4de91f6ad2500..c00bb50401b06b11299fd804421683a9123e80b7 100644
--- a/targets/SIMU/USER/oaisim_functions.c
+++ b/targets/SIMU/USER/oaisim_functions.c
@@ -1428,7 +1428,7 @@ void init_openair1(void)
else
PHY_vars_UE_g[UE_id][CC_id]->mac_enabled=1;
- PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[0]->crnti = 0x1235 + UE_id;
+ PHY_vars_UE_g[UE_id][CC_id]->pdcch_vars[0][0]->crnti = 0x1235 + UE_id;
PHY_vars_UE_g[UE_id][CC_id]->current_dlsch_cqi[0] = 10;
LOG_I(EMU, "UE %d mode is initialized to %d\n", UE_id, PHY_vars_UE_g[UE_id][CC_id]->UE_mode[0] );