Merge branch 'NR_RRCConfiguration' of...

Merge branch 'NR_RRCConfiguration' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRCConfiguration

README.txt

@@ -43,6 +43,7 @@ openairinterface5g
 
 RELEASE NOTES:
 
+v1.1.1 -> November 2019. Bug fix in the TDD Fair Round-Robin scheduler
 v1.1.0 -> July 2019. This version adds the following implemented features:
            * Experimental support of LTE-M
              - Single LTE-M UE attachment, legacy-LTE UE attachment is disabled

ci-scripts/.gitignore

+enb_*.log
+ue_*.log
+ping_*.*
+iperf_*.*
+phones_list.txt
+modules_list.txt
+test_results*.html

ci-scripts/Jenkinsfile-gitlab

@@ -44,7 +44,28 @@ pipeline {
         disableConcurrentBuilds()
         timestamps()
         gitLabConnection('OAI GitLab')
-        gitlabBuilds(builds: ["Build gNB-USRP", "Build nr-UE-USRP", "Build eNB-USRP", "Build basic-sim", "Build phy-sim", "Build eNB-ethernet", "Build UE-ethernet", "Analysis with cppcheck", "Test phy-sim", "Test basic-sim", "Test L2-sim", "Test-Mono-FDD-Band7", "Test-Mono-TDD-Band40", "Test-IF4p5-FDD-Band7", "Test-IF4p5-TDD-Band40", "Test-Mono-FDD-Band13", "Test-IF4p5-TDD-Band38-Multi-RRU" , "Test-Mono-FDD-Band13-X2-HO", "Test-TDD-Band78-gNB-NR-UE"])
+        gitlabBuilds(builds: [
+            "Build gNB-USRP",
+            "Build nr-UE-USRP",
+            "Build eNB-USRP",
+            "Build basic-sim",
+            "Build phy-sim",
+            "Build eNB-ethernet",
+            "Build UE-ethernet",
+            "Analysis with cppcheck",
+            "Test phy-sim",
+            "Test basic-sim",
+            "Test L2-sim",
+            "Test-Mono-FDD-Band7",
+            "Test-Mono-TDD-Band40",
+            "Test-IF4p5-FDD-Band7",
+            "Test-IF4p5-TDD-Band40",
+            "Test-Mono-FDD-Band13-LTE-M",
+            "Test-IF4p5-TDD-Band38-Multi-RRU",
+            "Test-eNB-OAI-UE-FDD-Band7",
+            "Test-Mono-FDD-Band13-X2-HO",
+            "Test-TDD-Band78-gNB-NR-UE"
+        ])
         ansiColor('xterm')
     }
 
@@ -542,7 +563,7 @@ pipeline {
                     steps {
                         script {
                             sh "sleep 60"
-                            triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-B210', 'Test-Mono-FDD-Band13')
+                            triggerSlaveJob ('eNB-CI-MONO-FDD-Band13-B210', 'Test-Mono-FDD-Band13-LTE-M')
                         }
                     }
                     post {
@@ -733,48 +754,50 @@ OAI CI Team''',
 // ----  Slave Job functions
 
 def triggerSlaveJob (jobName, gitlabStatusName) {
-    if ("MERGE".equals(env.gitlabActionType)) {
-        gitlabCommitStatus(name: gitlabStatusName) {
-            build job: jobName,
-                parameters: [
-                    string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-                    string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
-                    string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
-                    booleanParam(name: 'eNB_mergeRequest', value: true),
-                    string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
-                ]
+    // Workaround for the "cancelled" GitLab pipeline notification
+    // The slave job is triggered with the propagate false so the following commands are executed
+    // Its status is now PASS/SUCCESS from a stage pipeline point of view
+    // localStatus variable MUST be analyzed to properly assess the status
+    localStatus = build job: jobName,
+        parameters: [
+            string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
+            string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
+            string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
+            booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
+            string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
+        ], propagate: false
+    localResult = localStatus.getResult()
+    echo "${jobName} Slave Job status is ${localResult}"
+    gitlabCommitStatus(name: gitlabStatusName) {
+        if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
+           echo "${jobName} Slave Job is OK"
+        } else {
+           echo "${jobName} Slave Job is KO"
+           sh "ci-scripts/fail.sh"
         }
-    } else {
-        gitlabCommitStatus(name: gitlabStatusName) {
-            build job: jobName,
-                parameters: [
-                    string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-                    string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
-                    string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
-                    booleanParam(name: 'eNB_mergeRequest', value: false)
-                ]
-       }
     }
 }
 
 def triggerSlaveJobNoGitLab (jobName) {
-    if ("MERGE".equals(env.gitlabActionType)) {
-        build job: jobName,
-            parameters: [
-                string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-                string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
-                string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
-                booleanParam(name: 'eNB_mergeRequest', value: true),
-                string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
-            ]
+    // Workaround for the "cancelled" GitLab pipeline notification
+    // The slave job is triggered with the propagate false so the following commands are executed
+    // Its status is now PASS/SUCCESS from a stage pipeline point of view
+    // localStatus variable MUST be analyzed to properly assess the status
+    localStatus = build job: jobName,
+        parameters: [
+            string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
+            string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
+            string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
+            booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
+            string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
+        ], propagate: false
+    localResult = localStatus.getResult()
+    echo "${jobName} Slave Job status is ${localResult}"
+    if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) {
+       echo "${jobName} Slave Job is OK"
     } else {
-        build job: jobName,
-            parameters: [
-                string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-                string(name: 'eNB_Branch', value: String.valueOf(GIT_BRANCH)),
-                string(name: 'eNB_CommitID', value: String.valueOf(GIT_COMMIT)),
-                booleanParam(name: 'eNB_mergeRequest', value: false)
-            ]
+       echo "${jobName} Slave Job is KO"
+       sh "ci-scripts/fail.sh"
     }
 }
 

ci-scripts/doc/vm_based_simulator_build.md

@@ -51,18 +51,20 @@ Mandatory Options:
 Options:
 --------
  # OpenAirInterface Build Variants
-    --variant enb-usrp     OR -v1
-    --variant basic-sim    OR -v2
-    --variant phy-sim      OR -v3
-    --variant cppcheck     OR -v4
-    --variant enb-ethernet OR -v7
-    --variant ue-ethernet  OR -v8
+    --variant enb-usrp        OR -v1     ( build and test  )
+    --variant basic-sim       OR -v2     ( build and test  )
+    --variant phy-sim         OR -v3     ( build and test  )
+    --variant cppcheck        OR -v4     ( build and test  )
+    --variant gnb-usrp        OR -v5     ( build and test  )
+    --variant nr-ue-usrp      OR -v6     ( build and test  )
+    --variant enb-ethernet    OR -v7     ( build and test  )
+    --variant ue-ethernet     OR -v8     ( build and test  )
  # non-OSA Build Variants
-    --variant flexran-rtc  OR -v10
+    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
  # OpenAirInterface Test Variants
-    --variant l1-sim       OR -v20
-    --variant rf-sim       OR -v21
-    --variant l2-sim       OR -v22
+    --variant l1-sim          OR -v20    ( test  )
+    --variant rf-sim          OR -v21    ( test  )
+    --variant l2-sim          OR -v22    ( test  )
     Specify the variant to build.
 
     --keep-vm-alive OR -k

ci-scripts/doc/vm_based_simulator_check_build.md

@@ -34,6 +34,7 @@ Source file concerned: `ci-scripts/waitBuildOnVM.sh`
 *  and copy them locally in the workspace at $ARCHIVES_LOC
 *  List all log files that match the pattern. Each should have
    *  the `Built target` pattern (the library/executable SHALL link)
+*  Evaluate the remaining space on VM disk
 *  The number of patterned log files SHALL match $NB_PATTERN_FILES defined in `ci-scripts/oai-ci-vm-tool` script for the variant
 
 ---

ci-scripts/doc/vm_based_simulator_create.md

@@ -44,18 +44,20 @@ Mandatory Options:
     Specify the build ID of the Jenkins job.
 
  # OpenAirInterface Build Variants
-    --variant enb-usrp     OR -v1
-    --variant basic-sim    OR -v2
-    --variant phy-sim      OR -v3
-    --variant cppcheck     OR -v4
-    --variant enb-ethernet OR -v7
-    --variant ue-ethernet  OR -v8
+    --variant enb-usrp        OR -v1     ( build and test  )
+    --variant basic-sim       OR -v2     ( build and test  )
+    --variant phy-sim         OR -v3     ( build and test  )
+    --variant cppcheck        OR -v4     ( build and test  )
+    --variant gnb-usrp        OR -v5     ( build and test  )
+    --variant nr-ue-usrp      OR -v6     ( build and test  )
+    --variant enb-ethernet    OR -v7     ( build and test  )
+    --variant ue-ethernet     OR -v8     ( build and test  )
  # non-OSA Build Variants
-    --variant flexran-rtc  OR -v10
+    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
  # OpenAirInterface Test Variants
-    --variant l1-sim       OR -v20
-    --variant rf-sim       OR -v21
-    --variant l2-sim       OR -v22
+    --variant l1-sim          OR -v20    ( test  )
+    --variant rf-sim          OR -v21    ( test  )
+    --variant l2-sim          OR -v22    ( test  )
     Specify the variant to build.
 
     --help OR -h
@@ -73,7 +75,7 @@ This is the function that is being called from the main oai-vm-tool script.
 The main purpose is to start a VM instance:
 
 ```bash
-uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --unsafe-caching --template ci-scripts/template-host.xml
+uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu $VM_CPU --disk $VM_DISK --unsafe-caching --template ci-scripts/template-host.xml
 ```
 
 Variables are set in the main script based on the options.

ci-scripts/doc/vm_based_simulator_test.md

@@ -72,18 +72,20 @@ Options:
     Specify the workspace.
 
  # OpenAirInterface Build Variants
-    --variant enb-usrp     OR -v1
-    --variant basic-sim    OR -v2
-    --variant phy-sim      OR -v3
-    --variant cppcheck     OR -v4
-    --variant enb-ethernet OR -v7
-    --variant ue-ethernet  OR -v8
+    --variant enb-usrp        OR -v1     ( build and test  )
+    --variant basic-sim       OR -v2     ( build and test  )
+    --variant phy-sim         OR -v3     ( build and test  )
+    --variant cppcheck        OR -v4     ( build and test  )
+    --variant gnb-usrp        OR -v5     ( build and test  )
+    --variant nr-ue-usrp      OR -v6     ( build and test  )
+    --variant enb-ethernet    OR -v7     ( build and test  )
+    --variant ue-ethernet     OR -v8     ( build and test  )
  # non-OSA Build Variants
-    --variant flexran-rtc  OR -v10
+    --variant flexran-rtc     OR -v10    ( build and test non-OSA )
  # OpenAirInterface Test Variants
-    --variant l1-sim       OR -v20
-    --variant rf-sim       OR -v21
-    --variant l2-sim       OR -v22
+    --variant l1-sim          OR -v20    ( test  )
+    --variant rf-sim          OR -v21    ( test  )
+    --variant l2-sim          OR -v22    ( test  )
     Specify the variant to build.
 
     --keep-vm-alive OR -k

ci-scripts/xml_files/enb_usrp210_band40_test_05mhz_tm2.xml

@@ -25,7 +25,7 @@
 	<htmlTabRef>test-05-tm2</htmlTabRef>
 	<htmlTabName>Test-05MHz-TM2</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
-	<repeatCount>2</repeatCount>
+	<repeatCount>3</repeatCount>
         <TestCaseRequestedList>
  030201
  040101
@@ -36,7 +36,7 @@
 	<testCase id="030105">
 		<class>Initialize_eNB</class>
 		<desc>Initialize eNB (TDD/Band40/5MHz)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm2.25PRB.FairScheduler.usrpb210.conf --MACRLCs.[0].scheduler_mode default</Initialize_eNB_args>
 	</testCase>
 
 	<testCase id="030201">

ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1.xml

@@ -28,7 +28,7 @@
 	<TestCaseRequestedList>
  030201
  040101
- 030124 040301 040521 040622 040621 040623 040624 040625 040662 040661 040663 040664 040665 040401 040201 030201
+ 030124 040301 040521 040622 040621 040623 040662 040401 040201 030201
 	</TestCaseRequestedList>
 	<TestCaseExclusionList></TestCaseExclusionList>
 

ci-scripts/xml_files/enb_usrp210_band40_test_20mhz_tm1_default_scheduler.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>test-20-tm1-defSched</htmlTabRef>
+	<htmlTabName>Test-20MHz-TM1-default-scheduler</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030201
+ 040101
+ 030125 040301 040522 040627 040626 040628 040629 040630 040667 040666 040668 040669 040670 040401 040201 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="030125">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (TDD/Band40/20MHz/info)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band40.tm1.100PRB.FairScheduler.usrpb210.conf --MACRLCs.[0].scheduler_mode default</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="040101">
+		<class>Initialize_UE</class>
+		<desc>Initialize UE</desc>
+	</testCase>
+
+	<testCase id="040201">
+		<class>Terminate_UE</class>
+		<desc>Terminate UE</desc>
+	</testCase>
+
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
+
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
+
+	<testCase id="040522">
+		<class>Ping</class>
+		<desc>ping (20MHz - 20 sec)</desc>
+		<ping_args>-c 20</ping_args>
+		<ping_packetloss_threshold>25</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040626">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(balanced)</desc>
+		<iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040627">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040628">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/27.5Mbps/UDP)(30 sec)(unbalanced)</desc>
+		<iperf_args>-u -b 27.5M -t 30 -i 1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040629">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/TCP)(30 sec)(single-ue)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040630">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - DL/TCP)(30 sec)</desc>
+		<iperf_args>-t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040666">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(balanced)</desc>
+		<iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040667">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(single-ue)</desc>
+		<iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040668">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/7Mbps/UDP)(30 sec)(unbalanced)</desc>
+		<iperf_args>-u -b 7M -t 30 -i 1 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>unbalanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040669">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/TCP)(30 sec)(single-ue)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>single-ue</iperf_profile>
+	</testCase>
+
+	<testCase id="040670">
+		<class>Iperf</class>
+		<desc>iperf (20MHz - UL/TCP)(30 sec)</desc>
+		<iperf_args>-t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/enb_usrp210_band7_test_10mhz_tm1_cdrx.xml

@@ -56,7 +56,6 @@
 	<testCase id="040302">
 		<class>Attach_UE</class>
 		<desc>Attach UE</desc>
-		<nbMaxUEtoAttach>1</nbMaxUEtoAttach>
 	</testCase>
 
 	<testCase id="040401">

ci-scripts/xml_files/if4p5_usrp210_band40_test_20mhz.xml

@@ -43,7 +43,7 @@
 	<testCase id="030125">
 		<class>Initialize_eNB</class>
 		<desc>Initialize RCC (TDD/Band40/20MHz/info)</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/rcc.band40.tm1.100PRB.FairScheduler.usrpb210.conf --MACRLCs.[0].scheduler_mode default</Initialize_eNB_args>
 		<eNB_instance>1</eNB_instance>
 	</testCase>
 

ci-scripts/xml_files/inria/enb_ue_usrp210_band7_epc_start.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>epc-start-oai-ue</htmlTabRef>
+	<htmlTabName>EPC-Start-OAI-UE</htmlTabName>
+	<htmlTabIcon>log-in</htmlTabIcon>
+	<TestCaseRequestedList>
+ 050101 000001 060101 000001 070101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+    <testCase id="000001">
+        <class>IdleSleep</class>
+        <desc>Sleep</desc>
+        <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
+    </testCase>
+
+	<testCase id="050101">
+		<class>Initialize_HSS</class>
+		<desc>Initialize HSS</desc>
+	</testCase>
+
+	<testCase id="060101">
+		<class>Initialize_MME</class>
+		<desc>Initialize MME</desc>
+	</testCase>
+
+	<testCase id="070101">
+		<class>Initialize_SPGW</class>
+		<desc>Initialize SPGW</desc>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/inria/enb_ue_usrp210_band7_epc_stop.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>epc-closure</htmlTabRef>
+	<htmlTabName>EPC-Closure</htmlTabName>
+	<htmlTabIcon>log-out</htmlTabIcon>
+	<TestCaseRequestedList>
+ 050201 060201 070201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="050201">
+		<class>Terminate_HSS</class>
+		<desc>Terminate HSS</desc>
+	</testCase>
+
+	<testCase id="060201">
+		<class>Terminate_MME</class>
+		<desc>Terminate MME</desc>
+	</testCase>
+
+	<testCase id="070201">
+		<class>Terminate_SPGW</class>
+		<desc>Terminate SPGW</desc>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/inria/enb_ue_usrp210_band7_terminate.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>terminate-enb-oai-ue</htmlTabRef>
+	<htmlTabName>Terminate-all-eNBs-OAI-UEs</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<TestCaseRequestedList>
+ 030201 090109
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm1-oai-ue</htmlTabRef>
+	<htmlTabName>Test-05MHz-TM1-OAI-UE</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>4</repeatCount>
+	<TestCaseRequestedList>
+ 030201 090109
+ 030102 000001 090102 000002 040503 000002 040603 040604 040643 040644 000002 090109 000001 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep for 10 sec</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep for 3 sec</desc>
+		<idle_sleep_time_in_sec>3</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="030102">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="090102">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
+		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 130 --ue-txgain 1 --ue-max-power -6 --ue-scan-carrier --nokrnmod 1</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+	<testCase id="040503">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-I 192.168.248.159 -c 20</ping_args>
+       		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040603">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040604">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/12Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 12M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040643">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040644">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/inria/enb_ue_usrp210_band7_test_05mhz_tm1_nos1.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm1-nos1-tunnel</htmlTabRef>
+	<htmlTabName>Test-05MHz-TM1-noS1-tunnel</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>2</repeatCount>
+	<TestCaseRequestedList>
+ 030201 090109
+ 030101 000001 090101 000002 040501 040502 000001 040601 040602 040641 040642 000001 090109 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000003">
+		<class>IdleSleep</class>
+		<desc>Sleep</desc>
+		<idle_sleep_time_in_sec>60</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="030101">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --noS1 --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="090101">
+		<class>Initialize_OAI_UE</class>
+		<desc>Initialize OAI UE (FDD/Band7/5MHz)</desc>
+		<Initialize_OAI_UE_args>-C 2680000000 -r 25 --ue-rxgain 130 --ue-txgain 1 --ue-max-power -6 --ue-scan-carrier --nokrnmod 1 --noS1</Initialize_OAI_UE_args>
+	</testCase>
+
+	<testCase id="090109">
+		<class>Terminate_OAI_UE</class>
+		<desc>Terminate OAI UE</desc>
+	</testCase>
+
+	<testCase id="040501">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)(from eNB to OAI UE)</desc>
+		<ping_args>-I oaitun_enb1 -c 20 10.0.1.2</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040502">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)(from OAI UE to eNB)</desc>
+		<ping_args>-I oaitun_ue1 -c 20 10.0.1.1</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040601">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.2 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040602">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/10Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.2 -u -b 10M -t 30 -i 1 -fm -B 10.0.1.1</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040641">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.1 -u -b 1M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+	<testCase id="040642">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-c 10.0.1.1 -u -b 2M -t 30 -i 1 -fm -B 10.0.1.2 -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+		<iperf_profile>balanced</iperf_profile>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/inria/enb_usrp210_band7_build.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>build-tab-enb0</htmlTabRef>
+	<htmlTabName>Build eNB0</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 010101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="010101">
+		<class>Build_eNB</class>
+		<desc>Build eNB (USRP)</desc>
+		<Build_eNB_args>-w USRP -c --eNB</Build_eNB_args>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/inria/enb_usrp210_band7_epc_start.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>epc-start</htmlTabRef>
+	<htmlTabName>EPC-Start</htmlTabName>
+	<htmlTabIcon>log-in</htmlTabIcon>
+	<TestCaseRequestedList>
+ 050102 000001 060102 000001 070102
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+    <testCase id="000001">
+        <class>IdleSleep</class>
+        <desc>Sleep</desc>
+        <idle_sleep_time_in_sec>20</idle_sleep_time_in_sec>
+    </testCase>
+
+	<testCase id="050102">
+		<class>Initialize_HSS</class>
+		<desc>Initialize HSS</desc>
+	</testCase>
+
+	<testCase id="060102">
+		<class>Initialize_MME</class>
+		<desc>Initialize MME</desc>
+	</testCase>
+
+	<testCase id="070102">
+		<class>Initialize_SPGW</class>
+		<desc>Initialize SPGW</desc>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/inria/enb_usrp210_band7_epc_stop.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>epc-stop</htmlTabRef>
+	<htmlTabName>EPC-Stop</htmlTabName>
+	<htmlTabIcon>log-out</htmlTabIcon>
+	<TestCaseRequestedList>
+ 050201 060201 070201
+ 040101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="050201">
+		<class>Terminate_HSS</class>
+		<desc>Terminate HSS</desc>
+	</testCase>
+
+	<testCase id="060201">
+		<class>Terminate_MME</class>
+		<desc>Terminate MME</desc>
+	</testCase>
+
+	<testCase id="070201">
+		<class>Terminate_SPGW</class>
+		<desc>Terminate SPGW</desc>
+	</testCase>
+
+	<testCase id="040101">
+		<class>Initialize_UE</class>
+		<desc>Initialize UE</desc>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/inria/enb_usrp210_band7_test_05mhz_tm1.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+ 030102 000002 040301 000002 040504 040605 040606 040645 040646 000001 040401 000002 030201
+-->
+<testCaseList>
+	<htmlTabRef>test-05-tm1</htmlTabRef>
+	<htmlTabName>Test-05MHz-TM1</htmlTabName>
+	<htmlTabIcon>tasks</htmlTabIcon>
+	<repeatCount>2</repeatCount>
+	<TestCaseRequestedList>
+ 030201 040101
+ 030102 000002 040301 000002 040504 000001 040401 000002 030201
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="040101">
+		<class>Initialize_UE</class>
+		<desc>Initialize UE</desc>
+	</testCase>
+
+	<testCase id="000001">
+		<class>IdleSleep</class>
+		<desc>Sleep for 10 sec</desc>
+		<idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="000002">
+		<class>IdleSleep</class>
+		<desc>Sleep for 3 sec</desc>
+		<idle_sleep_time_in_sec>3</idle_sleep_time_in_sec>
+	</testCase>
+
+	<testCase id="030102">
+		<class>Initialize_eNB</class>
+		<desc>Initialize eNB (FDD/Band7/5MHz)</desc>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf --eNBs.[0].rrc_inactivity_threshold 0 --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].pusch_p0_Nominal -90 --eNBs.[0].component_carriers.[0].pucch_p0_Nominal -96 --eNBs.[0].tracking_area_code 600 --eNBs.[0].plmn_list.[0].mnc 95 --THREAD_STRUCT.[0].parallel_config PARALLEL_RU_L1_TRX_SPLIT</Initialize_eNB_args>
+	</testCase>
+
+	<testCase id="030201">
+		<class>Terminate_eNB</class>
+		<desc>Terminate eNB</desc>
+	</testCase>
+
+	<testCase id="040301">
+		<class>Attach_UE</class>
+		<desc>Attach UE</desc>
+	</testCase>
+
+	<testCase id="040401">
+		<class>Detach_UE</class>
+		<desc>Detach UE</desc>
+	</testCase>
+
+	<testCase id="040504">
+		<class>Ping</class>
+		<desc>ping (5MHz - 20 sec)</desc>
+		<ping_args>-I 192.168.248.159 -c 20</ping_args>
+		<ping_packetloss_threshold>5</ping_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040605">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040606">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - DL/12Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 12M -t 30 -i 1 -fm</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040645">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/1Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 1M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+	<testCase id="040646">
+		<class>Iperf</class>
+		<desc>iperf (5MHz - UL/2Mbps/UDP)(30 sec)</desc>
+		<iperf_args>-u -b 2M -t 30 -i 1 -fm -R</iperf_args>
+		<iperf_packetloss_threshold>50</iperf_packetloss_threshold>
+	</testCase>
+
+</testCaseList>

ci-scripts/xml_files/inria/ue_usrp210_band7_build.xml

+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>build-tab-ue0</htmlTabRef>
+	<htmlTabName>Build UE0</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+090101
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="090101">
+		<class>Build_OAI_UE</class>
+		<desc>Build OAI UE</desc>
+		<Build_OAI_UE_args>-w USRP --UE</Build_OAI_UE_args>
+	</testCase>
+
+</testCaseList>

common/utils/T/tracer/hacks/multi-rru-clean.c

@@ -12,6 +12,7 @@ void usage(void)
     "usage: <number of tags> <input record file> <output curated record file>\n"
     "options:\n"
     "    -d <database file>        this option is mandatory\n"
+    "    -e <event name>           trace given event (default CALIBRATION_CHANNEL_ESTIMATES)\n"
   );
   exit(1);
 }
@@ -88,6 +89,7 @@ int main(int n, char **v)
   int  number_of_tags = -1;
   char *input_filename = NULL;
   char *output_filename = NULL;
+  char *event_name = "CALIBRATION_CHANNEL_ESTIMATES";
   int  i;
   FILE *in;
   FILE *out;
@@ -107,6 +109,8 @@ int main(int n, char **v)
     if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
     if (!strcmp(v[i], "-d")) { if (i > n-2) usage();
       database_filename = v[++i]; continue; }
+    if (!strcmp(v[i], "-e")) { if (i > n-2) usage();
+      event_name = v[++i]; continue; }
     if (number_of_tags == -1) { number_of_tags = atoi(v[i]);
       if (number_of_tags <= 0) {usage();} continue; }
     if (input_filename == NULL) { input_filename = v[i]; continue; }
@@ -124,7 +128,7 @@ int main(int n, char **v)
 
   database = parse_database(database_filename);
 
-  channel_estimate_id = event_id_from_name(database, "CALIBRATION_CHANNEL_ESTIMATES");
+  channel_estimate_id = event_id_from_name(database, event_name);
   f = get_format(database, channel_estimate_id);
 
   frame_arg    = get_field(&f, "frame",    "int");

executables/nr-ru.c

@@ -791,7 +791,6 @@ void *ru_thread_asynch_rxtx( void *param ) {
   printf( "devices ok (ru_thread_asynch_rx)\n");
 
   while (!oai_exit) {
-    if (oai_exit) break;
 
     if (slot==ru->nr_frame_parms->slots_per_frame) {
       slot=0;
@@ -837,7 +836,7 @@ void *ru_thread_prach( void *param ) {
   LOG_I(PHY,"%s() RU configured - RACH processing thread running\n", __FUNCTION__);
 
   while (!oai_exit) {
-    if (oai_exit) break;
+    
 
     if (wait_on_condition(&proc->mutex_prach,&proc->cond_prach,&proc->instance_cnt_prach,"ru_prach_thread") < 0) break;
 
@@ -1142,7 +1141,7 @@ int setup_RU_buffers(RU_t *ru) {
     frame_parms = ru->nr_frame_parms;
     printf("setup_RU_buffers: frame_parms = %p\n",frame_parms);
   } else {
-    printf("RU[%d] not initialized\n", ru->idx);
+    printf("ru pointer is NULL\n");
     return(-1);
   }
 
@@ -1242,7 +1241,6 @@ void *ru_thread_tx( void *param ) {
   }
 
   while (!oai_exit) {
-    if (oai_exit) break;
 
     LOG_D(PHY,"ru_thread_tx: Waiting for TX processing\n");
     // wait until eNBs are finished subframe RX n and TX n+4

executables/nr-ue.c

@@ -574,7 +574,7 @@ void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
 }
 
 int computeSamplesShift(PHY_VARS_NR_UE *UE) {
-  if ( getenv("RFSIMULATOR") != 0) {
+  if (IS_SOFTMODEM_RFSIM) {
     LOG_E(PHY,"SET rx_offset %d \n",UE->rx_offset);
     //UE->rx_offset_diff=0;
     return 0;
@@ -791,7 +791,7 @@ if (slot_nr==18)
     msgToPush->key=slot_nr;
     pushTpool(Tpool, msgToPush);
 
-    if (getenv("RFSIMULATOR") || IS_SOFTMODEM_NOS1) {  //getenv("RFSIMULATOR")
+    if (IS_SOFTMODEM_RFSIM || IS_SOFTMODEM_NOS1) {  //getenv("RFSIMULATOR")
       // FixMe: Wait previous thread is done, because race conditions seems too bad
       // in case of actual RF board, the overlap between threads mitigate the issue
       // We must receive one message, that proves the slot processing is done

openair1/PHY/CODING/TESTBENCH/ldpctest.c

@@ -317,6 +317,7 @@ int test_ldpc(short No_iteration,
         for (i = 0; i < block_length+(nrows-no_punctured_columns) * Zc - removed_bit; i++)
           if (channel_input[j][i]!=channel_input_optim[j][i]) {
             printf("differ in seg %u pos %u (%u,%u)\n", j, i, channel_input[j][i], channel_input_optim[j][i]);
+            free(channel_output);
             return (-1);
           }
       //else{

openair1/PHY/CODING/TESTBENCH/polartest.c

@@ -215,6 +215,8 @@ if (logFlag){
   free(encoder_outputByte);
   free(channel_output);
   free(modulated_input);
+  if (logFlag)
+    fclose(logFile);
   return 0;
 #endif
 
@@ -317,13 +319,13 @@ if (logFlag){
       if (nBitError>0) blockErrorState=1;
 #ifdef DEBUG_POLARTEST
           		  for (int i = 0; i < testArrayLength; i++)
-          			  printf("[polartest/decoderState=%d] testInput[%d]=0x%08x, estimatedOutput[%d]=0x%08x\n",decoderState, i, testInput[i], i, estimatedOutput[i]);
+          			  printf("[polartest/decoderState=%u] testInput[%d]=0x%08x, estimatedOutput[%d]=0x%08x\n",decoderState, i, testInput[i], i, estimatedOutput[i]);
 #endif
 
       //Iteration times are in microseconds.
       timeEncoderCumulative+=(timeEncoder.diff/(cpu_freq_GHz*1000.0));
       timeDecoderCumulative+=(timeDecoder.diff/(cpu_freq_GHz*1000.0));
-      if (logFlag) fprintf(logFile,",%f,%d,%d,%f,%f\n", SNR, nBitError, blockErrorState, (timeEncoder.diff/(cpu_freq_GHz*1000.0)), (timeDecoder.diff/(cpu_freq_GHz*1000.0)));
+      if (logFlag) fprintf(logFile,",%f,%d,%u,%f,%f\n", SNR, nBitError, blockErrorState, (timeEncoder.diff/(cpu_freq_GHz*1000.0)), (timeDecoder.diff/(cpu_freq_GHz*1000.0)));
 
       if (nBitError<0) {
         blockErrorCumulative++;

openair1/PHY/CODING/coding_defs.h

@@ -38,7 +38,7 @@
 #define MAX_TURBO_ITERATIONS_MBSFN 8
 #define MAX_TURBO_ITERATIONS max_turbo_iterations
 
-#define MAX_LDPC_ITERATIONS 5
+#define MAX_LDPC_ITERATIONS 10//5
 #define MAX_LDPC_ITERATIONS_MBSFN 4
 
 #define LTE_NULL 2
@@ -495,7 +495,9 @@ int nr_rate_matching_ldpc_rx(uint8_t Ilbrm,
                              uint8_t C,
                              uint8_t rvidx,
                              uint8_t clear,
-                             uint32_t E);
+                             uint32_t E,
+			     uint32_t F,
+			     uint32_t Foffset);
 
 decoder_if_t phy_threegpplte_turbo_decoder;
 decoder_if_t phy_threegpplte_turbo_decoder8;

openair1/PHY/CODING/lte_segmentation.c

@@ -59,7 +59,7 @@ int lte_segmentation(unsigned char *input_buffer,
   }
 
   if ((*C)>MAX_NUM_DLSCH_SEGMENTS) {
-    printf("%d\n",*(int*)0);
+    printf("%d\n",*(int *)0);
     LOG_E(PHY,"lte_segmentation.c: too many segments %d, B %d, L %d, Bprime %d\n",*C,B,L,Bprime);
     return(-1);
   }
@@ -105,7 +105,7 @@ int lte_segmentation(unsigned char *input_buffer,
 #endif
     *Kminus = (*Kplus - 64);
   } else {
-    printf("lte_segmentation.c: Illegal codeword size !!!\n");
+    LOG_E(PHY,"lte_segmentation.c: Illegal codeword size !!!\n");
     return(-1);
   }
 

openair1/PHY/CODING/nrLDPC_encoder/ldpc_generate_coefficient.c

@@ -494,7 +494,8 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,int
     fprintf(fd,"  int i2;\n");
     fprintf(fd2,"  int i2;\n");
     fprintf(fd,"  for (i2=0; i2<%d; i2++) {\n",Zc>>shift);
-    fprintf(fd2,"  for (i2=0; i2<%d; i2++) {\n",Zc>>(shift-1));
+    if (shift > 0)
+      fprintf(fd2,"  for (i2=0; i2<%d; i2++) {\n",Zc>>(shift-1));
     for (i2=0; i2 < 1; i2++)
     {
       //t=Kb*Zc+i2;

openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c

@@ -252,6 +252,7 @@ int8_t polar_decoder(double *input,
         nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
         nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
         nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+        free(tempECGM);
         return(-1);
       }
 
@@ -522,6 +523,7 @@ int8_t polar_decoder_dci(double *input,
         nr_free_uint8_3D_array(bit, polarParams->N, (polarParams->n+1));
         nr_free_double_3D_array(llr, polarParams->N, (polarParams->n+1));
         nr_free_uint8_2D_array(crcChecksum, polarParams->crcParityBits);
+        free(tempECGM);
         return(-1);
       }
 

openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c

@@ -470,7 +470,7 @@ void computeBeta(const t_nrPolar_params *pp,decoder_node_t *node) {
       int ssr4len = node->Nv/2/8;
       register __m128i allones=*((__m128i*)all1);
       for (int i=0;i<sse4len;i++) {
-      ((__m256i*)betav)[i] = _mm_or_si128(_mm_cmpeq_epi16(((__m128i*)betar)[i], ((__m128i*)betal)[i]),allones));
+      ((__m256i*)betav)[i] = _mm_or_si128(_mm_cmpeq_epi16(((__m128i*)betar)[i], ((__m128i*)betal)[i]),allones);
       }
     }
     else if (sse4mod == 4) {

openair1/PHY/CODING/nr_rate_matching.c

@@ -407,7 +407,9 @@ int nr_rate_matching_ldpc_rx(uint8_t Ilbrm,
                              uint8_t C,
                              uint8_t rvidx,
                              uint8_t clear,
-                             uint32_t E)
+                             uint32_t E,
+			     uint32_t F,
+			     uint32_t Foffset)
 {
   uint32_t Ncb,ind,k,Nref,N;
 
@@ -431,53 +433,60 @@ int nr_rate_matching_ldpc_rx(uint8_t Ilbrm,
   }
 
   ind = (index_k0[BG-1][rvidx]*Ncb/N)*Z;
+  AssertFatal(Foffset <= E,"Foffset %d > E %d\n",Foffset,E); 
+  AssertFatal(Foffset <= Ncb,"Foffset %d > Ncb %d\n",Foffset,Ncb); 
 
 #ifdef RM_DEBUG
   printf("nr_rate_matching_ldpc_rx: Clear %d, E %d, k0 %d, Ncb %d, rvidx %d\n", clear, E, ind, Ncb, rvidx);
 #endif
 
-  if (clear==1)
-    memset(w,0,Ncb*sizeof(int16_t));
+  if (clear==1) memset(w,0,Ncb*sizeof(int16_t));
 
   k=0;
 
-  for (; (ind<Ncb)&&(k<E); ind++) {
-    if (soft_input[ind] != NR_NULL) {
-      w[ind] += soft_input[k++];
+  if (ind < Foffset)
+    for (; (ind<Foffset)&&(k<E); ind++) {
 #ifdef RM_DEBUG
-      printf("RM_RX k%d Ind: %d (%d)\n",k-1,ind,w[ind]);
+      printf("RM_RX k%d Ind %d(before filler): %d (%d)=>",k,ind,w[ind],soft_input[k]);
 #endif
-    }
-
+      w[ind]+=soft_input[k++];
 #ifdef RM_DEBUG
-    else {
-      printf("RM_RX Ind: %d NULL %d\n",ind,nulled);
-      nulled++;
+      printf("%d\n",w[ind]);
+#endif
     }
+  if (ind >= Foffset && ind < Foffset+F) ind=Foffset+F;
 
+  for (; (ind<Ncb)&&(k<E); ind++) {
+#ifdef RM_DEBUG
+    printf("RM_RX k%d Ind %d(after filler) %d (%d)=>",k,ind,w[ind],soft_input[k]);
+#endif
+      w[ind] += soft_input[k++];
+#ifdef RM_DEBUG
+      printf("%d\n",w[ind]);
 #endif
   }
 
-  if (rvidx !=0){
   while(k<E) {
-    for (ind=0; (ind<Ncb)&&(k<E); ind++) {
-      if (soft_input[ind] != NR_NULL) {
-        w[ind] += soft_input[k++];
+    for (ind=0; (ind<Foffset)&&(k<E); ind++) {
 #ifdef RM_DEBUG
-        printf("RM_RX k%d Ind: %d (%d)(soft in %d)\n",k-1,ind,w[ind],soft_input[k-1]);
+      printf("RM_RX k%d Ind %d(before filler) %d(%d)=>",k,ind,w[ind],soft_input[k]);
 #endif
-      }
-
+      w[ind]+=soft_input[k++];
 #ifdef RM_DEBUG
-      else {
-        printf("RM_RX Ind: %d NULL %d\n",ind,nulled);
-        nulled++;
-      }
-
+      printf("%d\n",w[ind]);
+#endif
+    }
+    for (ind=Foffset+F; (ind<Ncb)&&(k<E); ind++) {
+#ifdef RM_DEBUG
+      printf("RM_RX (after filler) k%d Ind: %d (%d)(soft in %d)=>",k,ind,w[ind],soft_input[k]);
+#endif
+      w[ind] += soft_input[k++];
+#ifdef RM_DEBUG
+      printf("%d\n",w[ind]);
 #endif
     }
   }
-  }
+
 
   return 0;
 }

openair1/PHY/LTE_TRANSPORT/uci_tools.c

@@ -31,7 +31,7 @@
 */
 #include "PHY/defs_eNB.h"
 #ifdef DEBUG_UCI_TOOLS
-#include "PHY/vars.h"
+  #include "PHY/vars.h"
 #endif
 
 //#define DEBUG_UCI 1
@@ -41,15 +41,21 @@ int16_t find_uci(uint16_t rnti, int frame, int subframe, PHY_VARS_eNB *eNB,find_
   uint16_t i;
   int16_t first_free_index=-1;
   AssertFatal(eNB!=NULL,"eNB is null\n");
+
   for (i=0; i<NUMBER_OF_UCI_VARS_MAX; i++) {
     if ((eNB->uci_vars[i].active >0) &&
-	(eNB->uci_vars[i].rnti==rnti) &&
-	(eNB->uci_vars[i].frame==frame) &&
-	(eNB->uci_vars[i].subframe==subframe)) return(i); 
+        (eNB->uci_vars[i].rnti==rnti) &&
+        (eNB->uci_vars[i].frame==frame) &&
+        (eNB->uci_vars[i].subframe==subframe)) return(i);
     else if ((eNB->uci_vars[i].active == 0) && (first_free_index==-1)) first_free_index=i;
   }
+
   if (type == SEARCH_EXIST) return(-1);
-  else return(first_free_index);
+
+  if (first_free_index==-1)
+    LOG_E(MAC,"UCI table is full\n");
+
+  return(first_free_index);
 }
 
 

openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c

@@ -561,8 +561,8 @@ int ulsch_decoding_data(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag)
   else
     tc = *decoder8;
 
-  if(ulsch_harq->repetition_number == 1){
-	  memset(pusch_rep_buffer,0,(sizeof(int32_t)*3*(6144+64))) ;  // reset the buffer every new repetitions
+  if(ulsch_harq->repetition_number == 1) {
+    memset(pusch_rep_buffer,0,(sizeof(int32_t)*3*(6144+64))) ;  // reset the buffer every new repetitions
   }
 
   for (r=0; r<ulsch_harq->C; r++) {
@@ -579,11 +579,10 @@ int ulsch_decoding_data(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag)
                                           (uint8_t *)&dummy_w[r][0],
                                           (r==0) ? ulsch_harq->F : 0);
 #ifdef DEBUG_ULSCH_DECODING
-    printf("Rate Matching Segment %u (coded bits (G) %d,unpunctured/repeated bits %u, Q_m %d, nb_rb %d, Nl %d)...\n",
+    printf("Rate Matching Segment %u (coded bits (G) %d,unpunctured/repeated bits %u, Q_m %d, Nl %d)...\n",
            r, G,
            Kr*3,
-           Q_m,
-           nb_rb,
+           ulsch_harq->Qm,
            ulsch_harq->Nl);
 #endif
     start_meas(&eNB->ulsch_rate_unmatching_stats);
@@ -608,26 +607,22 @@ int ulsch_decoding_data(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag)
     }
 
     stop_meas(&eNB->ulsch_rate_unmatching_stats);
-
     max_Ncb = 3*ulsch_harq->RTC[r]*32 ;
 
-    if(ulsch_harq->total_number_of_repetitions > 1)
-    {
-    	if (ulsch_harq->rvidx==1)
-    	{ 					// Store the result of HARQ combining in the last emtc repetitions of sequence 0,2,3,1
-    		for (int nn=0;nn<max_Ncb;nn++)
-    		{
-    			pusch_rep_buffer[nn] += ulsch_harq->w[r][nn] ;
-    		}
+    if(ulsch_harq->total_number_of_repetitions > 1) {
+      if (ulsch_harq->rvidx==1) {
+        // Store the result of HARQ combining in the last emtc repetitions of sequence 0,2,3,1
+        for (int nn=0; nn<max_Ncb; nn++) {
+          pusch_rep_buffer[nn] += ulsch_harq->w[r][nn] ;
+        }
+      }
+
+      if (ulsch_harq->repetition_number == ulsch_harq->total_number_of_repetitions) {
+        for (int nn=0; nn<max_Ncb; nn++) {
+          ulsch_harq->w[r][nn] =  pusch_rep_buffer[nn] ;
         }
-    	if (ulsch_harq->repetition_number == ulsch_harq->total_number_of_repetitions)
-    	{
-    		for (int nn=0;nn<max_Ncb;nn++)
-    		{
-    			ulsch_harq->w[r][nn] =  pusch_rep_buffer[nn] ;
-      		}
-      	}
       }
+    }
 
     r_offset += E;
     start_meas(&eNB->ulsch_deinterleaving_stats);
@@ -727,11 +722,13 @@ static inline unsigned int lte_gold_unscram(unsigned int *x1, unsigned int *x2,
   //  printf("n=%d : c %x\n",n,x1^x2);
 }
 
-unsigned int  ulsch_decoding(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,
+unsigned int  ulsch_decoding(PHY_VARS_eNB *eNB,
+                             L1_rxtx_proc_t *proc,
                              uint8_t UE_id,
                              uint8_t control_only_flag,
                              uint8_t Nbundled,
-                             uint8_t llr8_flag) {
+                             uint8_t llr8_flag)
+{
   int16_t *ulsch_llr = eNB->pusch_vars[UE_id]->llr;
   LTE_DL_FRAME_PARMS *frame_parms = &eNB->frame_parms;
   LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[UE_id];
@@ -762,12 +759,13 @@ unsigned int  ulsch_decoding(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc,
   int frame = proc->frame_rx;
   int subframe = proc->subframe_rx;
   LTE_UL_eNB_HARQ_t *ulsch_harq;
+
   LOG_D(PHY,"ue_type %d\n",ulsch->ue_type);
 
-  if (ulsch->ue_type>0)     harq_pid = 0;
-  else {
+  if (ulsch->ue_type>0)
+    harq_pid = 0;
+  else
     harq_pid = subframe2harq_pid(frame_parms,proc->frame_rx,subframe);
-  }
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_ULSCH_DECODING0+harq_pid,1);
   // x1 is set in lte_gold_generic

openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c

@@ -278,6 +278,7 @@ char phich_string[13][4] = {"","1/6","","1/2","","","one","","","","","","two"};
 char duplex_string[2][4] = {"FDD","TDD"};
 char prefix_string[2][9] = {"NORMAL","EXTENDED"};
 
+
 int initial_sync(PHY_VARS_UE *ue, runmode_t mode) {
   int32_t sync_pos,sync_pos2,sync_pos_slot;
   int32_t metric_fdd_ncp=0,metric_fdd_ecp=0,metric_tdd_ncp=0,metric_tdd_ecp=0;
@@ -557,13 +558,12 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode) {
     ue->measurements.rx_power_avg_dB[0] = dB_fixed(ue->measurements.rx_power_avg[0]);
     LOG_I(PHY,"[UE%d] Initial sync : Estimated power: %d dB\n",ue->Mod_id,ue->measurements.rx_power_avg_dB[0] );
 
-    if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM )
+    if (IS_SOFTMODEM_BASICSIM )
       phy_adjust_gain(ue,ue->measurements.rx_power_avg_dB[0],0);
   } else {
-    if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM )
+    if (IS_SOFTMODEM_BASICSIM )
       phy_adjust_gain(ue,dB_fixed(ue->measurements.rssi),0);
   }
 
   return ret;
 }
-

openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c

@@ -80,7 +80,7 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
   int i, prach_len;
   uint16_t first_nonzero_root_idx=0;
 
-  if ( !(IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM) ) {
+  if ( !(IS_SOFTMODEM_BASICSIM ) ) {
     prach_start =  (ue->rx_offset+subframe*ue->frame_parms.samples_per_tti-ue->hw_timing_advance-ue->N_TA_offset);
 #ifdef PRACH_DEBUG
     LOG_I(PHY,"[UE %d] prach_start %d, rx_offset %d, hw_timing_advance %d, N_TA_offset %d\n", ue->Mod_id,
@@ -473,7 +473,7 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
   AssertFatal(prach_fmt<4,
               "prach_fmt4 not fully implemented" );
 
-  if (!(IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM) ) {
+  if (!(IS_SOFTMODEM_BASICSIM ) ) {
     int j;
     int overflow = prach_start + prach_len - LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*ue->frame_parms.samples_per_tti;
     LOG_I( PHY, "prach_start=%d, overflow=%d\n", prach_start, overflow );

openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c

@@ -103,7 +103,11 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
          break;
 
    default:
-     printf("pusch_channel_estimation: nushift=%d -> ERROR\n",nushift);
+#ifdef DEBUG_CH
+      if (debug_ch_est)
+        fclose(debug_ch_est);
+
+#endif
      return(-1);
      break;
    }
@@ -193,7 +197,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
         ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
         ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 #ifdef DEBUG_CH
-    fprintf(debug_ch_est, "pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
+    fprintf(debug_ch_est, "pilot %u : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
 	//printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
 #endif
         multadd_real_vector_complex_scalar(fm,
@@ -208,7 +212,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
         ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
         ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 #ifdef DEBUG_PUSCH
-	printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
+      printf("pilot %u : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
 #endif
         multadd_real_vector_complex_scalar(fmm,
                                            ch,
@@ -225,7 +229,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
 	  ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
       ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 #ifdef DEBUG_PUSCH
-	printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
+    printf("pilot %u : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
 #endif
       multadd_real_vector_complex_scalar(fm,
                                          ch,
@@ -243,7 +247,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
       ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 #ifdef DEBUG_PUSCH
       printf("ch 0 %d\n",((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1]));
-      printf("pilot %d: rxF - > (%d,%d) addr %p  ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],&rxF[0],ch[0],ch[1],pil[0],pil[1]);
+      printf("pilot %u: rxF - > (%d,%d) addr %p  ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],&rxF[0],ch[0],ch[1],pil[0],pil[1]);
 #endif
       multadd_real_vector_complex_scalar(fmr,
                                          ch,
@@ -258,7 +262,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
       ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
       ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 #ifdef DEBUG_PUSCH
-      printf("pilot %d: rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+2,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
+      printf("pilot %u: rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+2,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
 #endif
       multadd_real_vector_complex_scalar(fr,
                                          ch,

openair1/PHY/NR_TRANSPORT/nr_dlsch.h

@@ -89,7 +89,8 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t *dlsch,
 			  time_stats_t *dlsch_segmentation_stats);
 
 
-void free_gNB_dlsch(NR_gNB_DLSCH_t *dlsch,uint16_t N_RB);
+
+void free_gNB_dlsch(NR_gNB_DLSCH_t **dlschptr,uint16_t N_RB);
 
 void clean_gNB_dlsch(NR_gNB_DLSCH_t *dlsch);
 

openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c

@@ -49,11 +49,14 @@
 //#define DEBUG_DLSCH_CODING
 //#define DEBUG_DLSCH_FREE 1
 
-void free_gNB_dlsch(NR_gNB_DLSCH_t *dlsch,uint16_t N_RB)
+
+void free_gNB_dlsch(NR_gNB_DLSCH_t **dlschptr,uint16_t N_RB)
 {
   int i;
   int r;
 
+  NR_gNB_DLSCH_t *dlsch = *dlschptr;
+
   uint16_t a_segments = MAX_NUM_NR_DLSCH_SEGMENTS;  //number of segments to be allocated
   if (dlsch) {
 
@@ -269,7 +272,9 @@ NR_gNB_DLSCH_t *new_gNB_dlsch(NR_DL_FRAME_PARMS *frame_parms,
 
   LOG_D(PHY,"new_gNB_dlsch exit flag %d, size of  %ld\n",
 	exit_flag, sizeof(NR_gNB_DLSCH_t));
+
   free_gNB_dlsch(dlsch,N_RB);
+
   return(NULL);
 
 
@@ -318,7 +323,7 @@ int nr_dlsch_encoding(unsigned char *a,
 
   unsigned int G;
   unsigned int crc=1;
-  uint8_t harq_pid = dlsch->harq_ids[frame%2][slot];
+  uint8_t harq_pid = dlsch->harq_ids[frame&2][slot];
   AssertFatal(harq_pid<8 && harq_pid>=0,"illegal harq_pid %d\b",harq_pid);
   nfapi_nr_dl_tti_pdsch_pdu_rel15_t *rel15 = &dlsch->harq_processes[harq_pid]->pdsch_pdu.pdsch_pdu_rel15;
   uint16_t nb_rb = rel15->rbSize;
@@ -455,6 +460,7 @@ int nr_dlsch_encoding(unsigned char *a,
 
     if (F>0) {
       for (int k=(Kr-F-2*(*Zc)); k<Kr-2*(*Zc); k++) {
+	// writing into positions d[r][k-2Zc] as in clause 5.3.2 step 2) in 38.212
         dlsch->harq_processes[harq_pid]->d[r][k] = NR_NULL;
 	//if (k<(Kr-F+8))
 	//printf("r %d filler bits [%d] = %d \n", r,k, dlsch->harq_processes[harq_pid]->d[r][k]);
@@ -469,16 +475,15 @@ int nr_dlsch_encoding(unsigned char *a,
 
     E = nr_get_E(G, dlsch->harq_processes[harq_pid]->C, mod_order, rel15->nrOfLayers, r);
 
-#ifdef DEBUG_DLSCH_CODING
-    printf("Rate Matching, Code segment %d/%d (coded bits (G) %u, E %d, Filler bits %d, Filler offset %d mod_order %d, nb_rb %d)...\n",
-	   r,
-	   dlsch->harq_processes[harq_pid]->C,
-	   G,
-	   E,
-	   F,
-	   Kr-F-2*(*Zc),
-	   mod_order,nb_rb);
-#endif
+    //#ifdef DEBUG_DLSCH_CODING
+    LOG_D(PHY,"Rate Matching, Code segment %d/%d (coded bits (G) %u, E %d, Filler bits %d, Filler offset %d mod_order %d, nb_rb %d)...\n",
+	  r,
+	  dlsch->harq_processes[harq_pid]->C,
+	  G,
+	  E,
+	  F,
+	  Kr-F-2*(*Zc),
+	  mod_order,nb_rb);
 
     // for tbslbrm calculation according to 5.4.2.1 of 38.212
     if (rel15->nrOfLayers < Nl)
@@ -501,7 +506,7 @@ int nr_dlsch_encoding(unsigned char *a,
     stop_meas(dlsch_rate_matching_stats);
 #ifdef DEBUG_DLSCH_CODING
     for (int i =0; i<16; i++)
-      LOG_D(PHY,"output ratematching e[%d]= %d r_offset %d\n", i,dlsch->harq_processes[harq_pid]->e[i+r_offset], r_offset);
+      printf("output ratematching e[%d]= %d r_offset %u\n", i,dlsch->harq_processes[harq_pid]->e[i+r_offset], r_offset);
 #endif
 
     start_meas(dlsch_interleaving_stats);
@@ -513,7 +518,7 @@ int nr_dlsch_encoding(unsigned char *a,
 
 #ifdef DEBUG_DLSCH_CODING
     for (int i =0; i<16; i++)
-      LOG_D(PHY,"output interleaving f[%d]= %d r_offset %d\n", i,dlsch->harq_processes[harq_pid]->f[i+r_offset], r_offset);
+      printf("output interleaving f[%d]= %d r_offset %u\n", i,dlsch->harq_processes[harq_pid]->f[i+r_offset], r_offset);
 
     if (r==dlsch->harq_processes[harq_pid]->C-1)
       write_output("enc_output.m","enc",dlsch->harq_processes[harq_pid]->f,G,1,4);

openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c

@@ -304,10 +304,9 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
                            uint8_t harq_pid,
                            uint8_t is_crnti)
 {
-
   uint32_t A,E;
   uint32_t G;
-  uint32_t ret,offset;
+  uint32_t ret, offset;
   int32_t no_iteration_ldpc, length_dec;
   uint32_t r,r_offset=0,Kr=8424,Kr_bytes,K_bytes_F,err_flag=0;
   uint8_t crc_type;
@@ -334,10 +333,10 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
 
   int16_t  z [68*384];
   int8_t   l [68*384];
-  uint8_t  kc=255;
-  uint8_t  Ilbrm        = 0;
-  uint32_t Tbslbrm     = 950984;
-  double   Coderate    = 0.0;
+  uint8_t  kc       = 255;
+  uint8_t  Ilbrm    = 0;
+  uint32_t Tbslbrm  = 950984;
+  double   Coderate = 0.0;
   
   // ------------------------------------------------------------------
   uint16_t nb_rb          = nfapi_ulsch_pdu_rel15->number_rbs;
@@ -523,7 +522,9 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
                                  harq_process->C,
                                  nfapi_ulsch_pdu_rel15->rv,
                                  (harq_process->round==0)?1:0,
-                                 E)==-1) {
+                                 E,
+				 harq_process->F,
+				 Kr-harq_process->F-2*(p_decParams->Z))==-1) {
 #if gNB_TIMING_TRACE
       stop_meas(ulsch_rate_unmatching_stats);
 #endif
@@ -543,7 +544,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
       write_output("decoder_in.m","dec",&harq_process->d[0][0],(3*8*Kr_bytes)+12,1,0);
     }
 
-    printf("decoder input(segment %u) :",r);
+    printf("decoder input(segment %u) :", r);
     int i; 
     for (i=0;i<(3*8*Kr_bytes)+12;i++)
       printf("%d : %d\n",i,harq_process->d[r][i]);
@@ -581,7 +582,9 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
       }
 
       AssertFatal(kc!=255,"");
-      for (i=Kr_bytes,j=K_bytes_F-((2*p_decParams->Z)>>3); i < ((kc*p_decParams->Z)>>3); i++, j++) {
+      j+=(harq_process->F>>3);
+      //      for (i=Kr_bytes,j=K_bytes_F-((2*p_decParams->Z)>>3); i < ((kc*p_decParams->Z)>>3); i++, j++) {
+      for (i=Kr_bytes; i < ((kc*p_decParams->Z)>>3); i++, j++) {
         pv[i]= _mm_loadu_si128((__m128i*)(&harq_process->d[r][8*j]));
       }
     
@@ -720,13 +723,9 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
     offset += (Kr_bytes - (harq_process->F>>3) - ((harq_process->C>1)?3:0));
 
 #ifdef DEBUG_ULSCH_DECODING
-    printf("Segment %u : Kr= %u bytes\n",r,Kr_bytes);
-    printf("copied %d bytes to b sequence (harq_pid %d)\n",
-           (Kr_bytes - (harq_process->F>>3)-((harq_process->C>1)?3:0)),harq_pid);
-    printf("b[0] = %x,c[%d] = %x\n",
-           harq_process->b[offset],
-           harq_process->F>>3,
-           harq_process->c[r]);
+    printf("Segment %u : Kr = %u bytes\n", r, Kr_bytes);
+    printf("copied %d bytes to b sequence (harq_pid %d)\n", (Kr_bytes - (harq_process->F>>3)-((harq_process->C>1)?3:0)), harq_pid);
+    printf("b[0] = %x, c[%d] = %x\n", harq_process->b[offset], harq_process->F>>3, harq_process->c[r]);
 #endif
 
   }

openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c

@@ -192,12 +192,12 @@ int nr_pbch_dmrs_correlation(PHY_VARS_NR_UE *ue,
 
 
 int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
-			       uint8_t eNB_offset,
-			       unsigned char Ns,
-			       unsigned char symbol,
-			       int dmrss,
-			       uint8_t ssb_index,
-			       uint8_t n_hf)
+                               uint8_t eNB_offset,
+                               unsigned char Ns,
+                               unsigned char symbol,
+                               int dmrss,
+                               uint8_t ssb_index,
+                               uint8_t n_hf)
 {
   int pilot[200] __attribute__((aligned(16)));
   unsigned char aarx,p;

openair1/PHY/NR_UE_TRANSPORT/cic_filter_nr.c

@@ -438,6 +438,7 @@ void cic_decimator(int16_t *input_buffer, int16_t *output_buffer, int length, in
     fir_filter_basic(input, output, new_length,  FIR_TAPS_NUMBER, filter_taps, SHARPENED_FIR_SCALING_ACC);
 
 #endif
+    free(filter_taps_fixed_point);
   }
   else
   {

openair1/PHY/NR_UE_TRANSPORT/dci_nr.c

@@ -250,6 +250,7 @@ void pdcch_channel_level(int32_t **dl_ch_estimates_ext,
     avg128P = _mm_setzero_si128();
     dl_ch128=(__m128i *)&dl_ch_estimates_ext[aarx][0];
 #elif defined(__arm__)
+    dl_ch128=(int16x8_t *)&dl_ch_estimates_ext[aarx][0];
 #endif
 
     for (rb=0; rb<(nb_rb*3)>>2; rb++) {
@@ -361,6 +362,7 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
      * then the IQ symbol is going to be found at the position 0+c_rb-N_RB_DL/2 in rxdataF and
      * we have to point the pointer at (1+c_rb-N_RB_DL/2) in rxdataF
      */
+
     LOG_DDD("n_BWP_start=%d, coreset_nbr_rb=%d\n",n_BWP_start,coreset_nbr_rb);
     int c_rb_by6;
     c_rb = n_BWP_start;
@@ -827,8 +829,8 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
     }
   }
 
-  LOG_DD("symbol_mon=(%d) and start_symbol=(%d)\n",symbol_mon,start_symbol);
-  LOG_DD("coreset_freq_dom=(%ld) n_rb_offset=(%d) coreset_time_dur=(%d) n_shift=(%d) reg_bundle_size_L=(%d) coreset_interleaver_size_R=(%d) scrambling_ID=(%d) \n",
+  LOG_DD("symbol_mon=(%u) and start_symbol=(%u)\n",symbol_mon,start_symbol);
+  LOG_DD("coreset_freq_dom=(%lu) n_rb_offset=(%u) coreset_time_dur=(%d) n_shift=(%d) reg_bundle_size_L=(%d) coreset_interleaver_size_R=(%d) scrambling_ID=(%d) \n",
          coreset_freq_dom,n_rb_offset,coreset_time_dur,n_shift,reg_bundle_size_L,coreset_interleaver_size_R,pdcch_DMRS_scrambling_id);
   //
   // according to 38.213 v15.1.0: a PDCCH monitoring pattern within a slot,
@@ -845,7 +847,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
   // for (int j=0; j < coreset_nbr_act; j++) {
   // for each active CORESET (max number of active CORESETs in a BWP is 3),
   // we calculate the number of RB for each CORESET bitmap
-  LOG_DD("coreset_freq_dom=(%ld)\n",coreset_freq_dom);
+  LOG_DD("coreset_freq_dom=(%lu)\n",coreset_freq_dom);
   int i; //for each bit in the coreset_freq_dom bitmap
 
   for (i = 0; i < 45; i++) {
@@ -854,8 +856,8 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
   }
 
   coreset_nbr_rb = 6 * coreset_nbr_rb; // coreset_nbr_rb has to be multiplied by 6 to indicate the number of PRB or REG(=12 RE) within the CORESET
-  LOG_DD("coreset_freq_dom=(%ld,%lx), coreset_nbr_rb=%d\n", coreset_freq_dom,coreset_freq_dom,coreset_nbr_rb);
-  LOG_DD("coreset_nbr_rb=%d, coreset_nbr_reg=%d, coreset_C=(%d/(%d*%d))=%d\n",
+  LOG_DD("coreset_freq_dom=(%lu,%lx), coreset_nbr_rb=%u\n", coreset_freq_dom,coreset_freq_dom,coreset_nbr_rb);
+  LOG_DD("coreset_nbr_rb=%u, coreset_nbr_reg=%u, coreset_C=(%u/(%d*%d))=%u\n",
          coreset_nbr_rb, 
 	 coreset_time_dur * coreset_nbr_rb,
 	 coreset_time_dur * coreset_nbr_rb,
@@ -1229,9 +1231,9 @@ void nr_dci_decoding_procedure0(int s,
   LOG_DDD("debug1(%d)=nCCE[p]/L2 | nCCE[%d](%d) | L2(%d)\n",nCCE[p] / L2,p,nCCE[p],L2);
   LOG_DDD("debug2(%d)=L2*m_p_s_L_max | L2(%d) | m_p_s_L_max(%d)\n",L2*m_p_s_L_max,L2,m_p_s_L_max);
   CCEind = (((Yk + (uint16_t)(floor((m*nCCE[p])/(L2*m_p_s_L_max))) + n_ci) % (uint16_t)(floor(nCCE[p] / L2))) * L2);
-  LOG_DDD("CCEind(%d) = (((Yk(%u) + ((m(%u)*nCCE[p](%d))/(L2(%d)*m_p_s_L_max(%d)))) %% (nCCE[p] / L2)) * L2)\n",
+  LOG_DDD("CCEind(%u) = (((Yk(%u) + ((m(%u)*nCCE[p](%u))/(L2(%d)*m_p_s_L_max(%d)))) %% (nCCE[p] / L2)) * L2)\n",
             CCEind,Yk,m,nCCE[p],L2,m_p_s_L_max);
-  LOG_DDD("n_candidate(m)=%u | CCEind=%d |",m,CCEind);
+  LOG_DDD("n_candidate(m)=%u | CCEind=%u |",m,CCEind);
 
     if (CCEind < 32)
       CCEmap = CCEmap0;
@@ -1239,7 +1241,7 @@ void nr_dci_decoding_procedure0(int s,
       CCEmap = CCEmap1;
     else if (CCEind < 96)
       CCEmap = CCEmap2;
-    else AssertFatal(1==0,"Illegal CCEind %d (Yk %u, m %u, nCCE %d, L2 %d\n", CCEind, Yk, m, nCCE[p], L2);
+    else AssertFatal(1==0,"Illegal CCEind %u (Yk %u, m %u, nCCE %u, L2 %u\n", CCEind, Yk, m, nCCE[p], L2);
 
     switch (L2) {
       case 1:
@@ -1286,7 +1288,7 @@ void nr_dci_decoding_procedure0(int s,
       LOG_DDD("... we enter function dci_decoding(sizeof_bits=%d L=%d) -----\n",sizeof_bits,L);
       LOG_DDD("... we have to replace this part of the code by polar decoding\n");
       //      for (int m=0; m < (nCCE[p]*6*9*2); m++)
-      LOG_DDD("(polar decoding)-> polar intput (with coreset_time_dur=%d, coreset_nbr_rb=%d, p=%d, CCEind=%d): \n",
+      LOG_DDD("(polar decoding)-> polar intput (with coreset_time_dur=%d, coreset_nbr_rb=%d, p=%d, CCEind=%u): \n",
              coreset_time_dur,coreset_nbr_rb,p,CCEind);
       
       //int reg_p=0,reg_e=0;

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c

@@ -485,7 +485,9 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
                                  harq_process->C,
                                  harq_process->rvidx,
                                  (harq_process->round==0)?1:0,
-                                 E)==-1) {
+                                 E,
+				 harq_process->F,
+				 Kr-harq_process->F-2*(p_decParams->Z))==-1) {
     vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_DLSCH_RATE_MATCHING, VCD_FUNCTION_OUT);
 #if UE_TIMING_TRACE
       stop_meas(dlsch_rate_unmatching_stats);
@@ -551,12 +553,15 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
       //memset(pl,0,2*p_decParams->Z*sizeof(int8_t));
       memset((pv+K_bytes_F),127,harq_process->F*sizeof(int16_t));
 
+
       for (i=((2*p_decParams->Z)>>3), j = 0; i < K_bytes_F; i++, j++)
       {
         pv[i]= _mm_loadu_si128((__m128i*)(&harq_process->d[r][8*j]));
       }
-
-      for (i=Kr_bytes,j=K_bytes_F-((2*p_decParams->Z)>>3); i < ((kc*p_decParams->Z)>>3); i++, j++)
+      // Kbytes_F = Kr_bytes - F>>3
+      j+=(harq_process->F>>3);
+      //      for (i=Kr_bytes,j=K_bytes_F-((2*p_decParams->Z)>>3); i < ((kc*p_decParams->Z)>>3); i++, j++)
+      for (i=Kr_bytes; i < ((kc*p_decParams->Z)>>3); i++,j++)
       {
         pv[i]= _mm_loadu_si128((__m128i*)(&harq_process->d[r][8*j]));
       }
@@ -1052,7 +1057,9 @@ uint32_t  nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
                                  harq_process->C,
                                  harq_process->rvidx,
                                  (harq_process->round==0)?1:0,
-                                 E)==-1) {
+                                 E,
+				 harq_process->F,
+				 Kr-harq_process->F-2*(p_decParams->Z))==-1) {
 #if UE_TIMING_TRACE
       stop_meas(dlsch_rate_unmatching_stats);
 #endif
@@ -1593,7 +1600,9 @@ void *nr_dlsch_decoding_process(void *arg)
                                  harq_process->C,
                                  harq_process->rvidx,
                                  (harq_process->round==0)?1:0,
-                                 E)==-1) {
+                                 E,
+				 harq_process->F,
+				 Kr-harq_process->F-2*(p_decParams->Z))==-1) {
 #if UE_TIMING_TRACE
       stop_meas(dlsch_rate_unmatching_stats);
 #endif
@@ -1654,11 +1663,11 @@ void *nr_dlsch_decoding_process(void *arg)
         start_meas(dlsch_turbo_decoding_stats);
 #endif
 //      LOG_D(PHY,"AbsSubframe %d.%d Start turbo segment %d/%d \n",frame%1024,subframe,r,harq_process->C-1);
-
+/*
         for (int cnt =0; cnt < (kc-2)*p_decParams->Z; cnt++){
               inv_d[cnt] = (1)*harq_process->d[r][cnt];
               }
-
+*/
         memset(pv,0,2*p_decParams->Z*sizeof(int16_t));
         //memset(pl,0,2*p_decParams->Z*sizeof(int8_t));
         memset((pv+K_bytes_F),127,harq_process->F*sizeof(int16_t));

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c

@@ -380,10 +380,10 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
 #if UE_TIMING_TRACE
     stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
 #if DISABLE_LOG_X
-    printf("[AbsSFN %d.%d] Slot%d Symbol %d Flag %d type %d: Pilot/Data extraction %5.2f \n",
+    printf("[AbsSFN %u.%d] Slot%d Symbol %d Flag %d type %d: Pilot/Data extraction %5.2f \n",
     		frame,nr_tti_rx,slot,symbol,ue->high_speed_flag,type,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #else
-    LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d Flag %d type %d: Pilot/Data extraction %5.2f \n",
+    LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d Flag %d type %d: Pilot/Data extraction %5.2f \n",
     		frame,nr_tti_rx,slot,symbol,ue->high_speed_flag,type,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #endif
 #endif
@@ -404,9 +404,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
 #if UE_TIMING_TRACE
     stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
 #if DISABLE_LOG_X
-    printf("[AbsSFN %d.%d] Slot%d Symbol %d: Channel Scale %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    printf("[AbsSFN %u.%d] Slot%d Symbol %d: Channel Scale %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #else
-    LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d: Channel Scale  %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d: Channel Scale  %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #endif
 #endif
 
@@ -483,9 +483,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
 #if UE_TIMING_TRACE
     stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
 #if DISABLE_LOG_X
-    printf("[AbsSFN %d.%d] Slot%d Symbol %d first_symbol_flag %d: Channel Level %5.2f \n",frame,nr_tti_rx,slot,symbol,first_symbol_flag,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    printf("[AbsSFN %u.%d] Slot%d Symbol %d first_symbol_flag %d: Channel Level %5.2f \n",frame,nr_tti_rx,slot,symbol,first_symbol_flag,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #else
-    LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d first_symbol_flag %d: Channel Level  %5.2f \n",frame,nr_tti_rx,slot,symbol,first_symbol_flag,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d first_symbol_flag %d: Channel Level  %5.2f \n",frame,nr_tti_rx,slot,symbol,first_symbol_flag,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #endif
 #endif
 
@@ -596,9 +596,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
 #if UE_TIMING_TRACE
     stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
 #if DISABLE_LOG_X
-    printf("[AbsSFN %d.%d] Slot%d Symbol %d log2_maxh %d channel_level %d: Channel Comp %5.2f \n",frame,nr_tti_rx,slot,symbol,pdsch_vars[eNB_id]->log2_maxh,proc->channel_level,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    printf("[AbsSFN %u.%d] Slot%d Symbol %d log2_maxh %d channel_level %d: Channel Comp %5.2f \n",frame,nr_tti_rx,slot,symbol,pdsch_vars[eNB_id]->log2_maxh,proc->channel_level,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #else
-    LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d log2_maxh %d channel_level %d: Channel Comp  %5.2f \n",frame,nr_tti_rx,slot,symbol,pdsch_vars[eNB_id]->log2_maxh,proc->channel_level,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d log2_maxh %d channel_level %d: Channel Comp  %5.2f \n",frame,nr_tti_rx,slot,symbol,pdsch_vars[eNB_id]->log2_maxh,proc->channel_level,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #endif
 #endif
 // MRC
@@ -641,9 +641,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
 #if UE_TIMING_TRACE
     stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
 #if DISABLE_LOG_X
-    printf("[AbsSFN %d.%d] Slot%d Symbol %d: Channel Combine %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    printf("[AbsSFN %u.%d] Slot%d Symbol %d: Channel Combine %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #else
-    LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d: Channel Combine  %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d: Channel Combine  %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #endif
 #endif
 
@@ -1019,9 +1019,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
 #if UE_TIMING_TRACE
     stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
 #if DISABLE_LOG_X
-    printf("[AbsSFN %d.%d] Slot%d Symbol %d: LLR Computation %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    printf("[AbsSFN %u.%d] Slot%d Symbol %d: LLR Computation %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #else
-    LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d: LLR Computation  %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
+    LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d: LLR Computation  %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
 #endif
 #endif
 // Please keep it: useful for debugging
@@ -1092,7 +1092,7 @@ void nr_dlsch_deinterleaving(uint8_t symbol,
 
   uint32_t *bundle_deint = malloc(N_bundle*sizeof(uint32_t));
 
-  printf("N_bundle %d L %d nb_rb_pdsch %d\n",N_bundle, L,nb_rb_pdsch);
+  printf("N_bundle %u L %d nb_rb_pdsch %d\n",N_bundle, L,nb_rb_pdsch);
 
   if (symbol==start_symbol)
 	  nb_re = 6;
@@ -1118,6 +1118,7 @@ void nr_dlsch_deinterleaving(uint8_t symbol,
 		  //printf("k %d m %d bundle_deint %d llr_deint %d\n", k, m, bundle_deint[k], llr_deint[bundle_deint[k]*nb_re*L+m]);
 	  }
   }
+  free(bundle_deint);
 }
 
 //==============================================================================================
@@ -2456,7 +2457,7 @@ unsigned short nr_dlsch_extract_rbs_dual(int **rxdataF,
   int prb,nb_rb=0;
   unsigned short k;
   int i,j,aarx;
-  int32_t *dl_ch0=NULL,*dl_ch0p=NULL,*dl_ch0_ext=NULL,*dl_ch1=NULL,*dl_ch1p=NULL,*dl_ch1_ext=NULL,*rxF=NULL,*rxF_ext=NULL;
+  int32_t *dl_ch0=NULL,*dl_ch0_ext=NULL,*dl_ch1=NULL,*dl_ch1_ext=NULL,*rxF=NULL,*rxF_ext=NULL;
 
   k = frame_parms->first_carrier_offset + 516; //0
 
@@ -2512,8 +2513,8 @@ unsigned short nr_dlsch_extract_rbs_dual(int **rxdataF,
               if ((i&1)!=frame_parms->nushift) {
                 rxF_ext[j]=rxF[i];
                 //        printf("extract rb %d, re %d => (%d,%d)\n",rb,i,*(short *)&rxF_ext[j],*(1+(short*)&rxF_ext[j]));
-                dl_ch0_ext[j]=dl_ch0p[i];
-                dl_ch1_ext[j++]=dl_ch1p[i];
+                dl_ch0_ext[j]=dl_ch0[i];
+                dl_ch1_ext[j++]=dl_ch1[i];
               }
             }
             dl_ch0_ext+=6;

openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h

@@ -62,8 +62,7 @@ void free_nr_ue_dlsch(NR_UE_DLSCH_t **dlsch,uint8_t N_RB_DL);
 NR_UE_DLSCH_t *new_nr_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint8_t max_turbo_iterations,uint8_t N_RB_DL, uint8_t abstraction_flag);
 
 
-void free_nr_ue_ulsch(NR_UE_ULSCH_t *ulsch,unsigned char N_RB_UL);
-
+void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulsch,unsigned char N_RB_UL);
 
 NR_UE_ULSCH_t *new_nr_ue_ulsch(unsigned char N_RB_UL, int number_of_harq_pids, uint8_t abstraction_flag);
 

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c

@@ -42,9 +42,11 @@
 
 
 
-void free_nr_ue_ulsch(NR_UE_ULSCH_t *ulsch,unsigned char N_RB_UL)
+void free_nr_ue_ulsch(NR_UE_ULSCH_t **ulschptr,unsigned char N_RB_UL)
+
 {
   int i, r;
+  NR_UE_ULSCH_t *ulsch = *ulschptr;
 
   if (ulsch) {
 #ifdef DEBUG_ULSCH_FREE
@@ -97,7 +99,7 @@ void free_nr_ue_ulsch(NR_UE_ULSCH_t *ulsch,unsigned char N_RB_UL)
       }
     }
     free16(ulsch,sizeof(NR_UE_ULSCH_t));
-    ulsch = NULL;
+    *ulschptr = NULL;
   }
 
 }
@@ -206,7 +208,7 @@ NR_UE_ULSCH_t *new_nr_ue_ulsch(unsigned char N_RB_UL,
   }
 
   LOG_E(PHY,"new_ue_ulsch exit flag, size of  %d ,   %zu\n",exit_flag, sizeof(LTE_UE_ULSCH_t));
-  free_nr_ue_ulsch(ulsch,N_RB_UL);
+  free_nr_ue_ulsch(&ulsch,N_RB_UL);
   return(NULL);
 
 

openair1/PHY/TOOLS/nr_phy_scope.c

@@ -345,9 +345,9 @@ void phy_scope_gNB(FD_phy_scope_gnb *form,
 
       I_pucch[ind] = (float)pucch1ab_comp[2*(ind)];
       Q_pucch[ind] = (float)pucch1ab_comp[2*(ind)+1];
-      A_pucch[ind] = 10*log10(pucch1_comp[ind]);
+      A_pucch[ind] = pucch1_comp?(10*log10(pucch1_comp[ind])):0;
       B_pucch[ind] = ind;
-      C_pucch[ind] = (float)pucch1_thres[ind];
+      C_pucch[ind] = pucch1_thres?(float)pucch1_thres[ind]:0;
     }
     fl_set_xyplot_data(form->pucch_comp,I_pucch,Q_pucch,10240,"","","");
     fl_set_xyplot_data(form->pucch_comp1,B_pucch,A_pucch,1024,"","","");
@@ -840,7 +840,7 @@ void phy_scope_nrUE(FD_phy_scope_nrue *form,
   free(bit);
   free(bit_pdcch);
   free(llr_pdcch);
-
+  free(chest_t_abs);
   /*
   free(chest_f_abs);
   for (arx=0; arx<nb_antennas_rx; arx++) {
@@ -898,9 +898,9 @@ void reset_stats_gNB(FL_OBJECT *button,
 static void *scope_thread_gNB(void *arg) {
   int UE_id;
   int ue_cnt=0;
-# ifdef ENABLE_XFORMS_WRITE_STATS
-  FILE *gNB_stats = fopen("gNB_stats.txt", "w");
-#endif
+//# ifdef ENABLE_XFORMS_WRITE_STATS
+//  FILE *gNB_stats = fopen("gNB_stats.txt", "w");
+//#endif
 
   while (!oai_exit) {
     ue_cnt=0;

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -3265,10 +3265,12 @@ void nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int eNB
   int i_mod,eNB_id_i,dual_stream_UE;
   int first_symbol_flag=0;
 
+  if (!dlsch0)
+  	return;
   if (dlsch0->active == 0)
     return;
 
-  if (dlsch0 && (!dlsch1))  {
+  if (!dlsch1)  {
     int harq_pid = dlsch0->current_harq_pid;
     uint16_t BWPStart       = dlsch0->harq_processes[harq_pid]->BWPStart;
     uint16_t BWPSize        = dlsch0->harq_processes[harq_pid]->BWPSize;

openair1/SCHED_UE/phy_procedures_lte_ue.c

@@ -25,8 +25,7 @@
  * \date 2011
  * \version 0.1
  * \company Eurecom
- * \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr, navid.nikaein@eurecom.fr, javier.morgad
-e@ieee.org
+ * \email: {knopp, florian.kaltenberger, navid.nikaein}@eurecom.fr, javier.morgade@ieee.org
  * \note
  * \warning
  */
@@ -184,13 +183,16 @@ unsigned int get_tx_amp(int power_dBm,
   int gain_dB;
   double gain_lin;
 
-  if (power_dBm<=power_max_dBm)
+  if ( (power_dBm<=power_max_dBm) && ! IS_SOFTMODEM_RFSIM)
     gain_dB = power_dBm - power_max_dBm;
   else
     gain_dB = 0;
 
   gain_lin = pow(10,.1*gain_dB);
   AssertFatal((nb_rb >0) && (nb_rb <= N_RB_UL),"Illegal nb_rb/N_RB_UL combination (%d/%d)\n",nb_rb,N_RB_UL);
+  LOG_D(PHY," tx gain: %d = %d * sqrt ( pow(10, 0.1*max(0,%d-%d)) * %d/%d ) (gain lin=%f (dB=%d))\n",
+        (int)(AMP*sqrt(gain_lin*N_RB_UL/(double)nb_rb)),
+        AMP, power_dBm, power_max_dBm,  N_RB_UL, nb_rb, gain_lin, gain_dB);
   return((int)(AMP*sqrt(gain_lin*N_RB_UL/(double)nb_rb)));
 }
 
@@ -1152,7 +1154,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue,
 
   nsymb = (frame_parms->Ncp == 0) ? 14 : 12;
 
-  if (!(IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM) ) {
+  if (!IS_SOFTMODEM_BASICSIM) {
     ulsch_start = (ue->rx_offset+subframe_tx*frame_parms->samples_per_tti-
                    ue->hw_timing_advance-
                    ue->timing_advance-
@@ -1183,7 +1185,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue,
   }
 
   for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
-    int *Buff = (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM) ? &ue->common_vars.txdata[aa][ulsch_start] :dummy_tx_buffer;
+    int *Buff = IS_SOFTMODEM_BASICSIM ? &ue->common_vars.txdata[aa][ulsch_start] :dummy_tx_buffer;
 
     if (frame_parms->Ncp == 1) {
       PHY_ofdm_mod(&ue->common_vars.txdataF[aa][subframe_tx*nsymb*frame_parms->ofdm_symbol_size],
@@ -1204,7 +1206,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue,
                         &ue->frame_parms);
     }
 
-    if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
+    if (IS_SOFTMODEM_BASICSIM) {
       apply_7_5_kHz(ue,&ue->common_vars.txdata[aa][ulsch_start],0);
       apply_7_5_kHz(ue,&ue->common_vars.txdata[aa][ulsch_start],1);
     } else {
@@ -1212,7 +1214,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue,
       apply_7_5_kHz(ue,dummy_tx_buffer,1);
     }
 
-    if (!(IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM) ) {
+    if (!(IS_SOFTMODEM_BASICSIM) ) {
       overflow = ulsch_start - 9*frame_parms->samples_per_tti;
 
       for (k=ulsch_start,l=0; k<cmin(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,ulsch_start+frame_parms->samples_per_tti); k++,l++) {
@@ -1316,7 +1318,7 @@ void ue_prach_procedures(PHY_VARS_UE *ue,
           ue->prach_resources[eNB_id]->ra_RNTI);
     ue->tx_total_RE[subframe_tx] = 96;
 
-    if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
+    if (IS_SOFTMODEM_BASICSIM) {
       ue->prach_vars[eNB_id]->amp = get_tx_amp(ue->tx_power_dBm[subframe_tx],
                                     ue->tx_power_max_dBm,
                                     ue->frame_parms.N_RB_UL,
@@ -1690,7 +1692,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,
 
       ue->tx_total_RE[subframe_tx] = nb_rb*12;
 
-      if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
+      if (IS_SOFTMODEM_BASICSIM) {
         tx_amp = AMP;
       } else {
         tx_amp = get_tx_amp(ue->tx_power_dBm[subframe_tx],
@@ -1767,7 +1769,7 @@ void ue_srs_procedures(PHY_VARS_UE *ue,
       Po_SRS = ue->tx_power_max_dBm;
     }
 
-    if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
+    if (IS_SOFTMODEM_BASICSIM) {
       tx_amp = AMP;
     } else {
       if (ue->mac_enabled==1) {
@@ -2010,7 +2012,7 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,
       ue->tx_power_dBm[subframe_tx] = Po_PUCCH;
       ue->tx_total_RE[subframe_tx] = 12;
 
-      if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
+      if (IS_SOFTMODEM_BASICSIM) {
         tx_amp = AMP;
       } else {
         tx_amp = get_tx_amp(Po_PUCCH,
@@ -2091,7 +2093,7 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,
       ue->tx_power_dBm[subframe_tx] = Po_PUCCH;
       ue->tx_total_RE[subframe_tx] = 12;
 
-      if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
+      if (IS_SOFTMODEM_BASICSIM) {
         tx_amp = AMP;
       } else {
         tx_amp =  get_tx_amp(Po_PUCCH,
@@ -2346,7 +2348,7 @@ void ue_measurement_procedures(uint16_t l,    // symbol index of each slot [0..6
     // AGC
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL, VCD_FUNCTION_IN);
 
-    if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM )
+    if (IS_SOFTMODEM_BASICSIM)
       phy_adjust_gain (ue,dB_fixed(ue->measurements.rssi),0);
 
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL, VCD_FUNCTION_OUT);
@@ -2423,8 +2425,6 @@ void ue_pbch_procedures(uint8_t eNB_id,
       dummy[2] = ue->pbch_vars[eNB_id]->decoded_output[0];
       trace_pdu( DIRECTION_DOWNLINK, dummy, WS_C_RNTI, ue->Mod_id, 0, 0,
                  frame_rx, subframe_rx, 0, 0);
-      LOG_D(OPT,"[UE %d][PBCH] Frame %d trace pdu for PBCH\n",
-            ue->Mod_id, subframe_rx);
     }
 
     if (pbch_tx_ant>2) {
@@ -2871,8 +2871,7 @@ void ue_pmch_procedures(PHY_VARS_UE *ue,
                         UE_rxtx_proc_t *proc,
                         int eNB_id,
                         int abstraction_flag,
-                        uint8_t fembms_flag
-                       ) {
+                        uint8_t fembms_flag) {
   int subframe_rx = proc->subframe_rx;
   int frame_rx = proc->frame_rx;
   int pmch_mcs=-1;
@@ -3532,7 +3531,6 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
                            ue->dlsch_SI[eNB_id]->harq_processes[0]->b,
                            ue->dlsch_SI[eNB_id]->harq_processes[0]->TBS>>3);
             }
-
             break;
 
           case P_PDSCH:
@@ -4401,6 +4399,7 @@ int phy_procedures_slot_parallelization_UE_RX(PHY_VARS_UE *ue,
 void phy_procedures_UE_SL_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc) {
 }
 
+
 int phy_procedures_UE_RX(PHY_VARS_UE *ue,
                          UE_rxtx_proc_t *proc,
                          uint8_t eNB_id,
@@ -4880,7 +4879,6 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,
 }
 
 
-
 void phy_procedures_UE_lte(PHY_VARS_UE *ue,
                            UE_rxtx_proc_t *proc,
                            uint8_t eNB_id,

openair1/SIMULATION/NR_PHY/dlschsim.c

@@ -628,7 +628,7 @@ int main(int argc, char **argv)
 
 	for (i = 0; i < 2; i++) {
 		printf("gNB %d\n", i);
-		free_gNB_dlsch(gNB->dlsch[0][i],N_RB_DL);
+		free_gNB_dlsch(&(gNB->dlsch[0][i]));
 		printf("UE %d\n", i);
 		free_nr_ue_dlsch(&(UE->dlsch[0][0][i]),N_RB_DL);
 	}

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -113,30 +113,28 @@ void config_common(int Mod_idP,
 		   );
 
 uint64_t get_softmodem_optmask(void) {return 0;}
-mac_rlc_status_resp_t mac_rlc_status_ind( const module_id_t       module_idP,
-					  const rnti_t            rntiP,
-					  const eNB_index_t       eNB_index,
-					  const frame_t           frameP,
-					  const sub_frame_t 	  subframeP,
-					  const eNB_flag_t        enb_flagP,
-					  const MBMS_flag_t       MBMS_flagP,
-					  const logical_chan_id_t channel_idP,
-					  const tb_size_t         tb_sizeP,
-					  const uint32_t sourceL2Id,
-					  const uint32_t destinationL2Id)
-{mac_rlc_status_resp_t  mac_rlc_status_resp={0}; return mac_rlc_status_resp;}
-tbs_size_t mac_rlc_data_req(  const module_id_t       module_idP,
-			      const rnti_t            rntiP,
-			      const eNB_index_t       eNB_index,
-			      const frame_t           frameP,
-			      const eNB_flag_t        enb_flagP,
-			      const MBMS_flag_t       MBMS_flagP,
-			      const logical_chan_id_t channel_idP,
-			      const tb_size_t         tb_sizeP,
-			      char             *buffer_pP,
-			      const uint32_t sourceL2Id,
-			      const uint32_t destinationL2Id )
-{return 0;}
+mac_rlc_status_resp_t mac_rlc_status_ind(const module_id_t       module_idP,
+                                         const rnti_t            rntiP,
+                                         const eNB_index_t       eNB_index,
+                                         const frame_t           frameP,
+                                         const sub_frame_t       subframeP,
+                                         const eNB_flag_t        enb_flagP,
+                                         const MBMS_flag_t       MBMS_flagP,
+                                         const logical_chan_id_t channel_idP,
+                                         const tb_size_t         tb_sizeP,
+                                         const uint32_t          sourceL2Id,
+                                         const uint32_t          destinationL2Id) {mac_rlc_status_resp_t  mac_rlc_status_resp = {0}; return mac_rlc_status_resp;}
+tbs_size_t mac_rlc_data_req(const module_id_t       module_idP,
+                            const rnti_t            rntiP,
+                            const eNB_index_t       eNB_index,
+                            const frame_t           frameP,
+                            const eNB_flag_t        enb_flagP,
+                            const MBMS_flag_t       MBMS_flagP,
+                            const logical_chan_id_t channel_idP,
+                            const tb_size_t         tb_sizeP,
+                            char                    *buffer_pP,
+                            const uint32_t          sourceL2Id,
+                            const uint32_t          destinationL2Id) {return 0;}
 int generate_dlsch_header(unsigned char *mac_header,
                           unsigned char num_sdus,
                           unsigned short *sdu_lengths,
@@ -852,7 +850,6 @@ int main(int argc, char **argv)
 	  }
 	
       }
-      
       for (i = 0; i < TBS; i++) {
 	
 	estimated_output_bit[i] = (UE_harq_process->b[i/8] & (1 << (i & 7))) >> (i & 7);

openair1/SIMULATION/NR_PHY/ulschsim.c

@@ -517,9 +517,10 @@ int main(int argc, char **argv)
         if (channel_output_uncoded[i] != ulsch_ue->harq_processes[harq_pid]->f[i])
           errors_bit_uncoded = errors_bit_uncoded + 1;
       }
-
+/*
       printf("errors bits uncoded %u\n", errors_bit_uncoded);
       printf("\n");
+*/
 #ifdef DEBUG_CODER
       printf("\n");
       exit(-1);
@@ -542,13 +543,13 @@ int main(int argc, char **argv)
           errors_bit++;
         }
       }
-
+/*
       if (errors_bit > 0) {
         n_false_positive++;
         if (n_trials == 1)
           printf("errors_bit %u (trial %d)\n", errors_bit, trial);
       }
-      printf("\n");
+      printf("\n");*/
     }
     
     printf("*****************************************\n");
@@ -558,7 +559,7 @@ int main(int argc, char **argv)
     printf("*****************************************\n");
     printf("\n");
 
-    if (errors_bit == 0) {
+    if (n_errors == 0) {
       printf("PUSCH test OK\n");
       printf("\n");
       break;

openair2/COMMON/platform_constants.h

@@ -84,9 +84,9 @@
     #else
       #define MAX_MOBILES_PER_ENB         4
       #define MAX_MOBILES_PER_ENB_NB_IoT  4
-      #define MAX_MOBILES_PER_GNB         2//16
-      #define MAX_eNB                      2
-      #define MAX_gNB                      2
+      #define MAX_MOBILES_PER_GNB         4
+      #define MAX_eNB                     2
+      #define MAX_gNB                     2
     #endif
   #endif
 #else

openair2/ENB_APP/enb_paramdef.h

@@ -539,122 +539,122 @@ typedef struct ccparams_lte_s {
 } ccparams_lte_t;
 
 #define CCPARAMS_CHECK {                             \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,                             \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,                             \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
+    { { NULL } } ,						     \
     { .s1a= { config_check_modify_integer, UETIMER_T300_OKVALUES, UETIMER_T300_MODVALUES,8}} ,\
     { .s1a= { config_check_modify_integer, UETIMER_T301_OKVALUES, UETIMER_T301_MODVALUES,8}} ,\
     { .s1a= { config_check_modify_integer, UETIMER_T310_OKVALUES, UETIMER_T310_MODVALUES,7}} ,\
     { .s1a= { config_check_modify_integer, UETIMER_T311_OKVALUES, UETIMER_T311_MODVALUES,7}} ,\
     { .s1a= { config_check_modify_integer, UETIMER_N310_OKVALUES, UETIMER_N310_MODVALUES,8}} ,\
     { .s1a= { config_check_modify_integer, UETIMER_N311_OKVALUES, UETIMER_N311_MODVALUES,8}} ,\
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } } ,						     \
-    { .s5 = { NULL } }                               \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } } ,						     \
+    {  { NULL } }                               \
 }
 
 /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -2495,6 +2495,7 @@ UE_is_to_be_scheduled(module_id_t module_idP,
 {
   UE_TEMPLATE *UE_template = &RC.mac[module_idP]->UE_list.UE_template[CC_id][UE_id];
   UE_sched_ctrl_t *UE_sched_ctl = &RC.mac[module_idP]->UE_list.UE_sched_ctrl[UE_id];
+  int rrc_status;
 
   // do not schedule UE if UL is not working
   if (UE_sched_ctl->ul_failure_timer > 0 || UE_sched_ctl->ul_out_of_sync > 0)
@@ -2506,13 +2507,14 @@ UE_is_to_be_scheduled(module_id_t module_idP,
         UE_id,
         ue_rnti);
 
+  rrc_status = mac_eNB_get_rrc_status(module_idP, ue_rnti);
+
   if (UE_template->scheduled_ul_bytes < UE_template->estimated_ul_buffer ||
       UE_template->ul_SR > 0 || // uplink scheduling request
       (UE_sched_ctl->ul_inactivity_timer > 19 && UE_sched_ctl->ul_scheduled == 0) ||  // every 2 frames when RRC_CONNECTED
       (UE_sched_ctl->ul_inactivity_timer > 10 &&
-       UE_sched_ctl->ul_scheduled == 0 &&
-       mac_eNB_get_rrc_status(module_idP,
-                              ue_rnti) < RRC_CONNECTED)) { // every Frame when not RRC_CONNECTED
+       UE_sched_ctl->ul_scheduled == 0 && rrc_status < RRC_CONNECTED) || // every Frame when not RRC_CONNECTED
+      (UE_sched_ctl->cqi_req_timer > 300 && rrc_status >= RRC_CONNECTED)) { // cqi req timer expired long ago (do not put too low value)
     LOG_D(MAC, "[eNB %d][PUSCH] UE %d/%x should be scheduled (BSR0 estimated size %d, SR %d)\n",
           module_idP,
           UE_id,

openair2/LAYER2/MAC/pre_processor.c

@@ -2014,6 +2014,14 @@ static int ue_ul_compare(const void *_a, const void *_b, void *_params) {
       UE_list->UE_template[pCCid2][UE_id2].pre_assigned_mcs_ul)
     return 1;
 
+  if (UE_list->UE_sched_ctrl[UE_id1].cqi_req_timer >
+      UE_list->UE_sched_ctrl[UE_id2].cqi_req_timer)
+    return -1;
+
+  if (UE_list->UE_sched_ctrl[UE_id1].cqi_req_timer <
+      UE_list->UE_sched_ctrl[UE_id2].cqi_req_timer)
+    return 1;
+
   return 0;
 }