log reduction

# Conflicts:
#   openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

CMakeLists.txt

@@ -775,7 +775,6 @@ add_library(UTIL
 
 set(SECU_OSA_SRC
   ${OPENAIR2_DIR}/UTIL/OSA/osa_key_deriver.c
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_rijndael.c
   ${OPENAIR2_DIR}/UTIL/OSA/osa_snow3g.c
   ${OPENAIR2_DIR}/UTIL/OSA/osa_stream_eea.c
   ${OPENAIR2_DIR}/UTIL/OSA/osa_stream_eia.c
@@ -1178,7 +1177,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/dmrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/filt16a_32.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/NR_ESTIMATION/nr_measurements_gNB.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
@@ -1205,10 +1203,15 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/pss_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/sss_nr.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/pss_nr_sl.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/sss_nr_sl.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_generate_psbch_dmrs_sl.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/psbch_nr_sl.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/cic_filter_nr.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_psbch.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -1229,7 +1232,6 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ptrs_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold_ue.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gen_mod_table.c
-  ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/filt16a_32.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c
   ${OPENAIR1_DIR}/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
@@ -1355,7 +1357,6 @@ set(NR_PDCP_SRC
   #of reusing code of osa_stream_eia.c
   ${OPENAIR2_DIR}/UTIL/OSA/osa_stream_eia.c
   ${OPENAIR2_DIR}/UTIL/OSA/osa_snow3g.c
-  ${OPENAIR2_DIR}/UTIL/OSA/osa_rijndael.c
   )
 
 set(NR_SDAP_SRC
@@ -2440,7 +2441,19 @@ target_link_libraries(nr_pbchsim PRIVATE
 target_link_libraries(nr_pbchsim PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 
 
-#PUCCH ---> Prashanth
+  add_executable(nr_psbchsim
+  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/psbchsim.c
+  ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+  ${T_SOURCE}
+  ${SHLIB_LOADER_SOURCES}
+  )
+target_link_libraries(nr_psbchsim PRIVATE
+  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB MAC_NR_COMMON -Wl,--end-group
+  m pthread ${ATLAS_LIBRARIES} ${T_LIB} ITTI dl
+)
+target_link_libraries(nr_psbchsim PRIVATE asn1_nr_rrc asn1_lte_rrc)
+
+
 add_executable(nr_pucchsim
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pucchsim.c
   ${OPENAIR1_DIR}/SIMULATION/NR_PHY/nr_dummy_functions.c
@@ -2571,7 +2584,7 @@ if (${T_TRACER})
         lte-softmodem lte-uesoftmodem nr-softmodem
         nr-uesoftmodem dlsim dlsim_tm4 dlsim_tm7
         ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim
-        syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
+        syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_psbchsim nr_pucchsim
         nr_ulschsim ldpctest polartest smallblocktest cu_test du_test
         #all "add_library" definitions
         ITTI lte_rrc nr_rrc s1ap x2ap m2ap m3ap f1ap

ci-scripts/Jenkinsfile-GitLab-Container

@@ -36,7 +36,6 @@ pipeline {
     label nodeExecutor
   }
   options {
-    disableConcurrentBuilds()
     timestamps()
     gitLabConnection('OAI GitLab')
     ansiColor('xterm')
@@ -425,28 +424,26 @@ pipeline {
             }
           }
         }
-
-        //avra is offline, re-enable once it is available
-        //stage ("T1-Offload-Test") {
-        //  when { expression {do5Gtest} }
-        //  steps {
-        //    script {
-        //      triggerSlaveJob ('RAN-T1-Offload-Test', 'T1-Offload-Test')
-        //    }
-        //  }
-        //  post {
-        //    always {
-        //      script {
-        //        finalizeSlaveJob('RAN-T1-Offload-Test')
-        //      }
-        //    }
-        //    failure {
-        //      script {
-        //        currentBuild.result = 'FAILURE'
-        //      }
-        //    }
-        //  }
-        //}
+        stage ("Interop-F1") {
+          when { expression {do5Gtest} }
+          steps {
+            script {
+              triggerSlaveJob ('RAN-Interop-F1', 'Interop-F1')
+            }
+          }
+          post {
+            always {
+              script {
+                finalizeSlaveJob('RAN-Interop-F1')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+              }
+            }
+          }
+        }
       }
     }
     stage ("DockerHub-Push") {

ci-scripts/Jenkinsfile-cluster

@@ -61,7 +61,6 @@ pipeline {
     label pythonExecutor
   }
   options {
-    disableConcurrentBuilds()
     timestamps()
     ansiColor('xterm')
     lock(extra: lockResources)

ci-scripts/Jenkinsfile-physim-deploy

@@ -55,7 +55,6 @@ pipeline {
     label pythonExecutor
   }
   options {
-    disableConcurrentBuilds()
     timestamps()
     ansiColor('xterm')
     lock(extra: lockResources)

ci-scripts/Jenkinsfile-push-registry

@@ -36,7 +36,6 @@ pipeline {
     label nodeExecutor
   }
   options {
-    disableConcurrentBuilds()
     ansiColor('xterm')
     lock(extra: lockResources)
   }

ci-scripts/Jenkinsfile-tmp-full-ran

@@ -61,7 +61,6 @@ pipeline {
         label pythonExecutor
     }
     options {
-        disableConcurrentBuilds()
         ansiColor('xterm')
         lock(extra: lockResources)
     }

ci-scripts/Jenkinsfile-tmp-multi-enb

@@ -50,7 +50,6 @@ pipeline {
         label pythonExecutor
     }
     options {
-        disableConcurrentBuilds()
         ansiColor('xterm')
         lock(extra: lockResources)
     }

ci-scripts/Jenkinsfile-tmp-multi-enb-nsa

@@ -52,7 +52,6 @@ def StatusForDb = ""
 pipeline {
   agent {label pythonExecutor}
   options {
-    disableConcurrentBuilds()
     ansiColor('xterm')
     lock(extra: lockResources)
   }

ci-scripts/Jenkinsfile-tmp-ran

@@ -63,7 +63,6 @@ pipeline {
         label pythonExecutor
     }
     options {
-        disableConcurrentBuilds()
         ansiColor('xterm')
         lock(extra: lockResources)
     }

ci-scripts/Jenkinsfile-tmp-ue

@@ -63,7 +63,6 @@ pipeline {
         label pythonExecutor
     }
     options {
-        disableConcurrentBuilds()
         ansiColor('xterm')
         lock(extra: lockResources)
     }

ci-scripts/as_ue/aw2s-multi-20897.cfg

@@ -0,0 +1,280 @@
+/* UE simulator configuration file version 2021-06-17
+ * LTE / 5G Non StandAlone
+ * Copyright (C) 2019-2021 Amarisoft
+ */
+{
+#define N_ANTENNA_DL 2
+#define TDD 1
+
+log_options: "all.level=warn,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
+log_filename: "/tmp/ue.log",
+
+/* Enable remote API and Web interface */
+com_addr: "0.0.0.0:9002",
+
+include "rf_driver/1chan.cfg",
+
+/* If true, allow the simulation of several UEs at the same time and
+allow dynamic UE creation from remote API */
+                    
+  cell_groups: [{
+      group_type: "nr",
+      multi_ue: true,
+      cells: [{
+      rf_port: 0,
+      bandwidth: 20,
+      band: 78,
+      dl_nr_arfcn:627360,
+      ssb_nr_arfcn:627360,
+      subcarrier_spacing: 30,
+      n_antenna_dl: N_ANTENNA_DL,
+      n_antenna_ul: 1,
+      rx_to_tx_latency:2,
+    }],
+  }],
+
+  /* UE capabilities */
+  /* USIM data */     
+  ue_list: [
+    {
+      "ue_id" : 1,
+      "imsi": "208970000000111",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 2,
+      "imsi": "208970000000112",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 3,
+      "imsi": "208970000000113",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 4,
+      "imsi": "208970000000114",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 5,
+      "imsi": "208970000000115",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 6,
+      "imsi": "208970000000116",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 7,
+      "imsi": "208970000000117",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 8,
+      "imsi": "208970000000118",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 9,
+      "imsi": "208970000000119",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 10,
+      "imsi": "208970000000120",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 11,
+      "imsi": "208970000000121",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 12,
+      "imsi": "208970000000122",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 13,
+      "imsi": "208970000000123",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+        {
+      "ue_id" : 14,
+      "imsi": "208970000000124",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 15,
+      "imsi": "208970000000125",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+    {
+      "ue_id" : 16,
+      "imsi": "208970000000126",
+      "K": "fec86ba6eb707ed08905757b1bb44b8f",
+      "sim_algo":"milenage",
+      "op": "1006020f0a478bf6b699f15c062e42b3",
+
+      as_release: 15,
+      ue_category: "nr",
+      apn:"oai",
+      attach_pdn_type:"ipv4",
+      default_nssai: [ { sst: 1, }, ],
+      default_pdu_session_snssai: { sst: 1, },
+      tun_setup_script: "ue-ifup",
+    },
+ ],
+}

ci-scripts/ci_ueinfra.yaml

@@ -49,7 +49,7 @@ adb_ue_2:
 
 amarisoft_ue:
   Host: amariue
-  InitScript: /root/NV18-06-2022/lteue-linux-2023-03-17/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-asue.cfg &
+  InitScript: /root/NV18-06-2022/lteue-linux-2023-03-17/lteue /root/oaicicd/ran_sa_aw2s_asue/aw2s-multi-20897.cfg &
   TermScript: /root/NV18-06-2022/lteue-linux-2023-03-17/doc/ws.js 127.0.0.1:9002 '{"message":"quit"}'
 amarisoft_ue_1:
   Host: amariue

ci-scripts/cls_cmd.py

@@ -31,6 +31,9 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
+import sys 
+
+SSHTIMEOUT=7
 
 # helper that returns either LocalCmd or RemoteCmd based on passed host name
 def getConnection(host, d=None):
@@ -123,13 +126,21 @@ class LocalCmd(Cmd):
 
 class RemoteCmd(Cmd):
 	def __init__(self, hostname, d=None):
+		cIdx = 0
 		logging.getLogger('paramiko').setLevel(logging.ERROR) # prevent spamming through Paramiko
 		self.client = paramiko.SSHClient()
 		self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 		cfg = RemoteCmd._lookup_ssh_config(hostname)
-		self.client.connect(**cfg)
 		self.cwd = d
 		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
+		while cIdx < 3:
+			try:
+				self.client.connect(**cfg)
+				return
+			except:
+				logging.error(f'Could not connect to {hostname}, tried for {cIdx} time')
+				cIdx +=1
+		raise Exception ("Error: max retries, did not connect to host")
 
 	def _lookup_ssh_config(hostname):
 		ssh_config = paramiko.SSHConfig()
@@ -142,7 +153,7 @@ class RemoteCmd(Cmd):
 		ucfg = ssh_config.lookup(hostname)
 		if 'identityfile' not in ucfg or 'user' not in ucfg:
 			raise KeyError(f'no identityfile or user in SSH config for host {hostname}')
-		cfg = {'hostname':hostname, 'username':ucfg['user'], 'key_filename':ucfg['identityfile']}
+		cfg = {'hostname':hostname, 'username':ucfg['user'], 'key_filename':ucfg['identityfile'], 'timeout':SSHTIMEOUT}
 		if 'hostname' in ucfg:
 			cfg['hostname'] = ucfg['hostname'] # override user-given hostname with what is in config
 		if 'port' in ucfg:

ci-scripts/cls_module_ue.py

@@ -81,7 +81,7 @@ class Module_UE:
 			c = cls_cmd.RemoteCmd(self.host)
 		response = c.run(cmd, silent=silent)
 		c.close()
-		return response.stdout
+		return response
 
 #-----------------$
 #PUBLIC Methods$
@@ -95,7 +95,11 @@ class Module_UE:
 		if self.cmd_dict["detach"]:
 			self._command(self.cmd_dict["detach"], silent=True)
 		self._command(self.cmd_dict["terminate"], silent=True)
-		self._command(self.cmd_dict["initialize"])
+		ret = self._command(self.cmd_dict["initialize"])
+		logging.info(f'For command: {ret.args} | return output: {ret.stdout} | Code: {ret.returncode}')
+		# Here each UE returns differently for the successful initialization, requires check based on UE
+		return ret.returncode == 0
+
 
 	def terminate(self):
 		self._command(self.cmd_dict["terminate"])
@@ -122,9 +126,9 @@ class Module_UE:
 			self._command(self.cmd_dict["detach"])
 			time.sleep(5)
 		if ip:
-			logging.debug(f'\u001B[1mUE IP Address is {ip}\u001B[0m')
+			logging.debug(f'\u001B[1mUE IP Address for UE {self.module_name} is {ip}\u001B[0m')
 		else:
-			logging.debug('\u001B[1;37;41mUE IP Address Not Found!\u001B[0m')
+			logging.debug(f'\u001B[1;37;41mUE IP Address for UE {self.module_name} Not Found!\u001B[0m')
 		return ip
 
 	def detach(self):
@@ -133,7 +137,7 @@ class Module_UE:
 	def check(self):
 		cmd = self.cmd_dict["check"]
 		if cmd:
-			return self._command(cmd)
+			return self._command(cmd).stdout
 		else:
 			logging.warning(f"requested status check of UE {self.getName()}, but operation is not supported")
 			return f"UE {self.getName()} does not support status checking"
@@ -160,7 +164,7 @@ class Module_UE:
 
 	def getIP(self):
 		output = self._command(self.cmd_dict["getNetwork"], silent=True)
-		result = re.search('inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output)
+		result = re.search('inet (?P<ip>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', output.stdout)
 		if result and result.group('ip'):
 			ip = result.group('ip')
 			return ip
@@ -168,12 +172,12 @@ class Module_UE:
 
 	def checkMTU(self):
 		output = self._command(self.cmd_dict["getNetwork"], silent=True)
-		result = re.search('mtu (?P<mtu>[0-9]+)', output)
+		result = re.search('mtu (?P<mtu>[0-9]+)', output.stdout)
 		if result and result.group('mtu') and int(result.group('mtu')) == self.MTU:
-			logging.debug('\u001B[1mUE Module NIC MTU is ' + str(self.MTU) + ' as expected\u001B[0m')
+			logging.debug(f'\u001B[1mUE Module {self.module_name} NIC MTU is {self.MTU} as expected\u001B[0m')
 			return True
 		else:
-			logging.debug('\u001B[1;37;41m Incorrect Module NIC MTU or MTU not found! Expected: ' + str(self.MTU) + '\u001B[0m')
+			logging.debug(f'\u001B[1;37;41m UE module {self.module_name} has incorrect Module NIC MTU or MTU not found! Expected: {self.MTU} \u001B[0m')
 			return False
 
 	def getName(self):

ci-scripts/cls_oaicitest.py

@@ -295,10 +295,13 @@ class OaiCiTest():
 
 	def InitializeUE(self, HTML):
 		ues = [cls_module_ue.Module_UE(n.strip()) for n in self.ue_ids]
+		messages = []
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.initialize) for ue in ues]
+			for f, ue in zip(futures, ues):
+				uename = f'UE {ue.getName()}'
+				messages.append(f'{uename}: initialized' if f.result() else f'{uename}: ERROR during Initialization')
 			[f.result() for f in futures]
-		messages = [f'UE {ue.getName()}: initialized' for ue in ues]
 		HTML.CreateHtmlTestRowQueue('N/A', 'OK', messages)
 
 
@@ -1273,7 +1276,7 @@ class OaiCiTest():
 			logging.debug("Iperf in UL requested")
 			cmd = cls_cmd.getConnection(EPC.IPAddress)
 			cmd.run(f'rm {EPC.SourceCodePath}/{server_filename}')
-			cmd.run(f'{cn_iperf_prefix} iperf -s {udpSwitch} -1 -t {iperf_time * 1.5} {port} &> {EPC.SourceCodePath}/{server_filename} &')
+			cmd.run(f'{cn_iperf_prefix} iperf -s {udpSwitch} -t {iperf_time * 1.5} {port} &> {EPC.SourceCodePath}/{server_filename} &')
 			cmd.close()
 
 			cmd = cls_cmd.getConnection(ue.getHost())

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf

@@ -16,7 +16,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  0x1;
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
+    plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst =0x1; }) });
 
     nr_cellid = 12345678L
 

ci-scripts/ran.py

@@ -263,7 +263,7 @@ class RANManagement():
 		cmd = cls_cmd.getConnection(self.node)
 		ret = cmd.run(self.command)
 		cmd.close()
-		logging.debug(f'CustomCommand: {self.command} returnCode: {ret.returncode}')
+		logging.debug(f"Custum command : {self.command} on node : {self.node} returnCode : {ret.returncode}")
 		status = 'OK'
 		message = []
 		if ret.returncode != 0 and not self.command_fail:

ci-scripts/run_sl_test.py

@@ -0,0 +1,341 @@
+#!/usr/bin/env python3
+#
+# Automated tests for running 5G NR Sidelink SyncRef UE and/or Nearby UE.
+# The following is an example to run remote machine (nearby) three times.
+# The syncref UE is launched on the current machine, and a single
+# nearby UE is launched on the machine specified by the --host and
+# --user flags. The -r will enable this simulation to be repeated
+# three times.
+#
+# python3 run_sl_test.py --user account --host 10.1.1.68 -r 3
+#
+# The following is an example to run just a Sidelink Nearby UE.
+# By specifying -l nearby, only the nearby UE will be launched
+# on the machine specified by the --host and --user flags.
+# The -r will enable this simulation to be repeated two times.
+#
+# python3 run_sl_test.py -l nearby --user account --host 10.1.1.68 -r 2
+#
+# See `--help` for more information.
+#
+
+import os
+import sys
+import argparse
+import logging
+import time
+import re
+import glob
+import subprocess
+from subprocess import Popen
+import threading
+from typing import Dict
+from queue import *
+from sl_check_log import LogChecker
+
+HOME_DIR = os.path.expanduser( '~' )
+
+# ----------------------------------------------------------------------------
+# Command line argument parsing
+
+parser = argparse.ArgumentParser(description="""
+Automated tests for 5G NR Sidelink simulations
+""")
+
+parser.add_argument('--launch', '-l', default='both', choices='syncref nearby both'.split(), help="""
+Sidelink UE type to launch test scenario (default: %(default)s)
+""")
+
+parser.add_argument('--host', default='10.1.1.80', type=str, help="""
+Nearby Host IP (default: %(default)s)
+""")
+
+parser.add_argument('--user', '-u',  default='zaid', type=str, help="""
+User id in Nearby Host (default: %(default)s)
+""")
+
+parser.add_argument('--repeat', '-r', default=1, type=int, help="""
+The number of repeated test iterations (default: %(default)s)
+""")
+
+parser.add_argument('--basic', '-b', action='store_true', help="""
+Basic test with basic shell commands
+""")
+
+parser.add_argument('--commands', default='sl_cmds.txt', help="""
+The USRP Commands .txt file (default: %(default)s)
+""")
+
+parser.add_argument('--duration', '-d', metavar='SECONDS', type=int, default=30, help="""
+How long to run the test before stopping to examine the logs
+""")
+
+parser.add_argument('--nid1', type=int, default=10, help="""
+Nid1 value
+""")
+
+parser.add_argument('--nid2', type=int, default=1, help="""
+Nid2 value
+""")
+
+parser.add_argument('--log-dir', default=HOME_DIR, help="""
+Where to store log files
+""")
+
+parser.add_argument('--compress', action='store_true', help="""
+Compress the log files in the --log-dir
+""")
+
+parser.add_argument('--no-run', '-n', action='store_true', help="""
+Don't run the test, only examine the logs in the --log-dir
+directory from a previous run of the test
+""")
+
+parser.add_argument('--debug', action='store_true', help="""
+Enable debug logging (for this script only)
+""")
+
+parser.add_argument('--test', '-t', default='usrp', choices='psbchsim rfsim usrp'.split(), help="""
+The kind of test scenario to run. The options include psbchsim, rfsim, or usrp. (default: %(default)s)
+""")
+
+OPTS = parser.parse_args()
+del parser
+
+logging.basicConfig(level=logging.DEBUG if OPTS.debug else logging.INFO,
+                    format='>>> %(name)s: %(levelname)s: %(message)s')
+LOGGER = logging.getLogger(os.path.basename(sys.argv[0]))
+
+# ----------------------------------------------------------------------------
+def redirect_output(cmd: str, filename: str) -> str:
+    cmd += ' >{} 2>&1'.format(filename)
+    return cmd
+
+def thread_delay(thread_name: str, delay: int) -> None:
+    count = 0
+    while count < 1:
+        time.sleep(delay)
+        count += 1
+
+class Command:
+    """
+    Parsing USRP commands file
+    """
+    def __init__(self, filename) -> None:
+        self.check_user()
+        self.filename = self.check_file(filename)
+        self.parse_commands()
+
+    def check_user(self) -> None:
+        if OPTS.test != 'usrp': return
+        if OPTS.launch != 'syncref' and OPTS.user == '':
+            LOGGER.error("--user followed by [user id] is mandatory to connect to remote machine")
+            sys.exit(1)
+
+    def check_file(self, filename) -> str:
+        data_file = glob.glob(filename)
+        if data_file:
+            return filename
+        else:
+            LOGGER.error(f'The file {filename} does not exist!')
+            sys.exit(1)
+
+    def parse_commands(self) -> None:
+        """
+        Scan the provided commands file.
+        """
+        self.launch_cmds: Dict[str, str] = {}
+        if OPTS.test == 'usrp':
+            launch_cmds_re = re.compile(r'^\s*(\S*)usrp\S*\s*=\s*((\S+\s*)*)')
+        elif OPTS.test == 'rfsim':
+            launch_cmds_re = re.compile(r'^\s*(\S*)rfsim\S*\s*=\s*((\S+\s*)*)')
+        elif OPTS.test == 'psbchsim':
+            launch_cmds_re = re.compile(r'^\s*(\S*)psbchsim\S*\s*=\s*((\S+\s*)*)')
+        else:
+            LOGGER.error("Provided test option not valid! %s", OPTS.test)
+            exit(1)
+
+        with open(self.filename, 'rt') as fh:
+            nearby_cmd_continued = False
+            syncref_cmd_continued = False
+            for line in fh:
+                if line == '\n': continue
+                match = launch_cmds_re.match(line)
+                if match:
+                    host_role = match.group(1)
+                    launch_cmds = match.group(2)
+                    if host_role.lower().startswith('nearby'):
+                        nearby_cmd_continued = True
+                        continue
+                    if host_role.lower().startswith('syncref'):
+                        syncref_cmd_continued = True
+                        continue
+                elif nearby_cmd_continued:
+                    launch_cmds += line
+                    if not line.strip().endswith('\\'):
+                        self.launch_cmds['nearby'] = launch_cmds
+                        LOGGER.debug('Nearby cmd is %s', launch_cmds)
+                        nearby_cmd_continued = False
+                    continue
+                elif syncref_cmd_continued:
+                    launch_cmds += line
+                    if not line.strip().endswith('\\'):
+                        self.launch_cmds['syncref'] = launch_cmds
+                        LOGGER.debug('Syncref cmd is %s', launch_cmds)
+                        syncref_cmd_continued = False
+                    continue
+                else:
+                    LOGGER.debug('Unmatched line %r', line)
+                    continue
+        if self.launch_cmds == {}:
+            LOGGER.error(f'usrp commands are not found in file: {self.filename} ')
+            exit()
+
+class TestThread(threading.Thread):
+    """
+    Represents TestThread
+    """
+    def __init__(self, queue, commands, passed, log_agent):
+        threading.Thread.__init__(self)
+        self.queue = queue
+        self.commands = commands
+        self.passed = passed
+        self.delay = 0
+        self.log_file = log_agent.txlog_file_path
+        self.log_agent = log_agent
+
+    def run(self):
+        if self.queue.empty() == True:
+            LOGGER.error("Queue is empty!")
+            sys.exit(1)
+        try:
+            while not self.queue.empty():
+                job = self.queue.get()
+                if "nearby" == job:
+                    thread_delay(job, delay = 0)
+                    self.launch_nearby(job)
+                if "syncref" == job and not OPTS.no_run:
+                    thread_delay(job, delay = self.delay)
+                    self.launch_syncref(job)
+            self.queue.task_done()
+        except Exception as inst:
+            LOGGER.info(f"Failed to operate on job with type {type(inst)} and args {inst.args}")
+
+    def launch_syncref(self, job) -> Popen:
+        LOGGER.info('Launching SyncRef UE')
+        if OPTS.basic: cmd = redirect_output('uname -a', self.log_file)
+        else: cmd = self.commands.launch_cmds[job]
+        proc = Popen(cmd, shell=True)
+        LOGGER.info(f"syncref_proc = {proc}")
+        if not OPTS.basic and not OPTS.no_run:
+            LOGGER.info(f"Process running... {job}")
+            time.sleep(OPTS.duration)
+            self.kill_process("syncref", proc)
+
+    def launch_nearby(self, job, host=OPTS.host, user=OPTS.user) -> Popen:
+        LOGGER.info('#' * 42)
+        LOGGER.info('Launching Nearby UE')
+        if OPTS.basic: cmd = redirect_output('uname -a', self.log_file)
+        else: cmd = self.commands.launch_cmds[job]
+        if OPTS.test == 'usrp':
+            cmd = cmd[:-1] + f' -d {OPTS.duration} --nid1 {OPTS.nid1} --nid2 {OPTS.nid2}'
+            proc = Popen(["ssh", f"{user}@{host}", cmd],
+                        shell=False,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE)
+            LOGGER.info(f"nearby_proc = {proc}")
+            remote_output = proc.stdout.readlines()
+            if remote_output == []:
+                nearby_result = proc.stderr.readlines()
+            else:
+                nearby_result = remote_output
+            self.kill_process("nearby", proc)
+            if nearby_result:
+                self.find_nearby_result_metric(nearby_result)
+        else:
+            proc = Popen(cmd, shell=True)
+            LOGGER.info(f"nearby_proc = {proc}")
+            if not OPTS.basic and not OPTS.no_run:
+                LOGGER.info(f"Process running... {job}")
+                time.sleep(OPTS.duration)
+                self.kill_process("nearby", proc)
+            nearby_result = self.log_agent.analyze_nearby_logs(OPTS.nid1, OPTS.nid2)
+            if nearby_result:
+                self.find_nearby_result_metric(nearby_result)
+
+    def find_nearby_result_metric(self, remote_log):
+        result_metric = None
+        for line in remote_log:
+            if type(line) is not str:
+                line = line.decode()
+            if OPTS.test == 'usrp':
+                LOGGER.info(line.strip())
+            # 'SyncRef UE found. RSRP: -100 dBm/RE. It took {delta_time_s} seconds'
+            if 'SyncRef UE found' in line:
+                fields = line.split(maxsplit=12)
+                if len(fields) > 6:
+                    ssb_rsrp = float(fields[-6])
+                    sync_duration = float(fields[-2])
+                    counting_duration = sync_duration - self.delay
+                    result_metric = (ssb_rsrp, sync_duration, counting_duration)
+                    self.passed += [result_metric]
+                    return
+
+    def kill_process(self, job: str, proc: Popen) -> None:
+        # Wait for the processes to end
+        LOGGER.info(f'kill main simulation processes... {job}')
+        cmd = ['sudo', 'killall']
+        cmd.append('-KILL')
+        if proc:
+            cmd.append('nr-uesoftmodem')
+            if "syncref" == job:
+                subprocess.run(cmd)
+            LOGGER.info(f'Waiting for PID proc.pid for {job}')
+            proc.kill()
+            proc.wait()
+        LOGGER.info(f'kill main simulation processes...done for {job}')
+
+# ----------------------------------------------------------------------------
+
+def main() -> int:
+    commands = Command(OPTS.commands)
+    log_agent = LogChecker(OPTS, LOGGER)
+    LOGGER.debug(f'Number of iterations {OPTS.repeat}')
+    if commands.launch_cmds is not None:
+        for role, cmd in commands.launch_cmds.items():
+            LOGGER.debug(f'{role} UE: {cmd}')
+    jobs = ['nearby', 'syncref'] if OPTS.launch == 'both' else [OPTS.launch]
+    passed_metric = []
+    num_tx_ssb = []
+    num_passed = 0
+    for i in range(OPTS.repeat):
+        threads = []
+        queue = Queue()
+        for job in jobs:
+            queue.put(job)
+            th = TestThread(queue, commands, passed_metric, log_agent)
+            th.setDaemon(True)
+            th.start()
+            threads.append(th)
+        for th in threads:
+            th.join()
+        if num_passed != len(passed_metric):
+            # Examine the logs to determine if the test passed
+            (ssb_rsrp, sync_duration, counting_duration) = passed_metric[-1]
+            num_ssb = log_agent.analyze_syncref_logs(counting_duration)
+            num_tx_ssb += [num_ssb]
+            LOGGER.info(f"Trial {i+1}/{OPTS.repeat} PASSED. {num_ssb} SSB(s) were generated. Measured {ssb_rsrp} RSRP (dbm/RE)")
+        else:
+            LOGGER.info(f"Failure detected during {i+1}/{OPTS.repeat} trial(s).")
+        num_passed = len(passed_metric)
+
+    LOGGER.info('#' * 42)
+    LOGGER.info(f"Number of passed = {len(passed_metric)}/{OPTS.repeat}")
+    if len(num_tx_ssb) > 0:
+        LOGGER.info(f"Avg number of SSB = {sum(num_tx_ssb) / len(num_tx_ssb)} ({num_tx_ssb})")
+    if len(passed_metric) > 0:
+        LOGGER.info(f"Avg SSB RSRP = {sum([result[0] for result in passed_metric]) / len(passed_metric)}")
+        LOGGER.info(f"Avg Sync duration (seconds) = {sum([result[1] for result in passed_metric]) / len(passed_metric)}")
+    return 0
+
+sys.exit(main())

ci-scripts/sl_check_log.py

@@ -0,0 +1,112 @@
+#!/usr/bin/env python3
+
+import os
+import bz2
+import logging
+from typing import Optional, List, Generator
+
+class LogChecker():
+    def __init__(self, OPTS, LOGGER):
+        self.OPTS = OPTS
+        self.LOGGER = LOGGER
+        self.rxlog_file_path = os.path.join(OPTS.log_dir, 'rx.log')
+        self.txlog_file_path = os.path.join(OPTS.log_dir, 'tx.log')
+
+    def get_lines(self, filename: str) -> Generator[str, None, None]:
+        """
+        Yield each line of the given log file (.bz2 compressed log file if -c flag is used.)
+        """
+        fh = bz2.open(filename, 'rb') if self.OPTS.compress else open(filename, 'rb')
+        for line_bytes in fh:
+            line = line_bytes.decode('utf-8', 'backslashreplace')
+            line = line.rstrip('\r\n')
+            yield line
+
+    def get_analysis_messages_nearby(self, filename: str) -> Generator[str, None, None]:
+        """
+        Finding all logs in the log file with X fields for log parsing optimization
+        """
+        self.LOGGER.info('Scanning %s', filename)
+        for line in self.get_lines(filename):
+            #796821.854505 [NR_PHY] SyncRef UE found with Nid1 10 and Nid2 1 SS-RSRP 100 dBm/RE
+            #796811.532881 [NR_PHY] nrUE configured
+            fields = line.split(maxsplit=10)
+            if len(fields) == 11 or len(fields) == 4:
+                yield line
+
+    def analyze_nearby_logs(self, exp_nid1: int, exp_nid2: int) -> bool:
+        found = set()
+        est_nid1, est_nid2, time_start_s, time_end_s = -1, -1, -1, -1
+        ssb_rsrp = 0
+        log_file = self.rxlog_file_path
+        result = None
+
+        if self.OPTS.compress:
+            log_file = f'{log_file}.bz2'
+        for line in self.get_analysis_messages_nearby(log_file):
+            #796821.854505 [NR_PHY] SyncRef UE found with Nid1 10 and Nid2 1 SS-RSRP -100 dBm/RE
+            #796811.532881 [NR_PHY] nrUE configured
+            if 'SyncRef UE found' in line and 'Nid1' in line and 'Nid2' in line:
+                num_split = 13 if 'RSRP' in line else 10
+                fields = line.split(maxsplit=num_split)
+                est_nid1 = int(fields[7])
+                est_nid2 = int(fields[10])
+                if 'RSRP' in line:
+                    ssb_rsrp = int(fields[12])
+                found.add('found')
+                time_end_s = float(fields[0])
+                break
+            if time_start_s == -1 and 'nrUE configured' in line:
+                fields = line.split(maxsplit=3)
+                time_start_s = float(fields[0])
+
+
+        self.LOGGER.debug('found: %r', found)
+        if len(found) != 1:
+            self.LOGGER.error(f'Failed -- No SyncRef UE found.')
+            return
+        elif exp_nid1 != est_nid1 or exp_nid2 != est_nid2:
+            self.LOGGER.error(f'Failed -- found SyncRef UE Nid1 {est_nid1}, Ni2 {est_nid2}, expecting Nid1 {exp_nid1}, Nid2 {exp_nid2}')
+            return
+        if time_start_s == -1:
+            self.LOGGER.error(f'Failed -- No start time found! Fix log and re-run!')
+            return
+
+        delta_time_s = time_end_s - time_start_s
+        result = f'SyncRef UE found. RSRP: {ssb_rsrp} dBm/RE. It took {delta_time_s} seconds'
+        self.LOGGER.info(result)
+        return [result]
+
+
+    def get_analysis_messages_syncref(self, filename: str) -> Generator[str, None, None]:
+        """
+        Finding all logs in the log file with X fields for log parsing optimization
+        """
+        self.LOGGER.info('Scanning %s', filename)
+        for line in self.get_lines(filename):
+            #796811.532881 [NR_PHY] nrUE configured
+            #796821.854505 [NR_PHY] PSBCH SL generation started
+            fields = line.split(maxsplit=5)
+            if len(fields) == 4 or len(fields) == 6 :
+                yield line
+
+    def analyze_syncref_logs(self, counting_delta: float) -> int:
+        time_start_s, time_end_s = -1, -1
+        log_file = self.txlog_file_path
+        sum_ssb = 0
+
+        if self.OPTS.compress:
+            tx_log_file = f'{log_file}.bz2'
+        for line in self.get_analysis_messages_syncref(log_file):
+            #796811.532881 [NR_PHY] nrUE configured
+            #796821.854505 [NR_PHY] PSBCH SL generation started
+            if time_start_s == -1 and 'nrUE configured' in line:
+                fields = line.split(maxsplit=2)
+                time_start_s = float(fields[0])
+                time_end_s = time_start_s + counting_delta
+            if 'PSBCH SL generation started' in line:
+                fields = line.split(maxsplit=2)
+                time_st = float(''.join([ch for ch in fields[0] if ch.isnumeric() or ch =='.']))
+                if time_st < time_end_s:
+                    sum_ssb += 1
+        return sum_ssb

ci-scripts/sl_cmds.txt

@@ -0,0 +1,45 @@
+# The lines containing 'usrp' and starts with 'syncref' or 'nearby' will be valid until it does not contain backspace.
+
+####################
+####    USRP    ####
+####################
+
+### RX Nearby UE ###
+nearby_usrp_cmd = cd $HOME/openairinterface5g/ci-scripts; \
+python3 sl_rx_agent.py --cmd \
+'sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH \
+$HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem \
+--sl-mode 2 -r 106 --numerology 1 --band 38 --SLC 2600000000 --ue-rxgain 90 \
+--usrp-args "type=n3xx,addr=192.168.20.2,subdev=A:0,master_clock_rate=122.88e6" \
+--log_config.global_log_options time,nocolor \
+> ~/rx.log 2>&1'
+
+### TX SyncRef UE ###
+
+syncref_usrp_cmd = \
+sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH \
+$HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem \
+--sl-mode 2 --sync-ref -r 106 --numerology 1 --band 38 --SLC 2600000000 --ue-txgain 8 \
+--usrp-args "type=n3xx,addr=192.168.10.2,subdev=A:0,master_clock_rate=122.88e6" \
+--log_config.global_log_options time,nocolor\
+> ~/tx.log 2>&1
+
+####################
+####   RFSIM    ####
+####################
+
+### RX Nearby UE ###
+nearby_rfsim_cmd = \
+sudo -E RFSIMULATOR=127.0.0.1 \
+$HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem \
+--rfsim --sl-mode 2 --rfsimulator.serverport 4048 \
+--log_config.global_log_options time,nocolor \
+> ~/rx.log 2>&1
+
+### TX SyncRef UE ###
+syncref_rfsim_cmd = \
+sudo -E RFSIMULATOR=server \
+$HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem \
+--sync-ref --rfsim --sl-mode 2 --rfsimulator.serverport 4048 \
+--log_config.global_log_options time,nocolor \
+> ~/tx.log 2>&1

ci-scripts/sl_rx_agent.py

@@ -0,0 +1,218 @@
+#!/usr/bin/env python3
+#
+# Automated tests for running 5G NR Sidelink Nearby UE.
+# The following is an example to run this script.
+#
+# python3 sl_rx_agent.py \
+# --cmd 'sudo -E LD_LIBRARY_PATH=$HOME/openairinterface5g/cmake_targets/ran_build/build:$LD_LIBRARY_PATH \
+# $HOME/openairinterface5g/cmake_targets/ran_build/build/nr-uesoftmodem \
+# --sl-mode 2 -r 106 --numerology 1 --band 38 -C 2600000000  --ue-rxgain 90 \
+# --usrp-args "type=n3xx,addr=192.168.20.2,subdev=A:0,master_clock_rate=122.88e6" \
+# > ~/rx.log 2>&1' \
+# --nid1 10 --nid2 1
+#
+# See `--help` for more information.
+#
+
+import os
+import sys
+import argparse
+import logging
+import time
+import glob
+import bz2
+import subprocess
+from subprocess import Popen
+from typing import Optional, List
+from sl_check_log import LogChecker
+
+HOME_DIR = os.path.expanduser( '~' )
+# ----------------------------------------------------------------------------
+# Command line argument parsing
+
+parser = argparse.ArgumentParser(description="""
+Automated tests for 5G NR Sidelink Rx simulations
+""")
+
+parser.add_argument('--duration', '-d', metavar='SECONDS', type=int, default=30, help="""
+How long to run the test before stopping to examine the logs
+""")
+
+parser.add_argument('--cmd', type=str, default='', help="""
+Commands
+""")
+
+parser.add_argument('--nid1', type=int, default=10, help="""
+Nid1 value
+""")
+
+parser.add_argument('--nid2', type=int, default=1, help="""
+Nid2 value
+""")
+
+parser.add_argument('--log-dir', default=HOME_DIR, help="""
+Where to store log files
+""")
+
+parser.add_argument('--compress', '-c', action='store_true', help="""
+Compress the log files in the --log-dir
+""")
+
+parser.add_argument('--no-run', '-n', action='store_true', help="""
+Don't run the test, only examine the logs in the --log-dir
+directory from a previous run of the test
+""")
+
+parser.add_argument('--debug', action='store_true', help="""
+Enable debug logging (for this script only)
+""")
+
+OPTS = parser.parse_args()
+del parser
+
+logging.basicConfig(level=logging.DEBUG if OPTS.debug else logging.INFO,
+                    format='>>> %(name)s: %(levelname)s: %(message)s')
+LOGGER = logging.getLogger(os.path.basename(sys.argv[0]))
+
+log_file_path = os.path.join(OPTS.log_dir, 'rx.log')
+
+# ----------------------------------------------------------------------------
+
+def compress(from_name: str, to_name: Optional[str]=None, remove_original: bool=False) -> None:
+    """
+    Compress the file `from_name` and store it as `to_name`.
+    `to_name` defaults to `from_name` with `.bz2` appended.
+    If `remove_original` is True, removes `from_name` when the compress finishes.
+    """
+    if to_name is None:
+        to_name = from_name
+    if not to_name.endswith('.bz2'):
+        to_name += '.bz2'
+    LOGGER.info('Compress %s to %s', from_name, to_name)
+    with bz2.open(to_name, 'w') as outh, \
+        open(from_name, 'rb') as inh:
+        while True:
+            data = inh.read(10240)
+            if not data:
+                break
+            outh.write(data)
+    if remove_original:
+        LOGGER.debug('Remove %s', from_name)
+        os.remove(from_name)
+
+
+class CompressJobs:
+    """
+    Allow multiple invocations of `compress` to run in parallel
+    """
+
+    def __init__(self) -> None:
+        self.kids: List[int] = []
+
+    def compress(self, from_name: str, to_name: Optional[str]=None, remove_original: bool=False) -> None:
+        if not os.path.exists(from_name):
+            # It's not necessarily an error if the log file does not exist.
+            # For example, if nfapi_trace never gets invoked (e.g., because
+            # NFAPI_TRACE_LEVEL is set to none), then the log file nfapi.log
+            # will not get created.
+            LOGGER.warning('No file: %s', from_name)
+            return
+        kid = os.fork()
+        if kid != 0:
+            self.kids.append(kid)
+        else:
+            LOGGER.debug('in pid %d compress %s...', os.getpid(), from_name)
+            compress(from_name, to_name, remove_original)
+            LOGGER.debug('in pid %d compress %s...done', os.getpid(), from_name)
+            sys.exit()
+
+    def wait(self) -> None:
+        LOGGER.debug('wait %s...', self.kids)
+        failed = []
+        for kid in self.kids:
+            LOGGER.debug('waitpid %d', kid)
+            _pid, status = os.waitpid(kid, 0)
+            if status != 0:
+                failed.append(kid)
+        if failed:
+            raise Exception('compression failed: %s', failed)
+        LOGGER.debug('wait...done')
+
+
+class TestNearby():
+    """
+    Represents TestNearby
+    """
+    def __init__(self):
+        self.cmd = None
+        self.delay = 0 # seconds
+
+    def run(self, cmd: str) -> bool:
+        self.cmd = cmd
+        job = "nearby"
+        time.sleep(self.delay)
+        proc = self.launch_nearby(job)
+        LOGGER.info(f"nearby_proc = {proc}")
+        LOGGER.info(f"Process running... {job}")
+        time.sleep(OPTS.duration)
+        passed = self.kill_process("nearby", proc)
+        if OPTS.compress:
+            self.compress_log_file(proc)
+        return passed
+
+    def launch_nearby(self, job) -> Popen:
+        LOGGER.info('Launching Nearby UE: %s', log_file_path)
+        cmd = self.cmd
+        proc = Popen(cmd, shell=True)
+        time.sleep(1)
+        return proc
+
+    def kill_process(self, job: str, proc: Popen) -> bool:
+        passed = True
+        if proc:
+            status = proc.poll()
+            if status is None:
+                LOGGER.info('process is still running, which is good')
+            else:
+                #passed = False
+                LOGGER.info('process ended early: %r', status)
+        LOGGER.info(f'kill main simulation processes... {job}')
+        cmd = ['sudo', 'killall']
+        cmd.append('-KILL')
+        if proc:
+            cmd.append('nr-uesoftmodem')
+            if "nearby" == job:
+                subprocess.run(cmd)
+            LOGGER.info(f'Waiting for PID proc.pid for {job}')
+            proc.kill()
+            proc.wait()
+        LOGGER.info(f'kill main simulation processes...done for {job}')
+        return passed
+
+    def compress_log_file(self, proc: Popen):
+        jobs = CompressJobs()
+        jobs.compress(log_file_path)
+        jobs.wait()
+
+# ----------------------------------------------------------------------------
+
+def main(argv) -> int:
+    test_agent = TestNearby()
+    log_agent = LogChecker(OPTS, LOGGER)
+
+    passed = True
+    if not OPTS.no_run:
+        passed = test_agent.run(OPTS.cmd)
+
+    # Examine the logs to determine if the test passed
+    if not log_agent.analyze_nearby_logs(exp_nid1=OPTS.nid1, exp_nid2=OPTS.nid2):
+        passed = False
+
+    if not passed:
+        LOGGER.critical('FAILED')
+        return 1
+
+    LOGGER.info('PASSED')
+    return 0
+
+sys.exit(main(sys.argv))

ci-scripts/xml_files/container_5g_rfsim_f1_accelleran.xml

@@ -0,0 +1,74 @@
+<!--
+
+ 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>rfsim-5gnr-f1-accelleran</htmlTabRef>
+        <htmlTabName>F1 DU Interop Accelleran CU</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <TestCaseRequestedList>
+ 111111
+ 000020
+ 000021
+ 020021
+ 100021
+ 100022
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
+        <testCase id="000020">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI-DU</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <services>oai-du</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
+        <testCase id="000021">
+                <class>DeployGenObject</class>
+                <desc>Deploy nrUE</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>2</nb_healthy>
+        </testCase>
+
+        <testCase id="020021">
+                <class>PingFromContainer</class>
+                <desc>Test Connectivity (ping)</desc>
+                <container_name>rfsim5g-oai-nr-ue</container_name>
+                <options>-I oaitun_ue1 -c 20 12.1.1.1</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="100022">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_5g_rfsim_f1_accelleran_down.xml

@@ -0,0 +1,45 @@
+<!--
+
+ 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>rfsim-5gnr-down-f1-accelleran</htmlTabRef>
+        <htmlTabName>CleanUp</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 100022
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="100022">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_accelleran</yaml_path>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_nsa_b200_quectel.xml

@@ -69,8 +69,8 @@
 		<class>Custom_Command</class>
 		<desc>Reset USRP</desc>
 		<node>nepes</node>
-		<command>sudo -S b2xx_fx3_utils --reset-device</command>
-  </testCase>
+		<command>sudo -S /usr/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
+	</testCase>
 
 	<testCase id="200000">
 		<class>Custom_Command</class>

ci-scripts/yaml_files/5g_rfsimulator_accelleran/docker-compose.yaml

@@ -0,0 +1,38 @@
+version: '3.8'
+services:
+    oai-du:
+        image: oaisoftwarealliance/oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-du
+        network_mode: "host"
+        environment:
+            RFSIMULATOR: server
+            USE_VOLUMED_CONF: 'yes'
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --MACRLCs.[0].local_n_address 172.21.16.109 --MACRLCs.[0].remote_n_address 172.21.6.22 --log_config.global_log_options level,nocolor,time
+        volumes:
+            - ../../conf_files/gnb-du.band78.106prb.rfsim.conf:/opt/oai-gnb/etc/mounted.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    oai-nr-ue:
+        image: oaisoftwarealliance/oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue
+        network_mode: "host"
+        environment:
+            RFSIMULATOR: 127.0.0.1
+            FULL_IMSI: '208990100001140'
+            FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
+            DNN: oai
+            NSSAI_SST: 1
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --log_config.global_log_options level,nocolor,time
+        depends_on:
+            - oai-du
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5

cmake_targets/autotests/test_case_list.xml

@@ -147,6 +147,18 @@
       <nruns>3</nruns>
     </testCase>
 
+     <testCase id="nr_psbchsim.106rb">
+      <desc>nr_psbchsim Test cases. (Test1: PSBCH and synchronization, 106PBR),
+                                    (Test2: PSBCH and synchronization, 106PBR, SSB SC OFFSET 6)</desc>
+      <main_exec>nr_psbchsim</main_exec>
+      <main_exec_args>-s-11 -S2 -n1 -I -R106
+                      -s-11 -S2 -n1 -I -R106 -O6</main_exec_args>
+      <tags>test1 test2 test3</tags>
+      <search_expr_true>PSBCH test OK</search_expr_true>
+      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
+      <nruns>3</nruns>
+    </testCase>
+
      <testCase id="nr_dlsim.basic">
       <desc>nr_dlsim Test cases. (Test1: 106 PRB),
                                  (Test2: 217 PRB),

cmake_targets/build_oai

@@ -508,7 +508,7 @@ function main() {
   [[ "$UE" == 1 ]] &&    execlist="$execlist lte-uesoftmodem"
   [[ "$nrUE" == 1 ]] &&  execlist="$execlist nr-uesoftmodem"
   # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
-  [[ "$SIMUS_PHY" == "1" ]] && execlist="$execlist dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim"
+  [[ "$SIMUS_PHY" == "1" ]] && execlist="$execlist dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_psbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim"
   [[ "$BUILD_OPTLIB" != "" ]] && execlist="$execlist $BUILD_OPTLIB"
   [[ "$execlist" != "" ]] && execlist="$execlist params_libconfig coding rfsimulator"
 

cmake_targets/tools/build_helper

@@ -33,6 +33,7 @@ OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "
 case "$OS_DISTRO" in
   fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
   rhel)   OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake3" ;;
+  rocky)  OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
   centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;;
   debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
   ubuntu) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
@@ -126,6 +127,12 @@ check_supported_distribution() {
         "rhel9.3")     return 0 ;;
         "centos7")     return 0 ;;
         "centos8")     return 0 ;;
+        "rocky8.7")    return 0 ;;
+        "rocky8.8")    return 0 ;;
+        "rocky8.9")    return 0 ;;
+        "rocky9.1")    return 0 ;;
+        "rocky9.2")    return 0 ;;
+        "rocky9.3")    return 0 ;;
     esac
     return 1
 }
@@ -300,7 +307,7 @@ install_usrp_uhd_driver_from_source(){
         if [[ "$OS_DISTRO" == "ubuntu" ]]; then
             $SUDO /usr/local/lib/uhd/utils/uhd_images_downloader.py
         fi
-        if [[ "$OS_DISTRO" == "rhel" ]]; then
+        if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
             $SUDO /usr/local/lib64/uhd/utils/uhd_images_downloader.py
         fi
     fi
@@ -367,7 +374,7 @@ check_install_usrp_uhd_driver(){
             $SUDO $INSTALLER -y install $boost_libs_fedora $CMAKE
             $SUDO pip3 install mako requests
         fi
-        if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
+        if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
             if [ $IS_CONTAINER -eq 0 ]
             then
                 # until EPEL repo hasn't bumped UHD driver to >=3.10 in EPEL, build driver from source
@@ -389,13 +396,13 @@ install_usrp_uhd_driver() {
     # quick workaround for RHE7.6
     local distribution=$(get_distribution_release)
     if [ -z $1 ]; then
-      if [[ "$OS_DISTRO" == "rhel" ]]; then
+      if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
           $SUDO /usr/local/bin/uhd_images_downloader
       else
           $SUDO uhd_images_downloader
       fi
     else
-      if [[ "$OS_DISTRO" == "rhel" ]]; then
+      if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
           $SUDO /usr/local/bin/uhd_images_downloader -i $1
       else
           $SUDO uhd_images_downloader -i $1
@@ -562,7 +569,7 @@ check_install_additional_tools (){
         libforms-bin \
         libforms-dev \
         xmlstarlet"
-  elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
+  elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
     PACKAGE_LIST="\
       doxygen \
       ctags \
@@ -623,7 +630,7 @@ check_install_oai_software() {
         xxd
 
   elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
-    if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
+    if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]]; then
       if rpm -q epel-release > /dev/null; then
         echo "EPEL repos already present. Good."
       else

common/utils/LOG/log.c

@@ -45,6 +45,7 @@
 #include "common/config/config_userapi.h"
 #include <time.h>
 #include <sys/time.h>
+#include "common/utils/LOG/log_extern.h"
 
 // main log variables
 
@@ -66,32 +67,30 @@ char __log_mem_filename[1024]={0};
 char * log_mem_filename = &__log_mem_filename[0];
 char logmem_filename[1024] = {0};
 
-mapping log_level_names[] = {
-  {"error",  OAILOG_ERR},
-  {"warn",   OAILOG_WARNING},
-  {"analysis", OAILOG_ANALYSIS},
-  {"info",   OAILOG_INFO},
-  {"debug",  OAILOG_DEBUG},
-  {"trace",  OAILOG_TRACE},
-  {NULL, -1}
-};
+const mapping log_level_names[] = {{"error", OAILOG_ERR},
+                                   {"warn", OAILOG_WARNING},
+                                   {"analysis", OAILOG_ANALYSIS},
+                                   {"info", OAILOG_INFO},
+                                   {"debug", OAILOG_DEBUG},
+                                   {"trace", OAILOG_TRACE},
+                                   {NULL, -1}};
 
-mapping log_options[] = {
-  {"nocolor", FLAG_NOCOLOR  },
-  {"level",   FLAG_LEVEL  },
-  {"thread",  FLAG_THREAD },
-  {"line_num",    FLAG_FILE_LINE },
-  {"function", FLAG_FUNCT},
-  {"time",     FLAG_TIME},
-  {"thread_id", FLAG_THREAD_ID},
-  {"wall_clock", FLAG_REAL_TIME},
-  {NULL,-1}
-};
+const mapping log_options[] = {{"nocolor", FLAG_NOCOLOR},
+                               {"level", FLAG_LEVEL},
+                               {"thread", FLAG_THREAD},
+                               {"line_num", FLAG_FILE_LINE},
+                               {"function", FLAG_FUNCT},
+                               {"time", FLAG_TIME},
+                               {"thread_id", FLAG_THREAD_ID},
+                               {"wall_clock", FLAG_REAL_TIME},
+                               {NULL, -1}};
 
 mapping log_maskmap[] = LOG_MASKMAP_INIT;
 
-char *log_level_highlight_start[] = {LOG_RED, LOG_ORANGE, LOG_GREEN, "", LOG_BLUE, LOG_CYBL};  /*!< \brief Optional start-format strings for highlighting */
-char *log_level_highlight_end[]   = {LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET};   /*!< \brief Optional end-format strings for highlighting */
+static const char *log_level_highlight_start[] =
+    {LOG_RED, LOG_ORANGE, LOG_GREEN, "", LOG_BLUE, LOG_CYBL}; /*!< \brief Optional start-format strings for highlighting */
+static const char *log_level_highlight_end[] =
+    {LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET, LOG_RESET}; /*!< \brief Optional end-format strings for highlighting */
 static void log_output_memory(log_component_t *c, const char *file, const char *func, int line, int comp, int level, const char* format,va_list args);
 
 
@@ -754,8 +753,7 @@ void close_component_filelog(int comp)
  * with string value NULL
  */
 /* map a string to an int. Takes a mapping array and a string as arg */
-int map_str_to_int(mapping *map,
-		           const char *str)
+int map_str_to_int(const mapping *map, const char *str)
 {
   while (1) {
     if (map->name == NULL) {
@@ -771,8 +769,7 @@ int map_str_to_int(mapping *map,
 }
 
 /* map an int to a string. Takes a mapping array and a value */
-char *map_int_to_str(mapping *map,
-		             int val)
+char *map_int_to_str(const mapping *map, const int val)
 {
   while (1) {
     if (map->name == NULL) {

common/utils/LOG/log.h

@@ -315,8 +315,8 @@ void set_glog_filelog(int enable);
 void set_component_filelog(int comp);
 void close_component_filelog(int comp);
 void set_component_consolelog(int comp);
-int  map_str_to_int(mapping *map, const char *str);
-char *map_int_to_str(mapping *map, int val);
+int map_str_to_int(const mapping *map, const char *str);
+char *map_int_to_str(const mapping *map, const int val);
 void logClean (void);
 int  is_newline( char *str, int size);
 

common/utils/LOG/log_extern.h

@@ -23,9 +23,8 @@
 
 extern log_t *g_log;
 
-
-extern mapping log_level_names[];
-extern mapping log_options[];
+extern const mapping log_level_names[];
+extern const mapping log_options[];
 extern mapping log_maskmap[];
 extern int log_mem_flag;
 extern char * log_mem_filename;

common/utils/nr/nr_common.c

@@ -706,3 +706,27 @@ void SLIV2SL(int SLIV,int *S,int *L) {
   }
 }
 
+int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA)
+{
+  uint32_t absolute_diff = (absoluteFrequencySSB - absoluteFrequencyPointA);
+  const int scaling_5khz = absoluteFrequencyPointA < 600000 ? 3 : 1;
+  return ((absolute_diff / scaling_5khz) % 24);
+}
+
+uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
+                                  uint32_t absoluteFrequencyPointA,
+                                  int ssbSubcarrierSpacing,
+                                  int frequency_range)
+{
+  uint32_t absolute_diff = (absoluteFrequencySSB - absoluteFrequencyPointA);
+  const int scaling_5khz = absoluteFrequencyPointA < 600000 ? 3 : 1;
+  int sco = get_ssb_subcarrier_offset(absoluteFrequencySSB, absoluteFrequencyPointA);
+  const int scs_scaling = frequency_range == FR2 ? 1 << (ssbSubcarrierSpacing - 2) : 1 << ssbSubcarrierSpacing;
+  const int scaled_abs_diff = absolute_diff / scaling_5khz;
+  const int ssb_offset_point_a =
+      (scaled_abs_diff - sco) / 12
+      - 10 * scs_scaling; // absoluteFrequencySSB is the central frequency of SSB which is made by 20RBs in total
+  AssertFatal(ssb_offset_point_a % scs_scaling == 0, "PRB offset %d can create frequency offset\n", ssb_offset_point_a);
+  AssertFatal(sco % scs_scaling == 0, "ssb offset %d can create frequency offset\n", sco);
+  return ssb_offset_point_a;
+}

common/utils/nr/nr_common.h

@@ -101,7 +101,11 @@ void get_samplerate_and_bw(int mu,
                            unsigned int *samples_per_frame,
                            double *tx_bw,
                            double *rx_bw);
-
+uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
+                                  uint32_t absoluteFrequencyPointA,
+                                  int ssbSubcarrierSpacing,
+                                  int frequency_range);
+int get_ssb_subcarrier_offset(uint32_t absoluteFrequencySSB, uint32_t absoluteFrequencyPointA);
 #define CEILIDIV(a,b) ((a+b-1)/b)
 #define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))
 

doc/BUILD.md

@@ -30,7 +30,7 @@ The main oai binaries, which are tested by the Continuous Integration process ar
 -  The 5G gNodeB: `nr-softmodem`
 -  The 5G CU-UP: `nr-cuup`
 -  The LTE PHY simulators: `dlsim` and `ulsim`
--  The 5G PHY simulators: `nr_dlschsim`, `nr_dlsim`, `nr_pbchsim`, `nr_pucchsim`, `nr_ulschsim`, `nr_ulsim`, `polartest`, `smallblocktest`, `nr _ulsim`, `ldpctest`
+-  The 5G PHY simulators: `nr_dlschsim`, `nr_dlsim`, `nr_pbchsim`, `nr_psbchsim`, `nr_pucchsim`, `nr_ulschsim`, `nr_ulsim`, `polartest`, `smallblocktest`, `nr _ulsim`, `ldpctest`
 
 Running the  [build_oai](../cmake_targets/build_oai) script also generates some utilities required to build and/or run the oai softmodem binaries:
 

doc/F1-design.md

@@ -11,6 +11,7 @@
     </td>
   </tr>
 </table>
+
 # 1. Introduction
 
 We use OpenAirInterface source code, and it's regular deployment scheme.
@@ -208,3 +209,46 @@ DU rlc north output goes to du_pdcp_data_ind() that push a outgoing packet reque
 CU pdcp south output calls cu_rlc_data_ind() that do the same symetric processing.
 
 
+# High-level F1-C code structure
+
+The F1 interface is used internally between CU (mostly RRC) and DU (mostly MAC)
+to exchange information. In DL, the CU sends messages as defined by the
+callbacks in `mac_rrc_dl.h`, whose implementation is defined in files
+`mac_rrc_dl_direct.c` (monolithic) and `mac_rrc_dl_f1ap.c` (for F1AP). In the
+monolithic case, the RRC calls directly into the message handler on the DU side
+(`mac_rrc_dl_handler.c`). In the F1 case, an ITTI message is sent to the CU
+task, sending an ASN.1-encoded F1AP message. The DU side's DU task decodes the
+message, and then calls the corresponding handler in `mac_rrc_dl_handler.c`.
+Thus, the message flow is the same in both F1 and monolithic cases, with the
+difference that F1AP encodes the messages using ASN.1 and sends over a socket.
+
+In UL, the callbacks defined in `mac_rrc_ul.h` are implemented by
+`mac_rrc_ul_direct.c` (monolithic) and `mac_rrc_ul_f1ap.c` (F1). In the direct
+case, an ITTI message is directly sent to the RRC task (hence, there is no
+dedicated handler). In F1, the DU task receives the ITTI message, encodes using
+ASN.1, and sends it over a network socket.  The CU task decodes, and sends the
+same ITTI message to the RRC task as done directly in the monolithic case.
+
+```
+                             +-------------+
+                             |             |
+                             |   CU/RRC    |
+                             |             |
+                             +-------------+
+                                |       ^
+     Callback def: mac_rrc_dl.h |       | No handler needed:
+     F1 impl: mac_rrc_dl_f1ap.c |       | RRC has ITTI
+Monolithic: mac_rrc_dl_direct.c |       |
+                                |       |
+                             DL |       | UL
+                                |       |
+                                |       | Callback def: mac_rrc_ul.h
+               Message handler: |       | F1 impl: mac_rrc_ul_f1ap.c
+           mac_rrc_dl_handler.c |       | Monolithic: mac_rrc_ul_direct.c
+                                v       |
+                             +-------------+
+                             |             |
+                             |   DU/MAC    |
+                             |             |
+                             +-------------+
+```

doc/README.md

@@ -94,6 +94,7 @@ The other SDRs (AW2S, LimeSDR, ...) have no READMEs.
 
 ## Special-purpose libraries
 
+- OAI has two scopes, one based on Xforms, one on Qt5, described in [this README](../openair1/PHY/TOOLS/readme.md)
 - OAI comes with an integrated [telnet server](../common/utils/telnetsrv/DOC/telnethelp.md) to monitor and control
 - OAI comes with an integrated [web server](../common/utils/websrv/DOC/websrv.md)
 

doc/RUN_NR_PRS.md

@@ -64,7 +64,7 @@ In our case the output is 0 and hence we use `numactl --cpunodebind=0 --membind=
 ## FR1 test
 Open a terminal on the host machine, and execute below command to launch gNB with **X310 USRPs**
 
-```sudo numactl --cpunodebind=0 --membind=0 ./nr-softmodem -E -O../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.sa.band78.fr1.106PRB.prs.usrpx310.conf --phy-test```
+```sudo numactl --cpunodebind=0 --membind=0 ./nr-softmodem -E -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.sa.band78.fr1.106PRB.prs.usrpx310.conf --phy-test```
 
 If **N310 USRPs** are used, then run above command `without -E option` i.e without 3/4 sampling rate.<br><br>
 
@@ -187,4 +187,4 @@ This script will read the IQ data from extracted PRS dumps(chF_gnbX_Y.raw and ch
          <figcaption align = "center"><b>Fig.1 - FR2 100MHz test</b></figcaption>
     </td>
   </tr>
-</table>
+</table>

doc/TESTBenches.md

@@ -55,7 +55,7 @@ Note: The available resources, and their current usage, is indicated here:
 
 ### 5G AW2S Testbench
 
-**Purpose**: AW2S tests with Amarisoft
+**Purpose**: AW2S tests with Amarisoft UE simulator
 
 ![5G AW2S Testbench](testbenches_doc_resources/5g-aw2s-bench.png)
 
@@ -82,7 +82,10 @@ Webhook
 - [RAN-gNB-N300-Timing-Phytest-LDPC](https://jenkins-oai.eurecom.fr/view/RAN/job/RAN-gNB-N300-Timing-Phytest-LDPC/)
   - caracal + N310
   - pure performance test through phy-test scheduler, see command line for more details
-- [RAN-L2-Sim-Test-5G](https://jenkins-oai.eurecom.fr/job/RAN-L2-Sim-Test-4G/)
+- [RAN-Interop-F1](https://jenkins-oai.eurecom.fr/job/RAN-Interop-F1/)
+  - ofqot (DU, 1x UE)
+  - F1 interoperability testing: sets up connection to Accelleran CU, UE connection and connectivity test
+- [RAN-L2-Sim-Test-4G](https://jenkins-oai.eurecom.fr/job/RAN-L2-Sim-Test-4G/)
   - obelix (eNB, 1x UE, OAI EPC)
   - L2simulator: skips physical layer and uses proxy between eNB and UE
 - [RAN-L2-Sim-Test-5G](https://jenkins-oai.eurecom.fr/job/RAN-L2-Sim-Test-5G/)
@@ -92,7 +95,7 @@ Webhook
   - hutch + B210, nano w/ ltebox + 2x UE
   - tests RRC inactivity timers, different bandwidths
 - [RAN-LTE-TDD-2x2-Container](https://jenkins-oai.eurecom.fr/view/RAN/job/RAN-LTE-TDD-2x2-Container/)
-  - obelix + N310, porcepix, quectel
+  - obelix + N310, porcepix, nrmodule2 + Quectel
   - TM1 and TM2 test
 - [RAN-LTE-TDD-LTEBOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-LTE-TDD-LTEBOX-Container/)
   - starsky + B210, nano w/ ltebox + 2x UE
@@ -111,14 +114,15 @@ Webhook
   - uses RFsimulator, TDD 40MHz, FDD 40MHz, F1 split
 - [RAN-RHEL8-Cluster-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-RHEL8-Cluster-Image-Builder/)
   - cluster (`Asterix-OC-oaicicd-session` resource): RHEL 8 image build using the OpenShift Cluster
+- [RAN-SA-AW2S-CN5G](https://jenkins-oai.eurecom.fr/job/RAN-SA-AW2S-CN5G/)
+  - 5G-NR SA test setup: avra(RHEL9.1) + AW2S, amariue, OAI CN5G
+  - uses OpenShift cluster for CN deployment and container images for gNB deployment
+  - multi UE testing
 - [RAN-SA-B200-Module-SABOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-SA-B200-Module-SABOX-Container/)
   - ofqot + B200, idefix + Quectel, nepes w/ sabox
   - basic SA test (20 MHz TDD), F1, reestablishment, ...
-- [RAN-Ubuntu20-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/)
+- [RAN-Ubuntu18-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/)
   - obelix: Ubuntu 20 image build using docker (Note: builds U20 images while pipeline is named U18!)
-- [RAN-SA-AW2S-CN5G](https://jenkins-oai.eurecom.fr/job/RAN-SA-AW2S-CN5G/)
-  - 5G-NR SA test setup: Avra(RHEL9.1)/Manarola(U22PRO) + AW2S, Amarisoft UE x1, OAI CN5G
-  - uses OpenShift cluster for CN deployment and container images for gNB deployment
 
 ### RAN-CI-NSA-Trigger
 

doc/testbenches_doc_resources/5g-aw2s-bench.tex

@@ -23,9 +23,11 @@
   \node[below right=-0.7cm and 0.35cm of b78o.east] (anto2)
     {\includegraphics[width=0.3cm]{antenna}} edge (b78o);
 
-  \node[right=4cm of aw2s, label=above:Amarisoft UE] (amariue)
+  \node[right=3.5cm of aw2s, label=above:amariue] (amariue)
     {\includegraphics[width=0.7cm]{amariue}};
-  \node[right=3cm of aw2s] (anto3)
+  \node[right=0.8cm of anto1] (anto3)
+    {\includegraphics[width=0.3cm]{antenna}} edge (amariue);
+  \node[right=0.8cm of anto2] (anto4)
     {\includegraphics[width=0.3cm]{antenna}} edge (amariue);
 
 \end{tikzpicture}

docker/Dockerfile.base.rocky

@@ -0,0 +1,58 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM $BASE_IMAGE AS ran-base
+
+ENV TZ=Europe/Paris
+ENV BUILD_UHD_FROM_SOURCE=True
+ENV UHD_VERSION=4.4.0.0
+
+RUN dnf install 'dnf-command(config-manager)' -y && \
+    dnf config-manager --set-enabled powertools && \
+    dnf install epel-release -y && crb enable && \
+    dnf update -y && \
+    dnf install -y \
+       #gcc needed for build_oai
+       gcc gcc-c++ \ 
+       diffutils \
+       file \
+       psmisc \
+       git \
+       # python3-pip and pyyaml are used for conf template generation
+       python3-pip && \
+    pip3 install --ignore-installed pyyaml
+
+#create the WORKDIR
+WORKDIR /oai-ran
+COPY . .
+
+#run build_oai -I to get the builder image
+RUN /bin/sh oaienv && \ 
+    cd cmake_targets && \
+    mkdir -p log && \
+    ./build_oai -I --install-optional-packages -w USRP

docker/Dockerfile.build.rhel8.2

@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Wno-unused-function --cmake-opt -DCMAKE_CXX_FLAGS=-Wno-unused-function

docker/Dockerfile.build.rocky

@@ -0,0 +1,38 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+FROM ran-base:latest as ran-build
+
+RUN rm -Rf /oai-ran
+WORKDIR /oai-ran
+COPY . .
+
+#run build_oai to build the target image
+RUN /bin/sh oaienv && \ 
+    cd cmake_targets && \
+    mkdir -p log && \
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP --verbose-ci --noavx512 -c

docker/Dockerfile.build.ubuntu20

@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror --cmake-opt -DCMAKE_C_FLAGS=-Wno-unused-function --cmake-opt -DCMAKE_CXX_FLAGS=-Wno-unused-function

docker/Dockerfile.clang.rhel8.2

@@ -40,4 +40,4 @@ RUN /bin/sh oaienv && \
     mkdir -p log && \
     export CC=/usr/bin/clang && \
     export CXX=/usr/bin/clang++ && \
-    ./build_oai --phy_simulators --gNB --eNB --nrUE --UE --ninja --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai --phy_simulators --gNB --eNB --nrUE --UE --ninja --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror --cmake-opt -DCMAKE_C_FLAGS=-Wno-unused-function --cmake-opt -DCMAKE_CXX_FLAGS=-Wno-unused-function

docker/Dockerfile.eNB.rocky

@@ -0,0 +1,130 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS enb-base
+
+FROM ran-build:latest AS enb-build
+
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \
+    cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-enb
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        lksctp-tools \
+        tzdata \
+        procps-ng \
+        atlas \
+        gdb \
+        python3 \
+        python3-pip \
+        net-tools \
+        iputils \
+        iproute && \
+    pip3 install six && \
+    pip3 install requests && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-enb/bin
+COPY --from=enb-build \
+    /oai-ran/cmake_targets/ran_build/build/lte-softmodem \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    ./
+
+COPY --from=enb-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_enb.so \
+    /usr/local/lib/
+
+COPY --from=enb-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/libboost_chrono.so.1.66.0 \
+    /lib64/libboost_date_time.so.1.66.0 \
+    /lib64/libboost_filesystem.so.1.66.0 \
+    /lib64/libboost_program_options.so.1.66.0 \
+    /lib64/libboost_serialization.so.1.66.0 \
+    /lib64/libboost_thread.so.1.66.0 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/libboost_unit_test_framework.so.1.66.0 \
+    /lib64/libboost_atomic.so.1.66.0 \
+    /lib64/libboost_timer.so.1.66.0 \
+    /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
+    /lib64/
+
+
+# Now we are copying from builder-image the UHD files.
+COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin
+COPY --from=enb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
+COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
+
+WORKDIR /usr/local/share/uhd/rfnoc
+COPY --from=enb-base /usr/local/share/uhd/rfnoc/ .
+
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
+    ldconfig && \
+    echo "ldd on lte-softmodem" && ldd /opt/oai-enb/bin/lte-softmodem && \
+    echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \
+    echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on liboai_iqplayer.so" && ldd /usr/local/lib/liboai_iqplayer.so && \
+    echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \
+    echo "ldd on libtelnetsrv_enb.so" && ldd /usr/local/lib/libtelnetsrv_enb.so
+
+# Copy the relevant configuration files for eNB
+WORKDIR /opt/oai-enb/etc
+COPY --from=enb-build /oai-ran/docker/etc .
+
+WORKDIR /opt/oai-enb
+
+# 2152 --> S1U, GTP/UDP
+# 36412 --> S1C, SCTP/UDP
+# 36422 --> X2C, SCTP/UDP
+EXPOSE 2152/udp 36412/udp 36422/udp
+
+ENTRYPOINT ["/opt/oai-enb/bin/entrypoint.sh"]
+CMD ["/opt/oai-enb/bin/lte-softmodem", "-O", "/opt/oai-enb/etc/enb.conf"]

docker/Dockerfile.gNB.aw2s.rocky

@@ -0,0 +1,105 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS gnb-base
+
+FROM ran-build:latest AS gnb-build
+
+COPY ./libori.so /usr/local/lib
+
+# build AW2S fronthaul lib
+WORKDIR /oai-ran
+RUN /bin/sh oaienv && \
+    cd cmake_targets/ran_build/build && \
+    ninja aw2sori_transpro
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-gnb-aw2s
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        procps-ng \
+        libXpm \
+        libX11 \
+        atlas \
+        lksctp-tools \
+        tzdata \
+        net-tools \
+        iputils && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-gnb-aw2s/bin
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/nr-softmodem \
+    ./
+COPY ./docker/scripts/gnb-aw2s_entrypoint.sh ./entrypoint.sh
+
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/libaw2sori_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /usr/local/lib/libori.so \
+    /usr/local/lib/
+
+COPY --from=gnb-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libforms.so.2 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/
+
+RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \
+    ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so && \
+    ldconfig && \
+    echo "ldd on nr-softmodem" && ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \
+    echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on libaw2sori_transpro" && ldd /usr/local/lib/libaw2sori_transpro.so && \
+    echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on libldpc" && ldd /usr/local/lib/libldpc.so && \
+    echo "ldd on libldpc_optim" && ldd /usr/local/lib/libldpc_optim.so && \
+    echo "ldd on libldpc_optim8seg" && ldd /usr/local/lib/libldpc_optim8seg.so && \
+    echo "ldd on libldpc_orig" && ldd /usr/local/lib/libldpc_orig.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so
+
+WORKDIR /opt/oai-gnb-aw2s
+ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
+CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem", "-O", "/opt/oai-gnb-aw2s/etc/gnb.conf"]

docker/Dockerfile.gNB.rocky

@@ -0,0 +1,138 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS gnb-base
+
+FROM ran-build:latest AS gnb-build
+
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters.yaml && \
+    cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-gnb
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        procps-ng \
+        libXpm \
+        libX11 \
+        atlas \
+        lksctp-tools \
+        tzdata \
+        gdb \
+        python3 \
+        python3-pip \
+        net-tools \
+        iputils && \
+    pip3 install six && \
+    pip3 install requests && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-gnb/bin
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/nr-softmodem \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    ./
+
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_ci.so \
+    /usr/local/lib/
+
+COPY --from=gnb-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libforms.so.2 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/libboost_chrono.so.1.66.0 \
+    /lib64/libboost_date_time.so.1.66.0 \
+    /lib64/libboost_filesystem.so.1.66.0 \
+    /lib64/libboost_program_options.so.1.66.0 \
+    /lib64/libboost_serialization.so.1.66.0 \
+    /lib64/libboost_thread.so.1.66.0 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/libboost_unit_test_framework.so.1.66.0 \
+    /lib64/libboost_atomic.so.1.66.0 \
+    /lib64/libboost_timer.so.1.66.0 \
+    /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
+    /lib64/
+
+# Now we are copying from builder-image the UHD files.
+COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin
+COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
+COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
+
+WORKDIR /usr/local/share/uhd/rfnoc
+COPY --from=gnb-base /usr/local/share/uhd/rfnoc/ .
+
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
+    ldconfig && \
+    echo "ldd on nr-softmodem" && ldd /opt/oai-gnb/bin/nr-softmodem && \
+    echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on liboai_usrpdevif" && ldd /usr/local/lib/liboai_usrpdevif.so && \
+    echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on libldpc" && ldd /usr/local/lib/libldpc.so && \
+    echo "ldd on libldpc_optim" && ldd /usr/local/lib/libldpc_optim.so && \
+    echo "ldd on libldpc_optim8seg" && ldd /usr/local/lib/libldpc_optim8seg.so && \
+    echo "ldd on libldpc_orig" && ldd /usr/local/lib/libldpc_orig.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so && \
+    echo "ldd on libtelnetsrv_ci" && ldd /usr/local/lib/libtelnetsrv_ci.so
+
+# Copy the relevant configuration files for gNB
+WORKDIR /opt/oai-gnb/etc
+COPY --from=gnb-build /oai-ran/docker/etc .
+
+WORKDIR /opt/oai-gnb
+#EXPOSE 2152/udp  # S1U, GTP/UDP
+#EXPOSE 22100/tcp # ?
+#EXPOSE 36412/udp # S1C, SCTP/UDP
+#EXPOSE 36422/udp # X2C, SCTP/UDP
+#EXPOSE 50000/udp # IF5 / ORI (control)
+#EXPOSE 50001/udp # IF5 / ECPRI (data)
+
+ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]

docker/Dockerfile.lteUE.rocky

@@ -0,0 +1,123 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS lte-ue-base
+
+FROM ran-build:latest AS lte-ue-build
+
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \
+    python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml && \
+    cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-lte-ue
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        lksctp-tools \
+        procps-ng \
+        tzdata \
+        atlas \
+        gdb \
+        python3 \
+        python3-pip \
+        iproute \
+        net-tools \
+        iputils && \
+    pip3 install six && \
+    pip3 install requests && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-lte-ue/bin
+COPY --from=lte-ue-build \
+    /oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    /oai-ran/cmake_targets/nas_sim_tools/build/conf2uedata \
+    /oai-ran/cmake_targets/nas_sim_tools/build/nvram \
+    /oai-ran/cmake_targets/nas_sim_tools/build/usim \
+    ./
+
+COPY --from=lte-ue-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /usr/local/lib/
+
+COPY --from=lte-ue-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/libboost_chrono.so.1.66.0 \
+    /lib64/libboost_date_time.so.1.66.0 \
+    /lib64/libboost_filesystem.so.1.66.0 \
+    /lib64/libboost_program_options.so.1.66.0 \
+    /lib64/libboost_serialization.so.1.66.0 \
+    /lib64/libboost_thread.so.1.66.0 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/libboost_unit_test_framework.so.1.66.0 \
+    /lib64/libboost_atomic.so.1.66.0 \
+    /lib64/libboost_timer.so.1.66.0 \
+    /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
+    /lib64/
+
+# Now we are copying from builder-image the UHD files.
+COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
+COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
+COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin
+
+WORKDIR /usr/local/share/uhd/rfnoc
+COPY --from=lte-ue-base /usr/local/share/uhd/rfnoc/ .
+
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
+    ldconfig && \
+    echo "ldd on lte-uesoftmodem" && ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \
+    echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on liboai_usrpdevif" && ldd /usr/local/lib/liboai_usrpdevif.so && \
+    echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so
+
+# Copy the relevant configuration files for UE
+WORKDIR /opt/oai-lte-ue/etc
+COPY --from=lte-ue-build /oai-ran/docker/etc .
+
+WORKDIR /opt/oai-lte-ue
+CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"]
+ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]

docker/Dockerfile.nr-cuup.rocky

@@ -0,0 +1,80 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS gnb-base
+
+FROM ran-build:latest AS gnb-build
+
+RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-nr-cuup
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        procps-ng \
+        lksctp-tools \
+        tzdata \
+        atlas \
+        net-tools \
+        iputils && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-gnb/bin
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/nr-cuup \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    ./
+
+COPY --from=gnb-build \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /usr/local/lib/
+
+COPY --from=gnb-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/
+
+RUN ldconfig && \
+    echo "ldd on nr-cuup" && ldd /opt/oai-gnb/bin/nr-cuup && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so
+
+WORKDIR /opt/oai-gnb/etc
+
+WORKDIR /opt/oai-gnb
+
+ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
+CMD ["/opt/oai-gnb/bin/nr-cuup", "-O", "/opt/oai-gnb/etc/gnb.conf"]

docker/Dockerfile.nrUE.rocky

@@ -0,0 +1,138 @@
+#/*
+# * 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
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface BUILD service
+#   Valid for Rocky 8.7
+#
+#---------------------------------------------------------------------
+
+ARG BASE_IMAGE=docker.io/rockylinux:8.7
+FROM ran-base:latest AS nr-ue-base
+
+FROM ran-build:latest AS nr-ue-build 
+
+RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_parameters.yaml && \
+    cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
+
+#start from scratch for target executable
+FROM $BASE_IMAGE as oai-nr-ue
+ENV TZ=Europe/Paris
+
+RUN dnf update -y && \
+    dnf install -y \
+        lksctp-tools \
+        procps-ng \
+        tzdata \
+        net-tools \
+        iputils \
+        iproute \
+        atlas \
+        gdb \
+        python3 \
+        python3-pip \
+        libXpm \
+        libX11 && \
+    pip3 install six && \
+    pip3 install requests && \
+    echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
+
+WORKDIR /opt/oai-nr-ue/bin
+COPY --from=nr-ue-build \
+    /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \
+    /oai-ran/docker/scripts/entrypoint.sh \
+    ./
+
+WORKDIR /opt/oai-nr-ue/etc
+COPY --from=nr-ue-build \
+    /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \
+    /oai-ran/docker/etc/nr-ue.nfapi.conf \
+    ./
+
+COPY --from=nr-ue-build \
+    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
+    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
+    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
+    /oai-ran/cmake_targets/ran_build/build/libcoding.so \
+    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
+    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
+    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_5Gue.so \
+    /usr/local/lib/
+
+COPY --from=nr-ue-base \
+    /lib64/libconfig.so.9 \
+    /lib64/libblas.so.3 \
+    /lib64/liblapack.so.3 \
+    /lib64/liblapacke.so.3 \
+    /lib64/libforms.so.2 \
+    /lib64/libboost_chrono.so.1.66.0 \
+    /lib64/libboost_date_time.so.1.66.0 \
+    /lib64/libboost_filesystem.so.1.66.0 \
+    /lib64/libboost_program_options.so.1.66.0 \
+    /lib64/libboost_serialization.so.1.66.0 \
+    /lib64/libboost_thread.so.1.66.0 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/libboost_unit_test_framework.so.1.66.0 \
+    /lib64/libboost_atomic.so.1.66.0 \
+    /lib64/libboost_timer.so.1.66.0 \
+    /lib64/libboost_regex.so.1.66.0 \
+    /lib64/libicudata.so.60 \
+    /lib64/libicui18n.so.60 \
+    /lib64/libicuuc.so.60 \
+    /lib64/
+
+# Now we are copying from builder-image the UHD files.
+COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
+COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64
+COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
+
+WORKDIR /usr/local/share/uhd/rfnoc
+COPY --from=nr-ue-base /usr/local/share/uhd/rfnoc/ .
+
+RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
+    ldconfig && \
+    echo "ldd on nr-uesoftmodem" && ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \
+    echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \
+    echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \
+    echo "ldd on liboai_usrpdevif" && ldd /usr/local/lib/liboai_usrpdevif.so && \
+    echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \
+    echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \
+    echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \
+    echo "ldd on libldpc" && ldd /usr/local/lib/libldpc.so && \
+    echo "ldd on libldpc_optim" && ldd /usr/local/lib/libldpc_optim.so && \
+    echo "ldd on libldpc_optim8seg" && ldd /usr/local/lib/libldpc_optim8seg.so && \
+    echo "ldd on libldpc_orig" && ldd /usr/local/lib/libldpc_orig.so && \
+    echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so && \
+    echo "ldd on libtelnetsrv_5Gue" && ldd /usr/local/lib/libtelnetsrv_5Gue.so
+
+# Copy the relevant configuration files for eNB
+WORKDIR /opt/oai-nr-ue/etc
+COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/ue.* .
+
+WORKDIR /opt/oai-nr-ue
+CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
+ENTRYPOINT ["/opt/oai-nr-ue/bin/entrypoint.sh"]

docker/Dockerfile.phySim.rhel8.2

@@ -38,7 +38,7 @@ RUN yum install -y libasan libubsan
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --phy_simulators --ninja --verbose-ci --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai --phy_simulators --ninja --verbose-ci --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror --cmake-opt -DCMAKE_C_FLAGS=-Wno-unused-function --cmake-opt -DCMAKE_CXX_FLAGS=-Wno-unused-function
 
 #start from scratch for target executable
 FROM registry.access.redhat.com/ubi8/ubi:latest as oai-physim

docker/README.md

@@ -77,6 +77,7 @@ The currently-supported OS are:
 
 - `rhel8.2` for Red Hat Entreprise Linux (including images for an OpenShift cluster)
 - `ubuntu20` for Ubuntu 20.04 LTS
+- `rocky` for Rocky-Linux 8.7
 
 For more details regarding the build on an Openshift Cluster, see [OpenShift README](../openshift/README.md).
 
@@ -111,6 +112,8 @@ ran-base            latest              5c9c02a5b4a8        1 minute ago
 ...
 ```
 
+Note that the steps are identical for `rocky-linux`.
+
 ## 3.3. Building any target image ##
 
 For example, the eNB:
@@ -136,6 +139,8 @@ Do not forget to remove the temporary image:
 docker image prune --force
 ```
 
+Note that the steps are identical for `rocky-linux`.
+
 # 4. Building using `podman` under Red Hat Entreprise Linux 8.2 #
 
 Analogous to the above steps:

executables/nr-cuup.c

@@ -111,7 +111,7 @@ f1ap_cudu_inst_t *getCxt(F1_t isCU, instance_t instanceP)
   return NULL;
 }
 
-void fill_DRB_configList(const protocol_ctxt_t *const ctxt_pP, rrc_gNB_ue_context_t *ue_context_pP)
+void fill_DRB_configList(const protocol_ctxt_t *const ctxt_pP, rrc_gNB_ue_context_t *ue_context_pP, uint8_t xid)
 {
   abort();
 }

executables/nr-gnb.c

@@ -195,7 +195,8 @@ void rx_func(void *param)
                            gNB->common_vars.rxdataF[aa],
                            slot_rx,
                            0,
-                           gNB->frame_parms.Ncp==EXTENDED?12:14);
+                           gNB->frame_parms.Ncp==EXTENDED?12:14,
+                           NR_LINK_TYPE_UL);
     }
     phy_procedures_gNB_uespec_RX(gNB, frame_rx, slot_rx);
   }

executables/nr-ue.c

@@ -33,6 +33,13 @@
 #include "executables/softmodem-common.h"
 #include "PHY/NR_REFSIG/refsig_defs_ue.h"
 #include "radio/COMMON/common_lib.h"
+#include "LAYER2/nr_pdcp/nr_pdcp_entity.h"
+#include "SCHED_NR_UE/pucch_uci_ue_nr.h"
+#include "openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h"
+#include "openair1/PHY/NR_REFSIG/sss_nr.h"
+#include "common/utils/nr/nr_common.h"
+//#define DEBUG_PHY_SL_PROC
+#include "pdcp.h"
 #include "LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
 
 /*
@@ -99,7 +106,8 @@
 typedef enum {
   pss = 0,
   pbch = 1,
-  si = 2
+  si = 2,
+  psbch = 3,
 } sync_mode_t;
 
 static void *NRUE_phy_stub_standalone_pnf_task(void *arg);
@@ -160,12 +168,13 @@ void init_nr_ue_vars(PHY_VARS_NR_UE *ue,
 
   // initialize all signal buffers
   init_nr_ue_signal(ue, nb_connected_gNB);
+  if (get_softmodem_params()->sl_mode != 2) {
+    // intialize transport
+    init_nr_ue_transport(ue);
 
-  // intialize transport
-  init_nr_ue_transport(ue);
-
-  // init N_TA offset
-  init_N_TA_offset(ue);
+    // init N_TA offset
+    init_N_TA_offset(ue);
+  }
 }
 
 void init_nrUE_standalone_thread(int ue_idx)
@@ -376,7 +385,12 @@ static void UE_synch(void *arg) {
   sync_mode_t sync_mode = pbch;
   //int CC_id = UE->CC_id;
   static int freq_offset=0;
-  UE->is_synchronized = 0;
+  if (get_softmodem_params()->sl_mode == 2) {
+    UE->is_synchronized_sl = 0;
+    sync_mode = psbch;
+  } else {
+    UE->is_synchronized = 0;
+  }
 
   if (UE->UE_scan == 0) {
 
@@ -392,7 +406,6 @@ static void UE_synch(void *arg) {
 
     }
 
-    sync_mode = pbch;
   } else {
     LOG_E(PHY,"Fixme!\n");
     /*
@@ -492,9 +505,44 @@ static void UE_synch(void *arg) {
       break;
 
     case si:
+
+    case psbch: {
+      int initial_synch_sl = nr_sl_initial_sync(&syncD->proc, UE, 2);
+      if (initial_synch_sl >= 0) { // gNB will work as SyncRef UE in simulation.
+
+        // rerun with new cell parameters and frequency-offset
+        freq_offset = UE->common_vars.freq_offset; // frequency offset computed with pss in initial sync
+        nr_sl_rf_card_config_freq(UE, &openair0_cfg[UE->rf_map.card], freq_offset);
+        UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0]);
+
+        if (UE->UE_scan_carrier == 1) {
+          UE->UE_scan_carrier = 0;
+        } else {
+          if (initial_synch_sl == 0) {
+            UE->is_synchronized_sl = 1;
+            LOG_I(NR_PHY, "SyncRef UE found with Nid1 %d and Nid2 %d SSS-RSRP %d dBm/RE\n",
+                  GET_NID1_SL(UE->frame_parms.Nid_SL), GET_NID2_SL(UE->frame_parms.Nid_SL),
+                  UE->measurements.ssb_rsrp_dBm[0]);
+            exit(1);
+          }
+        }
+      } else {
+        LOG_I(NR_PHY, "No SyncRef UE found\n");
+        if (UE->UE_scan_carrier == 1) {
+          LOG_I(PHY, "Initial sync failed: trying carrier off %d Hz\n", freq_offset);
+
+          if (freq_offset >= 0)
+            freq_offset += 100;
+          freq_offset *= -1;
+          nr_sl_rf_card_config_freq(UE, &openair0_cfg[UE->rf_map.card], freq_offset);
+          UE->rfdevice.trx_set_freq_func(&UE->rfdevice, &openair0_cfg[0]);
+        }
+      }
+      break;
+    }
+
     default:
       break;
-
   }
 }
 
@@ -561,6 +609,8 @@ void processSlotTX(void *arg) {
   nr_phy_data_tx_t phy_data = {0};
 
   LOG_D(PHY,"%d.%d => slot type %d\n", proc->frame_tx, proc->nr_slot_tx, proc->tx_slot_type);
+  if (UE->sync_ref && get_softmodem_params()->sl_mode != 0)
+    proc->tx_slot_type = NR_UPLINK_SLOT;
   if (proc->tx_slot_type == NR_UPLINK_SLOT || proc->tx_slot_type == NR_MIXED_SLOT){
 
     // wait for rx slots to send indication (if any) that DLSCH decoding is finished
@@ -571,7 +621,7 @@ void processSlotTX(void *arg) {
 
     // trigger L2 to run ue_scheduler thru IF module
     // [TODO] mapping right after NR initial sync
-    if(UE->if_inst != NULL && UE->if_inst->ul_indication != NULL) {
+    if (get_softmodem_params()->sl_mode != 2 && UE->if_inst != NULL && UE->if_inst->ul_indication != NULL) {
       start_meas(&UE->ue_ul_indication_stats);
       nr_uplink_indication_t ul_indication;
       memset((void*)&ul_indication, 0, sizeof(ul_indication));
@@ -589,10 +639,20 @@ void processSlotTX(void *arg) {
       stop_meas(&UE->ue_ul_indication_stats);
     }
 
-    phy_procedures_nrUE_TX(UE, proc, &phy_data);
+    if (get_softmodem_params()->sl_mode == 0) {
+      phy_procedures_nrUE_TX(UE, proc, &phy_data);
+    } else {
+      phy_procedures_nrUE_SL_TX(UE, proc, 0);
+    }
   }
+  if (get_softmodem_params()->sl_mode == 0) {
+    RU_write(rxtxD);
+  }
+}
 
-  RU_write(rxtxD);
+void processSlotRX_SL(void *arg) {
+  nr_rxtx_thread_data_t *rxtxD = (nr_rxtx_thread_data_t *) arg;
+  processSlotTX(rxtxD);
 }
 
 nr_phy_data_t UE_dl_preprocessing(PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
@@ -703,11 +763,11 @@ void readFrame(PHY_VARS_NR_UE *UE,  openair0_timestamp *timestamp, bool toTrash)
 
 void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
 
-    LOG_I(PHY,"Resynchronizing RX by %d samples\n",UE->rx_offset);
+    int rx_offset = (get_softmodem_params()->sl_mode != 0) ? UE->rx_offset_sl : UE->rx_offset;
 
     if (IS_SOFTMODEM_IQPLAYER || IS_SOFTMODEM_IQRECORDER) {
       // Resynchonize by slot (will work with numerology 1 only)
-      for ( int size=UE->rx_offset ; size > 0 ; size -= UE->frame_parms.samples_per_subframe/2 ) {
+      for (int size = rx_offset; size > 0; size -= UE->frame_parms.samples_per_subframe / 2) {
 	int unitTransfer=size>UE->frame_parms.samples_per_subframe/2 ? UE->frame_parms.samples_per_subframe/2 : size ;
 	AssertFatal(unitTransfer ==
 		    UE->rfdevice.trx_read_func(&UE->rfdevice,
@@ -718,11 +778,11 @@ void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
       }
     } else {
       *timestamp += UE->frame_parms.get_samples_per_slot(1,&UE->frame_parms);
-      for ( int size=UE->rx_offset ; size > 0 ; size -= UE->frame_parms.samples_per_subframe ) {
+      for (int size = rx_offset; size > 0; size -= UE->frame_parms.samples_per_subframe) {
 	int unitTransfer=size>UE->frame_parms.samples_per_subframe ? UE->frame_parms.samples_per_subframe : size ;
 	// we write before read because gNB waits for UE to write and both executions halt
 	// this happens here as the read size is samples_per_subframe which is very much larger than samp_per_slot
-	if (IS_SOFTMODEM_RFSIM) dummyWrite(UE,*timestamp, unitTransfer);
+        if (IS_SOFTMODEM_RFSIM) dummyWrite(UE,*timestamp, unitTransfer); 
 	AssertFatal(unitTransfer ==
 		    UE->rfdevice.trx_read_func(&UE->rfdevice,
 					       timestamp,
@@ -738,28 +798,305 @@ int computeSamplesShift(PHY_VARS_NR_UE *UE) {
   int samples_shift = -(UE->rx_offset>>1);
   if (samples_shift != 0) {
     LOG_I(NR_PHY,"Adjusting frame in time by %i samples\n", samples_shift);
-    UE->rx_offset = 0; // reset so that it is not applied falsely in case of SSB being only in every second frame
+    if (get_softmodem_params()->sl_mode == 0) {
+      UE->rx_offset = 0; // reset so that it is not applied falsely in case of SSB being only in every second frame
+    } else {
+      UE->rx_offset_sl = 0; // reset so that it is not applied falsely in case of SSB being only in every second frame
+    }
     UE->max_pos_fil += samples_shift << 15; // reset IIR filter when sample shift is applied
   }
   return samples_shift;
 }
 
-static inline int get_firstSymSamp(uint16_t slot, NR_DL_FRAME_PARMS *fp) {
+static inline int get_firstSymSamp(uint16_t slot, NR_DL_FRAME_PARMS *fp, bool sync) {
+  uint16_t nb_prefix_samples0 = fp->nb_prefix_samples0;
+  if (get_softmodem_params()->sl_mode != 0) {
+    nb_prefix_samples0 = sync ? fp->nb_prefix_samples0 : fp->nb_prefix_samples;
+  }
   if (fp->numerology_index == 0)
     return fp->nb_prefix_samples0 + fp->ofdm_symbol_size;
-  int num_samples = (slot%(fp->slots_per_subframe/2)) ? fp->nb_prefix_samples : fp->nb_prefix_samples0;
+  int num_samples = (slot % (fp->slots_per_subframe / 2)) ? fp->nb_prefix_samples : nb_prefix_samples0;
   num_samples += fp->ofdm_symbol_size;
   return num_samples;
 }
 
-static inline int get_readBlockSize(uint16_t slot, NR_DL_FRAME_PARMS *fp) {
-  int rem_samples = fp->get_samples_per_slot(slot, fp) - get_firstSymSamp(slot, fp);
+static inline int get_readBlockSize(uint16_t slot, NR_DL_FRAME_PARMS *fp, bool sync) {
+  int rem_samples = fp->get_samples_per_slot(slot, fp) - get_firstSymSamp(slot, fp, sync);
   int next_slot_first_symbol = 0;
   if (slot < (fp->slots_per_frame-1))
-    next_slot_first_symbol = get_firstSymSamp(slot+1, fp);
+    next_slot_first_symbol = get_firstSymSamp(slot+1, fp, sync);
   return rem_samples + next_slot_first_symbol;
 }
 
+int slot_to_flag_sl(uint8_t tdd_period, int slot, uint16_t slot_config, uint16_t num_slot_frame) {
+  int flag, isUL, isULnext, isULbefore;
+  int num_period_slot = get_nb_periods_per_frame(tdd_period);
+  slot = slot % (num_slot_frame / num_period_slot);
+  isUL = (slot_config >> slot) & 0x1;// indicator to show if the slot is UL or DL
+
+  if (slot > 0) {
+    //checking if previous slot is UL
+    isULbefore = (slot_config >> (slot - 1)) & 0x1;
+  } else {
+    isULbefore = 0;
+  }
+  if (slot < (num_slot_frame / num_period_slot) - 1) {
+    // checking if next slot is UL
+    isULnext = (slot_config >> (slot+1)) & 0x1;
+  } else {
+    isULnext = 0;
+  }
+
+  if (isUL) {
+    if (slot == 0 || !isULbefore) {
+      flag = 2; // first slot should start transmission
+    } else if (slot == (num_slot_frame / num_period_slot) - 1 || !isULnext) {
+      flag = 3; // last slot that should stop transmission
+    } else {
+      flag = 1; // it is niether first nor last slot.
+    }
+  } else {
+    flag = 0; // don't transmit at all
+  }
+  LOG_D(NR_PHY, "### slot(%d), UL(%d), flag(%d)\n", slot, isUL, flag);
+  return flag;
+}
+
+void *UE_thread_SL(void *arg) {
+  PHY_VARS_NR_UE *UE = (PHY_VARS_NR_UE *) arg;
+  openair0_timestamp timestamp, writeTimestamp;
+  void *rxp[NB_ANTENNAS_RX], *txp[NB_ANTENNAS_TX];
+  AssertFatal(0 == openair0_device_load(&(UE->rfdevice), &openair0_cfg[0]), "");
+  UE->rfdevice.host_type = RAU_HOST;
+  AssertFatal(UE->rfdevice.trx_start_func(&UE->rfdevice) == 0, "Could not start the device\n");
+
+  notifiedFIFO_t nf;
+  initNotifiedFIFO(&nf);
+  notifiedFIFO_t freeBlocks;
+  initNotifiedFIFO_nothreadSafe(&freeBlocks);
+  int nbSlotProcessing = 0;
+
+  NR_UE_MAC_INST_t *mac = get_mac_inst(0);
+  int timing_advance = UE->timing_advance;
+
+  UE->lost_sync_sl = 0;
+  UE->is_synchronized_sl = 0;
+  UE->sync_ref = get_softmodem_params()->sync_ref;
+  bool sync_running_sl = false;
+  const int nb_slot_frame = UE->frame_parms.slots_per_frame;
+  int absolute_slot = 0, decoded_frame_rx = INT_MAX, trashed_frames = 0, start_rx_stream = 0;
+
+  for (int i = 0; i < NR_RX_NB_TH + 1; i++) {// NR_RX_NB_TH working + 1 we are making to be pushed
+    notifiedFIFO_elt_t *newElt = newNotifiedFIFO_elt(sizeof(nr_rxtx_thread_data_t), RX_JOB_ID, &nf, processSlotRX_SL);
+    nr_rxtx_thread_data_t *curMsg=(nr_rxtx_thread_data_t *)NotifiedFifoData(newElt);
+    initNotifiedFIFO(&curMsg->txFifo);
+    pushNotifiedFIFO_nothreadSafe(&freeBlocks, newElt);
+  }
+
+  while (!oai_exit) {
+    if (UE->lost_sync_sl && UE->sync_ref == 0) {
+      LOG_I(NR_PHY, "Sync UE: lost_sync status\n");
+      int nb = abortTpoolJob(&(get_nrUE_params()->Tpool),RX_JOB_ID);
+      nb += abortNotifiedFIFOJob(&nf, RX_JOB_ID);
+      LOG_I(PHY,"Number of aborted slots %d\n",nb);
+      for (int i=0; i<nb; i++)
+        pushNotifiedFIFO_nothreadSafe(&freeBlocks, newNotifiedFIFO_elt(sizeof(nr_rxtx_thread_data_t), RX_JOB_ID, &nf, processSlotRX_SL));
+      nbSlotProcessing = 0;
+      UE->is_synchronized_sl = 0;
+      UE->lost_sync_sl = 0;
+    }
+
+    if (sync_running_sl && UE->sync_ref == 0) {
+      LOG_I(NR_PHY, "Nearby UE: sync_running status.\n");
+      notifiedFIFO_elt_t *res=tryPullTpool(&nf,&(get_nrUE_params()->Tpool));
+      if (res) {
+        sync_running_sl = false;
+        LOG_I(NR_PHY, "Nearby UE: sync_running was set to false due to valid res.\n");
+        syncData_t *tmp=(syncData_t *)NotifiedFifoData(res);
+        LOG_I(NR_PHY, "Nearby UE: UE->is_synchronized_sl = %d\n", UE->is_synchronized_sl);
+        if (UE->is_synchronized_sl && get_softmodem_params()->sl_mode < 2) {
+          decoded_frame_rx=(((mac->mib->systemFrameNumber.buf[0] >> mac->mib->systemFrameNumber.bits_unused)<<4) | tmp->proc.decoded_frame_rx);
+          // shift the frame index with all the frames we trashed meanwhile we perform the synch search
+          decoded_frame_rx=(decoded_frame_rx + UE->init_sync_frame + trashed_frames) % MAX_FRAME_NUMBER;
+        }
+        delNotifiedFIFO_elt(res);
+        start_rx_stream = 0;
+      } else {
+        LOG_I(PHY, "Nearby UE: sync_running_sl still in readFrame due to INVALID res.\n");
+        readFrame(UE, &timestamp, true);
+        trashed_frames += 2;
+        continue;
+      }
+    }
+
+    AssertFatal(!sync_running_sl, "At this point synchronization can't be running\n");
+
+    if (UE->is_synchronized_sl == 0 && UE->sync_ref == 0) {
+      LOG_I(NR_PHY, "Sync UE: UE->is_synchronized_sl == 0 && UE->sync_ref == 0)\n");
+      readFrame(UE, &timestamp, false);
+      notifiedFIFO_elt_t *Msg=newNotifiedFIFO_elt(sizeof(syncData_t), 0, &nf, UE_synch);
+      syncData_t *syncMsg = (syncData_t *)NotifiedFifoData(Msg);
+      syncMsg->UE = UE;
+      memset(&syncMsg->proc, 0, sizeof(syncMsg->proc));
+      pushTpool(&(get_nrUE_params()->Tpool), Msg);
+      trashed_frames=0;
+      sync_running_sl =true;
+      continue;
+    }
+
+    if (start_rx_stream == 0 && UE->sync_ref == 0) {
+      start_rx_stream = 1;
+      syncInFrame(UE, &timestamp);
+      LOG_I(NR_PHY, "Sync UE: rx_stream = 1 and timestamp %ld\n", timestamp);
+      UE->rx_offset_sl = 0;
+      UE->time_sync_cell = 0;
+      uint16_t nb_prefix_samples0 = UE->is_synchronized_sl ? UE->frame_parms.nb_prefix_samples0 :
+                                                             UE->frame_parms.nb_prefix_samples;
+      AssertFatal (UE->frame_parms.ofdm_symbol_size + nb_prefix_samples0 ==
+                   UE->rfdevice.trx_read_func(&UE->rfdevice,
+                                              &timestamp,
+                                              (void **)UE->common_vars.rxdata,
+                                              UE->frame_parms.ofdm_symbol_size + nb_prefix_samples0,
+                                              UE->frame_parms.nb_antennas_rx), "Could not read in first symbol");
+      // we have the decoded frame index in the return of the synch process
+      // and we shifted above to the first slot of next frame
+      decoded_frame_rx++;
+      // we do ++ first in the regular processing, so it will be begin of frame;
+      absolute_slot = decoded_frame_rx * nb_slot_frame - 1;
+      continue;
+    }
+
+
+    absolute_slot++;
+    // Fix me: will be wrong when slot 1 is slow, as slot 2 finishes
+    // Slot 3 will overlap if NR_RX_NB_TH is 2
+    // this is general failure in UE !!
+    int slot_nr = absolute_slot % nb_slot_frame;
+
+    notifiedFIFO_elt_t *msgToPush;
+    AssertFatal((msgToPush=pullNotifiedFIFO_nothreadSafe(&freeBlocks)) != NULL,"chained list failure");
+    nr_rxtx_thread_data_t *curMsg=(nr_rxtx_thread_data_t *)NotifiedFifoData(msgToPush);
+    curMsg->UE = UE;
+    // update thread index for received subframe
+    curMsg->proc.CC_id       = UE->CC_id;
+    curMsg->proc.nr_slot_rx  = slot_nr;
+    curMsg->proc.nr_slot_tx  = (absolute_slot + DURATION_RX_TO_TX) % nb_slot_frame;
+    curMsg->proc.frame_rx    = (absolute_slot/nb_slot_frame) % MAX_FRAME_NUMBER;
+    curMsg->proc.frame_tx    = ((absolute_slot+DURATION_RX_TO_TX)/nb_slot_frame) % MAX_FRAME_NUMBER;
+    curMsg->proc.decoded_frame_rx=-1;
+    LOG_D(NR_PHY, "Process slot %d total gain %d\n", slot_nr, UE->rx_total_gain_dB);
+
+    int firstSymSamp = get_firstSymSamp(slot_nr, &UE->frame_parms, UE->is_synchronized_sl);
+    uint64_t write_time_stamp = UE->frame_parms.get_samples_slot_timestamp(slot_nr, &UE->frame_parms, 0);
+    uint64_t read_time_stamp = UE->frame_parms.get_samples_slot_timestamp(slot_nr, &UE->frame_parms, 0);
+    for (int i = 0; i<UE->frame_parms.nb_antennas_rx; i++)
+      rxp[i] = (void *)&UE->common_vars.rxdata[i][read_time_stamp];
+    for (int i = 0; i < UE->frame_parms.nb_antennas_tx; i++)
+      txp[i] = (void *)&UE->common_vars.txdata[i][write_time_stamp];
+
+    int readBlockSize, writeBlockSize;
+    if (slot_nr < (nb_slot_frame - 1)) {
+      readBlockSize = get_readBlockSize(slot_nr, &UE->frame_parms, UE->is_synchronized_sl);
+      writeBlockSize = UE->frame_parms.get_samples_per_slot(slot_nr, &UE->frame_parms);
+    } else {
+      UE->rx_offset_diff = computeSamplesShift(UE);
+      readBlockSize = get_readBlockSize(slot_nr, &UE->frame_parms, UE->is_synchronized_sl) - UE->rx_offset_diff;
+      writeBlockSize = UE->frame_parms.get_samples_per_slot(slot_nr, &UE->frame_parms) - UE->rx_offset_diff;
+    }
+
+    AssertFatal(readBlockSize ==
+                UE->rfdevice.trx_read_func(&UE->rfdevice,
+                                           &timestamp,
+                                           rxp,
+                                           readBlockSize,
+                                           UE->frame_parms.nb_antennas_rx), "");
+
+    if (slot_nr == (nb_slot_frame - 1)) {
+      // read in first symbol of next frame and adjust for timing drift
+      uint16_t nb_prefix_samples0 = UE->is_synchronized_sl ? UE->frame_parms.nb_prefix_samples0 :
+                                                             UE->frame_parms.nb_prefix_samples;
+      int first_symbols = UE->frame_parms.ofdm_symbol_size + nb_prefix_samples0;
+      if (first_symbols > 0) {
+        openair0_timestamp ignore_timestamp;
+        AssertFatal(first_symbols ==
+                    UE->rfdevice.trx_read_func(&UE->rfdevice,
+                                               &ignore_timestamp,
+                                               (void **)UE->common_vars.rxdata,
+                                               first_symbols,
+                                               UE->frame_parms.nb_antennas_rx),"");
+      } else {
+        LOG_E(NR_PHY, "Can't compensate: diff =%d\n", first_symbols);
+      }
+    }
+
+    curMsg->proc.timestamp_tx = timestamp +
+                                UE->frame_parms.get_samples_slot_timestamp(slot_nr, &UE->frame_parms, DURATION_RX_TO_TX) -
+                                firstSymSamp;
+
+    while (nbSlotProcessing >= NR_RX_NB_TH) {
+      notifiedFIFO_elt_t *res = pullTpool(&nf, &(get_nrUE_params()->Tpool));
+      if (res == NULL)
+        break; // Tpool has been stopped
+      nbSlotProcessing--;
+      nr_rxtx_thread_data_t *tmp = (nr_rxtx_thread_data_t *)res->msgData;
+      if (tmp->proc.decoded_frame_rx != -1)
+        decoded_frame_rx=(((mac->mib->systemFrameNumber.buf[0] >>
+                            mac->mib->systemFrameNumber.bits_unused) << 4) |
+                          tmp->proc.decoded_frame_rx);
+      else
+         decoded_frame_rx=-1;
+      pushNotifiedFIFO_nothreadSafe(&freeBlocks,res);
+    }
+
+    if (UE->sync_ref == 0 && decoded_frame_rx > 0 && decoded_frame_rx != curMsg->proc.frame_rx)
+      LOG_E(NR_PHY, "Sync UE: Decoded frame index (%d) is not compatible with current context (%d), "
+                    "UE should go back to synch mode\n", decoded_frame_rx, curMsg->proc.frame_rx);
+
+    // use previous timing_advance value to compute writeTimestamp
+    writeTimestamp = timestamp +
+                     UE->frame_parms.get_samples_slot_timestamp(slot_nr, &UE->frame_parms, DURATION_RX_TO_TX - NR_RX_NB_TH) -
+                     firstSymSamp - openair0_cfg[0].tx_sample_advance - UE->N_TA_offset - timing_advance;
+
+    // but use current UE->timing_advance value to compute writeBlockSize
+    if (UE->timing_advance != timing_advance) {
+      writeBlockSize -= UE->timing_advance - timing_advance;
+      timing_advance = UE->timing_advance;
+    }
+
+    int flags = 1;
+    NR_DL_FRAME_PARMS *fp = &UE->frame_parms;
+    flags = slot_to_flag_sl(fp->tdd_period, slot_nr, fp->tdd_slot_config, fp->slots_per_frame);
+
+    if (flags || IS_SOFTMODEM_RFSIM) {
+      LOG_D(NR_PHY, "current slot goring to write USRP: %d\n", slot_nr);
+      AssertFatal(writeBlockSize ==
+                  UE->rfdevice.trx_write_func(&UE->rfdevice,
+                                              writeTimestamp,
+                                              txp,
+                                              writeBlockSize,
+                                              UE->frame_parms.nb_antennas_tx,
+                                              flags), "");
+    }
+#ifdef DEBUG_PHY_SL_PROC
+    char buffer[UE->frame_parms.ofdm_symbol_size];
+    for (int i = 0; i < 13; i++) {
+      bzero(buffer, sizeof(buffer));
+      LOG_I(NR_PHY, "Transmitted SSB %d = %s\n",
+            i, hexdump(&txp[0][UE->frame_parms.ofdm_symbol_size*i],
+            UE->frame_parms.ofdm_symbol_size, buffer, sizeof(buffer)));
+    }
+#endif
+    for (int i = 0; i < UE->frame_parms.nb_antennas_tx; i++) {
+      memset(txp[i], 0, writeBlockSize);
+    }
+    nbSlotProcessing++;
+    LOG_D(NR_PHY, "Number of slots being processed at the moment: %d\n", nbSlotProcessing);
+    pushTpool(&(get_nrUE_params()->Tpool), msgToPush);
+  } // while !oai_exit
+
+  return NULL;
+}
+
 void *UE_thread(void *arg) {
   //this thread should be over the processing thread to keep in real time
   PHY_VARS_NR_UE *UE = (PHY_VARS_NR_UE *) arg;
@@ -897,7 +1234,7 @@ void *UE_thread(void *arg) {
     }*/
 #endif
 
-    int firstSymSamp = get_firstSymSamp(slot_nr, &UE->frame_parms);
+    int firstSymSamp = get_firstSymSamp(slot_nr, &UE->frame_parms, UE->is_synchronized);
     for (int i=0; i<UE->frame_parms.nb_antennas_rx; i++)
       rxp[i] = (void *)&UE->common_vars.rxdata[i][firstSymSamp+
                UE->frame_parms.get_samples_slot_timestamp(slot_nr,&UE->frame_parms,0)];
@@ -905,11 +1242,11 @@ void *UE_thread(void *arg) {
     int readBlockSize, writeBlockSize;
 
     if (slot_nr<(nb_slot_frame - 1)) {
-      readBlockSize=get_readBlockSize(slot_nr, &UE->frame_parms);
+      readBlockSize=get_readBlockSize(slot_nr, &UE->frame_parms, UE->is_synchronized);
       writeBlockSize=UE->frame_parms.get_samples_per_slot((slot_nr + DURATION_RX_TO_TX) % nb_slot_frame, &UE->frame_parms);
     } else {
       UE->rx_offset_diff = computeSamplesShift(UE);
-      readBlockSize=get_readBlockSize(slot_nr, &UE->frame_parms) -
+      readBlockSize=get_readBlockSize(slot_nr, &UE->frame_parms, UE->is_synchronized) -
                     UE->rx_offset_diff;
       writeBlockSize=UE->frame_parms.get_samples_per_slot((slot_nr + DURATION_RX_TO_TX) % nb_slot_frame, &UE->frame_parms)- UE->rx_offset_diff;
     }
@@ -1004,18 +1341,27 @@ void init_NR_UE(int nb_inst,
 }
 
 void init_NR_UE_threads(int nb_inst) {
-  int inst;
-
   pthread_t threads[nb_inst];
+  pthread_t threadsSL[nb_inst];
 
-  for (inst=0; inst < nb_inst; inst++) {
+  for (int inst = 0; inst < nb_inst; inst++) {
     PHY_VARS_NR_UE *UE = PHY_vars_UE_g[inst][0];
 
-    LOG_I(PHY,"Intializing UE Threads for instance %d (%p,%p)...\n",inst,PHY_vars_UE_g[inst],PHY_vars_UE_g[inst][0]);
-    threadCreate(&threads[inst], UE_thread, (void *)UE, "UEthread", -1, OAI_PRIORITY_RT_MAX);
-    if (!IS_SOFTMODEM_NOSTATS_BIT) {
-      pthread_t stat_pthread;
-      threadCreate(&stat_pthread, nrL1_UE_stats_thread, UE, "L1_UE_stats", -1, OAI_PRIORITY_RT_LOW);
+    if (get_softmodem_params()->sl_mode == 0) {
+      LOG_I(NR_PHY, "Intializing UE Threads for instance %d (%p,%p)...\n", inst, PHY_vars_UE_g[inst], PHY_vars_UE_g[inst][0]);
+      threadCreate(&threads[inst], UE_thread, (void *)UE, "UEthread", -1, OAI_PRIORITY_RT_MAX);
+      if (!IS_SOFTMODEM_NOSTATS_BIT) {
+        pthread_t stat_pthread;
+        threadCreate(&stat_pthread, nrL1_UE_stats_thread, UE, "L1_UE_stats", -1, OAI_PRIORITY_RT_LOW);
+      }
+    }
+    else if (get_softmodem_params()->sl_mode == 2) {
+      LOG_I(NR_PHY, "Intializing Sidelink UE Threads for instance %d (%p,%p)...\n", inst, PHY_vars_UE_g[inst], PHY_vars_UE_g[inst][0]);
+      threadCreate(&threadsSL[inst], UE_thread_SL, (void *)UE, "UEthreadSL", -1, OAI_PRIORITY_RT_MAX);
+    }
+    else {
+      LOG_I(NR_PHY,"Need implementation...\n");
+      abort();
     }
   }
 }

executables/nr-uesoftmodem.c

@@ -86,6 +86,7 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "nr_nas_msg_sim.h"
 #include <openair1/PHY/MODULATION/nr_modulation.h>
 #include "openair2/GNB_APP/gnb_paramdef.h"
+#include <openair1/PHY/NR_REFSIG/sss_nr.h>
 
 extern const char *duplex_mode[];
 THREAD_STRUCT thread_struct;
@@ -128,6 +129,7 @@ int               dumpframe = 0;
 
 uint64_t        downlink_frequency[MAX_NUM_CCs][4];
 int32_t         uplink_frequency_offset[MAX_NUM_CCs][4];
+uint64_t        sidelink_frequency[MAX_NUM_CCs][4];
 int             rx_input_level_dBm;
 
 #if MAX_NUM_CCs == 1
@@ -143,7 +145,6 @@ double rx_gain[MAX_NUM_CCs][4] = {{110,0,0,0},{20,0,0,0}};
 // UE and OAI config variables
 
 openair0_config_t openair0_cfg[MAX_CARDS];
-int16_t           node_synch_ref[MAX_NUM_CCs];
 int               otg_enabled;
 double            cpuf;
 
@@ -163,6 +164,7 @@ uint32_t       N_RB_DL    = 106;
 uint8_t abstraction_flag=0;
 
 nr_bler_struct nr_bler_data[NR_NUM_MCS];
+nr_bler_struct nr_mimo_bler_data[NR_NUM_MCS];
 
 static void init_bler_table(char*);
 
@@ -259,6 +261,81 @@ nrUE_params_t *get_nrUE_params(void) {
   return &nrUE_params;
 }
 
+static void nr_phy_config_request_sl(PHY_VARS_NR_UE *ue,
+                                     int N_RB_DL,
+                                     int N_RB_UL,
+                                     int CC_id)
+{
+  uint64_t rev_burst = 0;
+  uint64_t SSB_positions = 0x01;
+  int mu = 1;
+  uint8_t n_tx = 1;
+  uint8_t n_rx = 1;
+  uint16_t Nid_cell = 0;
+  int ssb_subcarrier_offset = 0;
+  for (int i = 0; i < 64; i++)
+    rev_burst |= (((SSB_positions >> (63-i))&0x01) << i);
+
+  NR_DL_FRAME_PARMS *fp                                  = &ue->frame_parms;
+  fapi_nr_config_request_t *nrUE_config                  = &ue->nrUE_config;
+  nrUE_config->cell_config.phy_cell_id                   = get_softmodem_params()->nid1 + get_softmodem_params()->nid2 * NUMBER_SSS_SEQUENCE;
+  nrUE_config->ssb_config.scs_common                     = mu;
+  nrUE_config->ssb_table.ssb_subcarrier_offset           = 0;
+  nrUE_config->ssb_table.ssb_offset_point_a              = 0;
+  nrUE_config->ssb_table.ssb_mask_list[1].ssb_mask       = (rev_burst)&(0xFFFFFFFF);
+  nrUE_config->ssb_table.ssb_mask_list[0].ssb_mask       = (rev_burst>>32)&(0xFFFFFFFF);
+  nrUE_config->cell_config.frame_duplex_type             = TDD;
+  nrUE_config->ssb_table.ssb_period                      = 1; //10ms
+  nrUE_config->carrier_config.dl_grid_size[mu]           = N_RB_DL;
+  nrUE_config->carrier_config.ul_grid_size[mu]           = N_RB_UL;
+  nrUE_config->carrier_config.num_tx_ant                 = fp->nb_antennas_tx;
+  nrUE_config->carrier_config.num_rx_ant                 = fp->nb_antennas_rx;
+  nrUE_config->tdd_table.tdd_period                      = 0;
+  nrUE_config->carrier_config.dl_frequency               = downlink_frequency[CC_id][0] / 1000;
+  nrUE_config->carrier_config.uplink_frequency           = downlink_frequency[CC_id][0] / 1000;
+  nrUE_config->carrier_config.sl_frequency               = sidelink_frequency[CC_id][0] / 1000;
+  LOG_D(NR_PHY, "SL Frequency %u\n", nrUE_config->carrier_config.sl_frequency);
+  fp->tdd_period                                         = 6; // 6 indicates 5ms (see get_nb_periods_per_frame())
+  fp->tdd_slot_config                                    = 0b0000111111; // 1 -> UL, 0-> DL for each slot , LSB is the slot 0
+  fp->dl_CarrierFreq                                     = 2600000000;
+  fp->ul_CarrierFreq                                     = 2600000000;
+  fp->nb_antennas_tx = n_tx;
+  fp->nb_antennas_rx = n_rx;
+  fp->nb_antenna_ports_gNB = n_tx;
+  fp->N_RB_DL = N_RB_DL;
+  fp->Nid_cell = Nid_cell;
+  fp->Nid_SL = get_softmodem_params()->nid1 + get_softmodem_params()->nid2 * NUMBER_SSS_SEQUENCE;;
+  fp->nushift = 0; //No nushift in SL
+  fp->ssb_type = nr_ssb_type_C; //Note: case c for NR SL???
+  fp->freq_range = mu < 2 ? nr_FR1 : nr_FR2;
+  fp->nr_band = get_softmodem_params()->band; //Note: NR SL uses for n38 and n47
+  fp->threequarter_fs = 0;
+  fp->ofdm_offset_divisor = UINT_MAX;
+  fp->first_carrier_offset = 0;
+  fp->ssb_start_subcarrier = 12 * ue->nrUE_config.ssb_table.ssb_offset_point_a + ssb_subcarrier_offset;
+  int bw_index = get_supported_band_index(mu, fp->nr_band, N_RB_DL);
+  nrUE_config->carrier_config.dl_bandwidth = get_supported_bw_mhz(fp->nr_band > 256 ? FR2 : FR1, bw_index);
+
+  ue->slss = calloc(1, sizeof(*ue->slss));
+  int len = sizeof(ue->slss->sl_mib) / sizeof(ue->slss->sl_mib[0]);
+  for (int i = 0; i < len; i++) {
+    ue->slss->sl_mib[i] = 0;
+  }
+  ue->slss->sl_mib_length = 32;
+  ue->slss->sl_numssb_withinperiod_r16 = 16;
+  ue->slss->sl_timeinterval_r16 = 20;
+  ue->slss->sl_timeoffsetssb_r16 = 0;
+  ue->slss->sl_numssb_withinperiod_r16_copy = 16;
+  ue->slss->sl_timeinterval_r16_copy = 20;
+  ue->slss->sl_timeoffsetssb_r16_copy = 0;
+  ue->slss->slss_id = get_softmodem_params()->nid1 + get_softmodem_params()->nid2 * NUMBER_SSS_SEQUENCE;;
+  ue->is_synchronized_sl = 0;
+  ue->UE_fo_compensation = 0;
+  ue->sync_ref = get_softmodem_params()->sync_ref;
+  LOG_I(NR_PHY, "nrUE configured\n");
+}
+
+
 static void get_options(void) {
 
   paramdef_t cmdline_params[] =CMDLINE_NRUEPARAMS_DESC ;
@@ -321,7 +398,7 @@ void init_openair0(void) {
   NR_DL_FRAME_PARMS *frame_parms = &PHY_vars_UE_g[0][0]->frame_parms;
 
   for (card=0; card<MAX_CARDS; card++) {
-    uint64_t dl_carrier, ul_carrier;
+    uint64_t dl_carrier, ul_carrier, sl_carrier;
     openair0_cfg[card].configFilename    = NULL;
     openair0_cfg[card].threequarter_fs   = frame_parms->threequarter_fs;
     openair0_cfg[card].sample_rate       = frame_parms->samples_per_subframe * 1e3;
@@ -348,8 +425,15 @@ void init_openair0(void) {
       duplex_mode[openair0_cfg[card].duplex_mode]);
 
     nr_get_carrier_frequencies(PHY_vars_UE_g[0][0], &dl_carrier, &ul_carrier);
-
+    LOG_I(NR_PHY,"Configuring SL carrier for %llu Hz \n",sl_carrier);
     nr_rf_card_config_freq(&openair0_cfg[card], ul_carrier, dl_carrier, freq_off);
+
+    if (get_softmodem_params()->sl_mode != 0) {
+      nr_get_carrier_frequencies_sl(PHY_vars_UE_g[0][0], &sl_carrier);
+      LOG_I(NR_PHY,"Configuring SL carrier for %llu Hz \n",sl_carrier);
+      nr_rf_card_config_freq(&openair0_cfg[card], sl_carrier, sl_carrier, freq_off);
+    }
+
     nr_rf_card_config_gain(&openair0_cfg[card], rx_gain_off);
 
     openair0_cfg[card].configFilename = get_softmodem_params()->rf_config_file;
@@ -508,8 +592,14 @@ int main( int argc, char **argv ) {
 
       set_options(CC_id, UE[CC_id]);
       NR_UE_MAC_INST_t *mac = get_mac_inst(0);
-
-      if (get_softmodem_params()->sa) { // set frame config to initial values from command line and assume that the SSB is centered on the grid
+      if (get_softmodem_params()->sl_mode != 0) {
+        uint16_t nr_band = get_band(sidelink_frequency[CC_id][0],0);
+        mac->if_module = NULL;
+        LOG_I(HW, "Setting mac->if_module = NULL b/c we config PHY in nr_phy_config_request_sl (for now - TODO)\n");
+        nr_phy_config_request_sl(UE[CC_id], N_RB_DL, N_RB_DL, CC_id);
+        nr_init_frame_parms_ue_sl(&UE[CC_id]->frame_parms,sidelink_frequency[CC_id][0],nr_band);
+      }
+      if (get_softmodem_params()->sa) {
         uint16_t nr_band = get_band(downlink_frequency[CC_id][0],uplink_frequency_offset[CC_id][0]);
         mac->nr_band = nr_band;
         nr_init_frame_parms_ue_sa(&UE[CC_id]->frame_parms,
@@ -517,15 +607,15 @@ int main( int argc, char **argv ) {
                                   uplink_frequency_offset[CC_id][0],
                                   get_softmodem_params()->numerology,
                                   nr_band);
-      }
-      else{
-        DevAssert(mac->if_module != NULL && mac->if_module->phy_config_request != NULL);
-        mac->if_module->phy_config_request(&mac->phy_config);
-        mac->phy_config_request_sent = true;
-        fapi_nr_config_request_t *nrUE_config = &UE[CC_id]->nrUE_config;
-
-        nr_init_frame_parms_ue(&UE[CC_id]->frame_parms, nrUE_config,
-        *mac->scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]);
+      } else {
+        if (mac->if_module != NULL && mac->if_module->phy_config_request != NULL) {
+          mac->if_module->phy_config_request(&mac->phy_config);
+          mac->phy_config_request_sent = true;
+        }
+        nr_init_frame_parms_ue(&UE[CC_id]->frame_parms, &UE[CC_id]->nrUE_config,
+                               ((get_softmodem_params()->sl_mode == 0) ?
+                               *mac->scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0] :
+                               UE[CC_id]->frame_parms.nr_band));
       }
 
       init_nr_ue_vars(UE[CC_id], 0, abstraction_flag);
@@ -636,3 +726,56 @@ static void init_bler_table(char *env_string) {
     fclose(pFile);
   }
 }
+
+// Read in each MCS file and build BLER-SINR-TB table
+static void init_mimo_bler_table(void) {
+  memset(nr_mimo_bler_data, 0, sizeof(nr_mimo_bler_data));
+
+  const char *awgn_results_dir = getenv("NR_MIMO2x2_AWGN_RESULTS_DIR");
+  if (!awgn_results_dir) {
+    LOG_W(NR_MAC, "No $NR_MIMO2x2_AWGN_RESULTS_DIR\n");
+    return;
+  }
+
+  for (unsigned int i = 0; i < NR_NUM_MCS; i++) {
+    char fName[1024];
+    snprintf(fName, sizeof(fName), "%s/mcs%d_cdlc_mimo2x2_dl.csv", awgn_results_dir, i);
+    FILE *pFile = fopen(fName, "r");
+    if (!pFile) {
+      LOG_E(NR_MAC, "open %s: %s\n", fName, strerror(errno));
+      continue;
+    }
+    size_t bufSize = 1024;
+    char * line = NULL;
+    char * token;
+    char * temp = NULL;
+    int nlines = 0;
+    while (getline(&line, &bufSize, pFile) > 0) {
+      if (!strncmp(line, "SNR", 3)) {
+        continue;
+      }
+
+      if (nlines > NR_NUM_SINR) {
+        LOG_E(NR_MAC, "BLER FILE ERROR - num lines greater than expected - file: %s\n", fName);
+        abort();
+      }
+
+      token = strtok_r(line, ";", &temp);
+      int ncols = 0;
+      while (token != NULL) {
+        if (ncols > NUM_BLER_COL) {
+          LOG_E(NR_MAC, "BLER FILE ERROR - num of cols greater than expected\n");
+          abort();
+        }
+
+        nr_mimo_bler_data[i].bler_table[nlines][ncols] = strtof(token, NULL);
+        ncols++;
+
+        token = strtok_r(NULL, ";", &temp);
+      }
+      nlines++;
+    }
+    nr_mimo_bler_data[i].length = nlines;
+    fclose(pFile);
+  }
+}

executables/nr-uesoftmodem.h

@@ -42,6 +42,7 @@
   {"uecap_file",               CONFIG_HLP_UECAP_FILE,          0,               .strptr=&uecap_file,                      .defstrval="./uecap_ports1.xml", TYPE_STRING,   0}, \
   {"rrc_config_path",          CONFIG_HLP_RRC_CFG_PATH,        0,               .strptr=&rrc_config_path,                 .defstrval="./",                 TYPE_STRING,   0}, \
   {"ue-idx-standalone",        NULL,                           0,               .u16ptr=&ue_idx_standalone,               .defuintval=0xFFFF,              TYPE_UINT16,   0}, \
+  {"SLC",                      CONFIG_HLP_SLF,                 0,               .u64ptr=&(sidelink_frequency[0][0]),      .defuintval=2600000000,          TYPE_UINT64,   0}, \
   {"ue-rxgain",                    CONFIG_HLP_UERXG,           0,               .dblptr=&(rx_gain[0][0]),            .defdblval=110,    TYPE_DOUBLE,   0}, \
   {"ue-rxgain-off",                CONFIG_HLP_UERXGOFF,        0,               .dblptr=&rx_gain_off,                .defdblval=0,      TYPE_DOUBLE,   0}, \
   {"ue-txgain",                    CONFIG_HLP_UETXG,           0,               .dblptr=&(tx_gain[0][0]),            .defdblval=0,      TYPE_DOUBLE,   0}, \

executables/softmodem-common.h

@@ -55,8 +55,10 @@ extern "C"
 
 #define CONFIG_HLP_DUMPFRAME     "dump UE received frame to rxsig_frame0.dat and exit\n"
 #define CONFIG_HLP_PHYTST        "test UE phy layer, mac disabled\n"
+#define CONFIG_HLP_SL_PHYTST     "test SL UE phy layer, mac disabled\n"
 #define CONFIG_HLP_DORA          "test gNB  and UE with RA procedures\n"
 #define CONFIG_HLP_SA            "run gNB in standalone mode\n"
+#define CONFIG_HLP_SL_MODE       "sets the NR sidelink mode (0: not in sidelink mode, 1: in-coverage/gNB, 2: out-of-coverage/no gNB)"
 #define CONFIG_HLP_EXTS          "tells hardware to use an external timing reference\n"
 #define CONFIG_HLP_DMRSSYNC      "tells RU to insert DMRS in subframe 1 slot 0"
 #define CONFIG_HLP_CLK           "tells hardware to use a clock reference (0:internal, 1:external, 2:gpsdo)\n"
@@ -66,6 +68,7 @@ extern "C"
 #define CONFIG_HLP_NOSNGLT       "Disables single-thread mode in lte-softmodem\n"
 #define CONFIG_HLP_DLF           "Set the downlink frequency for all component carriers\n"
 #define CONFIG_HLP_ULF           "Set the uplink frequency offset for all component carriers\n"
+#define CONFIG_HLP_SLF           "Set the sidelink frequency for all component carriers\n"
 #define CONFIG_HLP_CHOFF         "Channel id offset\n"
 #define CONFIG_HLP_SOFTS         "Enable soft scope and L1 and L2 stats (Xforms)\n"
 #define CONFIG_HLP_SOFTS_QT      "Enable soft scope and L1 and L2 stats (QT)\n"
@@ -103,6 +106,9 @@ extern "C"
 #define CONFIG_L1_EMULATOR       "Run in L1 emulated mode (disable PHY layer)\n"
 #define CONFIG_HLP_CONTINUOUS_TX "perform continuous transmission, even in TDD mode (to work around USRP issues)\n"
 #define CONFIG_HLP_STATS_DISABLE "disable globally the stats generation and persistence"
+#define CONFIG_HLP_SYNC_REF      "Sync Reference in Sidelink\n"
+#define CONFIG_HLP_NID1          "Set NID1 value in Sidelink\n"
+#define CONFIG_HLP_NID2          "Set NID2 value in Sidelink\n"
 
 /*-----------------------------------------------------------------------------------------------------------------------------------------------------*/
 /*                                            command line parameters common to eNodeB and UE                                                          */
@@ -111,8 +117,10 @@ extern "C"
 #define RF_CONFIG_FILE      softmodem_params.rf_config_file
 #define TP_CONFIG           softmodem_params.threadPoolConfig
 #define PHY_TEST            softmodem_params.phy_test
+#define SL_PHY_TEST         softmodem_params.sl_phy_test
 #define DO_RA               softmodem_params.do_ra
 #define SA                  softmodem_params.sa
+#define SL_MODE             softmodem_params.sl_mode
 #define WAIT_FOR_SYNC       softmodem_params.wait_for_sync
 #define SINGLE_THREAD_FLAG  softmodem_params.single_thread_flag
 #define CHAIN_OFFSET        softmodem_params.chain_offset
@@ -132,6 +140,9 @@ extern "C"
 #define NON_STOP            softmodem_params.non_stop
 #define EMULATE_L1          softmodem_params.emulate_l1
 #define CONTINUOUS_TX       softmodem_params.continuous_tx
+#define SYNC_REF            softmodem_params.sync_ref
+#define NID1                softmodem_params.nid1
+#define NID2                softmodem_params.nid2
 
 #define DEFAULT_RFCONFIG_FILE    "/usr/local/etc/syriq/ue.band7.tm1.PRB100.NR40.dat";
 
@@ -143,6 +154,8 @@ extern int usrp_tx_thread;
   {"phy-test",              CONFIG_HLP_PHYTST,        PARAMFLAG_BOOL, .iptr=&PHY_TEST,                        .defintval=0,             TYPE_INT,    0},  \
   {"do-ra",                 CONFIG_HLP_DORA,          PARAMFLAG_BOOL, .iptr=&DO_RA,                           .defintval=0,             TYPE_INT,    0},  \
   {"sa",                    CONFIG_HLP_SA,            PARAMFLAG_BOOL, .iptr=&SA,                              .defintval=0,             TYPE_INT,    0},  \
+  {"sl-mode",               CONFIG_HLP_SL_MODE,       0,              .u8ptr=&SL_MODE,                        .defintval=0,             TYPE_UINT8,  0},  \
+  {"sync-ref",              CONFIG_HLP_SYNC_REF,      PARAMFLAG_BOOL, .iptr=&SYNC_REF,                       .defintval=0,             TYPE_INT,  0},  \
   {"usim-test",             CONFIG_HLP_USIM,          PARAMFLAG_BOOL, .u8ptr=&USIM_TEST,                      .defintval=0,             TYPE_UINT8,  0},  \
   {"clock-source",          CONFIG_HLP_CLK,           0,              .uptr=&CLOCK_SOURCE,                    .defintval=0,             TYPE_UINT,   0},  \
   {"time-source",           CONFIG_HLP_TME,           0,              .uptr=&TIMING_SOURCE,                   .defintval=0,             TYPE_UINT,   0},  \
@@ -174,6 +187,8 @@ extern int usrp_tx_thread;
   {"emulate-l1",            CONFIG_L1_EMULATOR,       PARAMFLAG_BOOL, .iptr=&EMULATE_L1,                      .defintval=0,             TYPE_INT,    0},  \
   {"continuous-tx",         CONFIG_HLP_CONTINUOUS_TX, PARAMFLAG_BOOL, .iptr=&CONTINUOUS_TX,                   .defintval=0,             TYPE_INT,    0},  \
   {"disable-stats",         CONFIG_HLP_STATS_DISABLE, PARAMFLAG_BOOL, .iptr=&stats_disabled,                  .defintval=0,             TYPE_INT,    0},  \
+  {"nid1",                  CONFIG_HLP_NID1,          0,              .iptr=&NID1,                            .defintval=10,            TYPE_INT,    0},  \
+  {"nid2",                  CONFIG_HLP_NID2,          0,              .iptr=&NID2,                            .defintval=1,             TYPE_INT,    0},  \
 }
 // clang-format on
 
@@ -210,6 +225,8 @@ extern int usrp_tx_thread;
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
+    { .s5 = { NULL } },                     \
+    { .s5 = { NULL } },                     \
     { .s3a = { config_checkstr_assign_integer, \
                {"MONOLITHIC", "PNF", "VNF","UE_STUB_PNF","UE_STUB_OFFNET","STANDALONE_PNF"}, \
                {NFAPI_MONOLITHIC, NFAPI_MODE_PNF, NFAPI_MODE_VNF,NFAPI_UE_STUB_PNF,NFAPI_UE_STUB_OFFNET,NFAPI_MODE_STANDALONE_PNF}, \
@@ -218,6 +235,8 @@ extern int usrp_tx_thread;
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
     { .s5 = { NULL } },                     \
+    { .s5 = { NULL } },                     \
+    { .s5 = { NULL } },                     \
 }
 // clang-format on
 
@@ -301,8 +320,10 @@ typedef struct {
   char           *rf_config_file;
   char           *threadPoolConfig;
   int            phy_test;
+  int            sl_phy_test;
   int            do_ra;
   int            sa;
+  uint8_t        sl_mode;
   uint8_t        usim_test;
   int            emulate_rf;
   int            wait_for_sync; //eNodeB only
@@ -324,6 +345,9 @@ typedef struct {
   int            non_stop;
   int            emulate_l1;
   int            continuous_tx;
+  int            sync_ref;
+  int            nid1;
+  int            nid2;
 } softmodem_params_t;
 
 extern uint64_t get_softmodem_optmask(void);

nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h

@@ -559,7 +559,9 @@ typedef struct {
 typedef struct 
 {
   uint16_t dl_bandwidth;//Carrier bandwidth for DL in MHz [38.104, sec 5.3.2] Values: 5, 10, 15, 20, 25, 30, 40,50, 60, 70, 80,90,100,200,400
+  uint16_t sl_bandwidth; //Carrier bandwidth for SL in MHz [38.101, sec 5.3.5] Values: 10, 20, 30, and 40
   uint32_t dl_frequency; //Absolute frequency of DL point A in KHz [38.104, sec5.2 and 38.211 sec 4.4.4.2] Value: 450000 -> 52600000
+  uint32_t sl_frequency; //Absolute frequency of SL point A in KHz [38.331, sec6.3.5 and 38.211 sec 8.2.7]
   uint16_t dl_k0[5];//𝑘_{0}^{𝜇} for each of the numerologies [38.211, sec 5.3.1] Value: 0 ->23699
   uint16_t dl_grid_size[5];//Grid size 𝑁_{𝑔𝑟𝑖𝑑}^{𝑠𝑖𝑧𝑒,𝜇} for each of the numerologies [38.211, sec 4.4.2] Value: 0->275 0 = this numerology not used
   uint16_t num_tx_ant;//Number of Tx antennas

openair1/PHY/CODING/ccoding_byte_lte.c

@@ -28,10 +28,10 @@
 
 //#define DEBUG_CCODE 1
 
-unsigned short glte[] = { 0133, 0171, 0165 }; // {A,B}
-unsigned short glte_rev[] = { 0155, 0117, 0127 }; // {A,B}
-unsigned short gdab[] = { 0133, 0171, 0145 }; // {A,B}
-unsigned short gdab_rev[] = { 0155, 0117, 0123 }; // {A,B}
+static const unsigned short glte[] = {0133, 0171, 0165}; // {A,B}
+static const unsigned short glte_rev[] = {0155, 0117, 0127}; // {A,B}
+static const unsigned short gdab[] = {0133, 0171, 0145}; // {A,B}
+static const unsigned short gdab_rev[] = {0155, 0117, 0123}; // {A,B}
 unsigned char  ccodelte_table[128];      // for transmitter
 unsigned char  ccodelte_table_rev[128];  // for receiver
 

openair1/PHY/CODING/crc_byte.c

@@ -44,18 +44,20 @@
 /*ref 36-212 v8.6.0 , pp 8-9 */
 /* the highest degree is set by default */
 
-uint32_t poly24a = 0x864cfb00; // 1000 0110 0100 1100 1111 1011
-                               // D^24 + D^23 + D^18 + D^17 + D^14 + D^11 + D^10 + D^7 + D^6 + D^5 + D^4 + D^3 + D + 1
-uint32_t poly24b = 0x80006300; // 1000 0000 0000 0000 0110 0011
-                               // D^24 + D^23 + D^6 + D^5 + D + 1
-uint32_t poly24c = 0xb2b11700; // 1011 0010 1011 0001 0001 0111
-                               // D^24+D^23+D^21+D^20+D^17+D^15+D^13+D^12+D^8+D^4+D^2+D+1
 
-uint32_t poly16 = 0x10210000; // 0001 0000 0010 0001            D^16 + D^12 + D^5 + 1
-uint32_t poly12 = 0x80F00000; // 1000 0000 1111                 D^12 + D^11 + D^3 + D^2 + D + 1
-uint32_t poly8 = 0x9B000000; // 1001 1011                      D^8  + D^7  + D^4 + D^3 + D + 1
-uint32_t poly6 = 0x84000000; // 10000100000... -> D^6+D^5+1
-uint32_t poly11 = 0xc4200000; //11000100001000... -> D^11+D^10+D^9+D^5+1
+static const uint32_t poly24a =
+    0x864cfb00; // 1000 0110 0100 1100 1111 1011
+                // D^24 + D^23 + D^18 + D^17 + D^14 + D^11 + D^10 + D^7 + D^6 + D^5 + D^4 + D^3 + D + 1
+static const uint32_t poly24b = 0x80006300; // 1000 0000 0000 0000 0110 0011
+                                                // D^24 + D^23 + D^6 + D^5 + D + 1
+static const uint32_t poly24c = 0xb2b11700; // 1011 0010 1011 0001 0001 0111
+                                                // D^24+D^23+D^21+D^20+D^17+D^15+D^13+D^12+D^8+D^4+D^2+D+1
+
+static const uint32_t poly16 = 0x10210000; // 0001 0000 0010 0001            D^16 + D^12 + D^5 + 1
+static const uint32_t poly12 = 0x80F00000; // 1000 0000 1111                 D^12 + D^11 + D^3 + D^2 + D + 1
+static const uint32_t poly8 = 0x9B000000; // 1001 1011                      D^8  + D^7  + D^4 + D^3 + D + 1
+static const uint32_t poly6 = 0x84000000; // 10000100000... -> D^6+D^5+1
+static const uint32_t poly11 = 0xc4200000; // 11000100001000... -> D^11+D^10+D^9+D^5+1
 
 /*********************************************************
 
@@ -100,24 +102,20 @@ static uint32_t crc8Table[256];
 static uint32_t crc6Table[256];
 
 #if USE_INTEL_CRC
-static DECLARE_ALIGNED(struct crc_pclmulqdq_ctx lte_crc24a_pclmulqdq, 16) = {
-        0x64e4d700,     /**< k1 */
-        0x2c8c9d00,     /**< k2 */
-        0xd9fe8c00,     /**< k3 */
-        0xf845fe24,     /**< q */
-        0x864cfb00,     /**< p */
-        0ULL            /**< res */
+static const struct crc_pclmulqdq_ctx lte_crc24a_pclmulqdq __attribute__((aligned(16))) = {
+    0x64e4d700, /**< k1 */
+    0x2c8c9d00, /**< k2 */
+    0xd9fe8c00, /**< k3 */
+    0xf845fe24, /**< q */
+    0x864cfb00, /**< p */
+    0ULL /**< res */
 };
 __m128i crc_xmm_be_le_swap128;
 
-DECLARE_ALIGNED(const uint8_t crc_xmm_shift_tab[48], 16) = {
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
+const uint8_t crc_xmm_shift_tab[48]
+    __attribute__((aligned(16))) = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+                                    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
 #endif
 
@@ -176,13 +174,13 @@ uint32_t crc24a(unsigned char* inptr, int bitlen)
 }
 
 #if USE_INTEL_CRC
-static DECLARE_ALIGNED(struct crc_pclmulqdq_ctx lte_crc24b_pclmulqdq, 16) = {
-        0x80140500,     /**< k1 */
-        0x42000100,     /**< k2 */
-        0x90042100,     /**< k3 */
-        0xffff83ff,     /**< q */
-        0x80006300,     /**< p */
-        0ULL            /**< res */
+static const struct crc_pclmulqdq_ctx lte_crc24b_pclmulqdq __attribute__((aligned(16))) = {
+    0x80140500, /**< k1 */
+    0x42000100, /**< k2 */
+    0x90042100, /**< k3 */
+    0xffff83ff, /**< q */
+    0x80006300, /**< p */
+    0ULL /**< res */
 };
 #endif
 uint32_t crc24b(unsigned char* inptr, int bitlen)

openair1/PHY/CODING/lte_rate_matching.c

@@ -33,9 +33,12 @@
 
 //#define cmin(a,b) ((a)<(b) ? (a) : (b))
 
-static uint32_t bitrev[32]    = {0,16,8,24,4,20,12,28,2,18,10,26,6,22,14,30,1,17,9,25,5,21,13,29,3,19,11,27,7,23,15,31};
-static uint32_t bitrev_x3[32] = {0,48,24,72,12,60,36,84,6,54,30,78,18,66,42,90,3,51,27,75,15,63,39,87,9,57,33,81,21,69,45,93};
-static uint32_t bitrev_cc[32] = {1,17,9,25,5,21,13,29,3,19,11,27,7,23,15,31,0,16,8,24,4,20,12,28,2,18,10,26,6,22,14,30};
+static const uint32_t bitrev[32] = {0, 16, 8, 24, 4, 20, 12, 28, 2, 18, 10, 26, 6, 22, 14, 30,
+                                    1, 17, 9, 25, 5, 21, 13, 29, 3, 19, 11, 27, 7, 23, 15, 31};
+static const uint32_t bitrev_x3[32] = {0, 48, 24, 72, 12, 60, 36, 84, 6, 54, 30, 78, 18, 66, 42, 90,
+                                       3, 51, 27, 75, 15, 63, 39, 87, 9, 57, 33, 81, 21, 69, 45, 93};
+static const uint32_t bitrev_cc[32] = {1, 17, 9, 25, 5, 21, 13, 29, 3, 19, 11, 27, 7, 23, 15, 31,
+                                       0, 16, 8, 24, 4, 20, 12, 28, 2, 18, 10, 26, 6, 22, 14, 30};
 
 //#define RM_DEBUG_TX 1
 //#define RM_DEBUG 1

openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c

@@ -22,12 +22,12 @@
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
 
 // ----- Old implementation ----
-uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits){
-
-	uint8_t crcPolynomialPattern[25] = {1,1,0,1,1,0,0,1,0,1,0,1,1,0,0,0,1,0,0,0,1,0,1,1,1};
-	// 1011 0010 1011 0001 0001 0111 D^24 + D^23 + D^21 + D^20 + D^17 + D^15 + D^13 + D^12 + D^8 + D^4 + D^2 + D + 1
-	uint8_t crcPolynomialSize = 24;
-	uint8_t temp1[crcPolynomialSize], temp2[crcPolynomialSize];
+const uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits)
+{
+  uint8_t crcPolynomialPattern[25] = {1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1};
+  // 1011 0010 1011 0001 0001 0111 D^24 + D^23 + D^21 + D^20 + D^17 + D^15 + D^13 + D^12 + D^8 + D^4 + D^2 + D + 1
+  uint8_t crcPolynomialSize = 24;
+  uint8_t temp1[crcPolynomialSize], temp2[crcPolynomialSize];
 
 	uint8_t **crc_generator_matrix = malloc(payloadSizeBits*sizeof(uint8_t *) + payloadSizeBits*crcPolynomialSize*sizeof(uint8_t));
 	if (crc_generator_matrix)
@@ -52,74 +52,5 @@ uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits){
 				crc_generator_matrix[i][j]=0;
 		}
 	}
-	return crc_generator_matrix;
-}
-
-uint8_t **crc11_generator_matrix(uint16_t payloadSizeBits){
-
-	uint8_t crcPolynomialPattern[12] = {1,1,1,0,0,0,1,0,0,0,0,1};
-	// 1110 0010 0001 D^11 + D^10 + D^9 + D^5 + 1
-	uint8_t crcPolynomialSize = 11;
-	uint8_t temp1[crcPolynomialSize], temp2[crcPolynomialSize];
-
-	uint8_t **crc_generator_matrix = malloc(payloadSizeBits * sizeof(uint8_t *));
-	if (crc_generator_matrix)
-	  for (int i = 0; i < payloadSizeBits; i++)
-		  crc_generator_matrix[i] = malloc(crcPolynomialSize * sizeof(uint8_t));
-
-	for (int i = 0; i < crcPolynomialSize; i++) crc_generator_matrix[payloadSizeBits-1][i]=crcPolynomialPattern[i+1];
-
-	for (int i = payloadSizeBits-2; i >= 0; i--){
-		for (int j = 0; j < crcPolynomialSize-1; j++)
-			temp1[j]=crc_generator_matrix[i+1][j+1];
-
-		temp1[crcPolynomialSize-1]=0;
-
-		for (int j = 0; j < crcPolynomialSize; j++)
-			temp2[j]=crc_generator_matrix[i+1][0]*crcPolynomialPattern[j+1];
-
-		for (int j = 0; j < crcPolynomialSize; j++){
-			if(temp1[j]+temp2[j] == 1)
-				crc_generator_matrix[i][j]=1;
-			else
-				crc_generator_matrix[i][j]=0;
-		}
-	}
-
-	return crc_generator_matrix;
-}
-
-uint8_t **crc6_generator_matrix(uint16_t payloadSizeBits){
-
-	uint8_t crcPolynomialPattern[7] = {1,1,0,0,0,0,1};
-	// 0110 0001 D^6 + D^5 + 1
-	uint8_t crcPolynomialSize = 6;
-	uint8_t temp1[crcPolynomialSize], temp2[crcPolynomialSize];
-	uint8_t **crc_generator_matrix = malloc(payloadSizeBits * sizeof(uint8_t *));
-
-	if (crc_generator_matrix)
-	  for (int i = 0; i < payloadSizeBits; i++)
-		  crc_generator_matrix[i] = malloc(crcPolynomialSize * sizeof(uint8_t));
-
-	for (int i = 0; i < crcPolynomialSize; i++)
-		crc_generator_matrix[payloadSizeBits-1][i]=crcPolynomialPattern[i+1];
-
-	for (int i = payloadSizeBits-2; i >= 0; i--){
-		for (int j = 0; j < crcPolynomialSize-1; j++)
-			temp1[j]=crc_generator_matrix[i+1][j+1];
-
-		temp1[crcPolynomialSize-1]=0;
-
-		for (int j = 0; j < crcPolynomialSize; j++)
-			temp2[j]=crc_generator_matrix[i+1][0]*crcPolynomialPattern[j+1];
-
-		for (int j = 0; j < crcPolynomialSize; j++){
-			if(temp1[j]+temp2[j] == 1)
-				crc_generator_matrix[i][j]=1;
-			else
-				crc_generator_matrix[i][j]=0;
-		}
-	}
-
-	return crc_generator_matrix;
+  return (const uint8_t **)crc_generator_matrix;
 }

openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c

@@ -351,9 +351,17 @@ void applyGtoright(const t_nrPolar_params *pp,decoder_node_t *node) {
       ((__m64 *)alpha_r)[0] = _mm_subs_pi16(((__m64 *)alpha_v)[1],_mm_sign_pi16(((__m64 *)alpha_v)[0],((__m64 *)betal)[0]));	
     }
     else
-      {// equivalent scalar code to above, activated only on non x86/ARM architectures or Nv=1,2
-	for (int i=0;i<node->Nv/2;i++) {
-	  alpha_r[i] = alpha_v[i+(node->Nv/2)] - (betal[i]*alpha_v[i]);
+      {
+        int temp_alpha_r;
+	for (int i = 0; i < node->Nv / 2; i++) {
+	  temp_alpha_r = alpha_v[i + (node->Nv / 2)] - (betal[i] * alpha_v[i]);
+          if (temp_alpha_r > SHRT_MAX) {
+            alpha_r[i] = SHRT_MAX;
+          } else if (temp_alpha_r < -SHRT_MAX) {
+            alpha_r[i] = -SHRT_MAX;
+          } else {
+            alpha_r[i] = temp_alpha_r;
+          }
 	}
       }
     if (node->Nv == 2) { // apply hard decision on right node
@@ -366,7 +374,7 @@ void applyGtoright(const t_nrPolar_params *pp,decoder_node_t *node) {
   }
 }
 
-int16_t all1[16] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
+static const int16_t all1[16] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
 
 void computeBeta(const t_nrPolar_params *pp,decoder_node_t *node) {
 

openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h

@@ -42,6 +42,7 @@
 #include "PHY/CODING/nrPolar_tools/nr_polar_dci_defs.h"
 #include "PHY/CODING/nrPolar_tools/nr_polar_uci_defs.h"
 #include "PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h"
+#include "PHY/CODING/nrPolar_tools/nr_polar_psbch_defs.h"
 #include "PHY/CODING/coding_defs.h"
 //#include "SIMULATION/TOOLS/sim.h"
 
@@ -109,8 +110,8 @@ struct nrPolar_params {
   uint16_t *channel_interleaver_pattern;
   //uint32_t crc_polynomial;
 
-  uint8_t **crc_generator_matrix; //G_P
-  uint8_t **G_N;
+  const uint8_t **crc_generator_matrix; // G_P
+  const uint8_t **G_N;
   uint64_t **G_N_tab;
   int groupsize;
   int *rm_tab;
@@ -205,7 +206,7 @@ t_nrPolar_params *nr_polar_params (int8_t messageType,
 
 uint16_t nr_polar_aggregation_prime (uint8_t aggregation_level);
 
-uint8_t **nr_polar_kronecker_power_matrices(uint8_t n);
+const uint8_t **nr_polar_kronecker_power_matrices(uint8_t n);
 
 const uint16_t *nr_polar_sequence_pattern(uint8_t n);
 
@@ -270,11 +271,7 @@ void nr_byte2bit_uint8_32(uint8_t *in,
                           uint16_t arraySize,
                           uint32_t *out);
 
-uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits);
-
-uint8_t **crc11_generator_matrix(uint16_t payloadSizeBits);
-
-uint8_t **crc6_generator_matrix(uint16_t payloadSizeBits);
+const uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits);
 
 void nr_polar_bit_insertion(uint8_t *input,
                             uint8_t *output,
@@ -284,11 +281,11 @@ void nr_polar_bit_insertion(uint8_t *input,
                             int16_t *Q_PC_N,
                             uint8_t n_PC);
 
-void nr_matrix_multiplication_uint8_1D_uint8_2D(uint8_t *matrix1,
-    uint8_t **matrix2,
-    uint8_t *output,
-    uint16_t row,
-    uint16_t col);
+void nr_matrix_multiplication_uint8_1D_uint8_2D(const uint8_t *matrix1,
+                                                const uint8_t **matrix2,
+                                                uint8_t *output,
+                                                uint16_t row,
+                                                uint16_t col);
 
 void nr_sort_asc_double_1D_array_ind(double *matrix,
                                      uint8_t *ind,

openair1/PHY/CODING/nrPolar_tools/nr_polar_matrix_and_array.c

@@ -32,15 +32,18 @@
 
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
 
-void nr_matrix_multiplication_uint8_1D_uint8_2D(uint8_t *matrix1, uint8_t **matrix2,
-		uint8_t *output, uint16_t row, uint16_t col) {
-
-	for (uint16_t i = 0; i < col; i++) {
-		output[i] = 0;
-		for (uint16_t j = 0; j < row; j++) {
+void nr_matrix_multiplication_uint8_1D_uint8_2D(const uint8_t *matrix1,
+                                                const uint8_t **matrix2,
+                                                uint8_t *output,
+                                                uint16_t row,
+                                                uint16_t col)
+{
+  for (uint16_t i = 0; i < col; i++) {
+    output[i] = 0;
+    for (uint16_t j = 0; j < row; j++) {
 			output[i] += matrix1[j] * matrix2[j][i];
 		}
-	}
+  }
 }
 
 // Modified Bubble Sort.

openair1/PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h

@@ -35,6 +35,7 @@
 
 #define NR_POLAR_PBCH_AGGREGATION_LEVEL 0 //uint8_t
 #define NR_POLAR_PBCH_MESSAGE_TYPE 0      //int8_t
+#define NR_POLAR_PSBCH_MESSAGE_TYPE 3     //int8_t
 #define NR_POLAR_PBCH_PAYLOAD_BITS 32     //uint16_t
 #define NR_POLAR_PBCH_CRC_PARITY_BITS 24
 #define NR_POLAR_PBCH_CRC_ERROR_CORRECTION_BITS 3
@@ -52,6 +53,8 @@
 #define NR_POLAR_PBCH_I_BIL 0 //uint8_t
 #define NR_POLAR_PBCH_E 864   //uint16_t
 #define NR_POLAR_PBCH_E_DWORD 27 // NR_POLAR_PBCH_E/32
+#define NR_POLAR_PSBCH_E 1792   //uint16_t
+#define NR_POLAR_PSBCH_E_DWORD 56 // NR_POLAR_PSBCH_E/32
 
 /*
  * TEST CODE

openair1/PHY/CODING/nrPolar_tools/nr_polar_psbch_defs.h

@@ -0,0 +1,70 @@
+/*
+ * 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
+ */
+
+/*!\file PHY/CODING/nrPolar_tools/nr_polar_psbch_defs.h
+ * \brief Defines the constant variables for polar coding of the PSBCH from 38-212, V15.1.1 2018-04.
+ * \author Turker Yilmaz
+ * \date 2018
+ * \version 0.1
+ * \company EURECOM
+ * \email turker.yilmaz@eurecom.fr
+ * \note
+ * \warning
+*/
+
+#ifndef __NR_POLAR_PSBCH_DEFS__H__
+#define __NR_POLAR_PSBCH_DEFS__H__
+
+#define NR_POLAR_PSBCH_AGGREGATION_LEVEL 0 //uint8_t
+#define NR_POLAR_PSBCH_MESSAGE_TYPE 3      //int8_t
+#define NR_POLAR_PSBCH_PAYLOAD_BITS 32     //uint16_t
+#define NR_POLAR_PSBCH_CRC_PARITY_BITS 24
+#define NR_POLAR_PSBCH_CRC_ERROR_CORRECTION_BITS 3
+//Assumed 3 by 3GPP when NR_POLAR_PSBCH_L>8 to meet false alarm rate requirements.
+
+//Sec. 7.1.4: Channel Coding
+#define NR_POLAR_PSBCH_N_MAX 9   //uint8_t
+#define NR_POLAR_PSBCH_I_IL 1    //uint8_t
+#define NR_POLAR_PSBCH_I_SEG 0   //uint8_t
+#define NR_POLAR_PSBCH_N_PC 0    //uint8_t
+#define NR_POLAR_PSBCH_N_PC_WM 0 //uint8_t
+//#define NR_POLAR_PSBCH_N 512     //uint16_t
+
+//Sec. 7.1.5: Rate Matching
+#define NR_POLAR_PSBCH_I_BIL 0 //uint8_t
+#define NR_POLAR_PSBCH_E 1792   //uint16_t
+#define NR_POLAR_PSBCH_E_DWORD 56 // NR_POLAR_PSBCH_E/32
+
+/*
+ * TEST CODE
+ */
+//#define DEBUG_POLAR
+// Usage in code:
+//#ifdef DEBUG_POLAR
+//...
+//#endif
+
+//unsigned int testPayload0=0x00000000, testPayload1=0xffffffff; //payload1=~payload0;
+//unsigned int testPayload2=0xa5a5a5a5; //testPayload3=0xb3f02c82;
+
+//double testReceivedPayload3[NR_POLAR_PSBCH_E] = {-1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, -1, -1, -1, 1, 1, 1, 1, -1, -1, -1, 1, -1, 1, -1, 1, -1, 1, 1, -1, 1, 1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, -1, 1, 1, -1, 1, -1, -1, 1, 1, -1, 1, 1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, -1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, -1, 1, 1, -1, -1, 1, 1, 1, -1, -1, 1, 1, -1, -1, -1, -1, 1, -1, -1, -1, 1, -1, -1, 1, 1, 1, 1, -1, -1, -1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, -1, -1, -1, 1, 1, 1, -1, -1, -1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, -1, -1, 1, 1, -1, -1, 1, 1, 1, -1, -1, -1, -1, 1, 1, -1, 1, -1, 1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1, 1, 1, 1, 1, -1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, 1, 1, -1, 1, 1, -1, 1, -1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, -1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, -1, -1, -1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, -1, -1, 1, 1, 1, -1, -1, -1, 1, -1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, -1, -1, 1, 1, -1, 1, 1, -1, -1, 1, 1, -1, -1, -1, -1, -1, 1, -1, -1, -1, 1, 1, -1, 1, 1, -1, 1, -1, -1, 1, 1, -1, 1, 1, 1, -1, 1, -1, 1, 1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, -1, -1, 1, -1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1, 1, -1, -1, -1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, -1, -1, -1, 1, 1, -1, 1, -1, 1, -1, 1, 1, -1, 1, -1, -1, -1, 1, 1, -1, 1, 1, 1, -1, -1, -1, -1, 1, -1, 1, -1, 1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, -1, 1, 1, -1, 1, -1, -1, -1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, -1, -1, -1, 1, 1, 1, 1, -1, -1, -1, 1, -1, 1, -1, 1, -1, 1, 1, -1, 1, 1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, -1, 1, 1, -1, 1, -1, -1, 1, 1, -1, 1, 1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, -1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, -1, 1, 1, -1, -1, 1, 1, 1, -1, -1, 1, 1, -1, -1, -1, -1, 1, -1, -1, -1, 1, -1, -1, 1, 1, 1, 1, -1, -1, -1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, -1, -1, -1, 1, 1, 1, -1, -1, -1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, -1, -1, 1, 1, -1, -1, 1, 1, 1, -1, -1, -1, -1, 1, 1, -1, 1, -1, 1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1, 1, 1, 1, 1, -1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, 1, 1, -1, 1, 1, -1, 1, -1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, -1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, -1, -1, -1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, -1, -1, 1, 1, 1, -1, -1, -1, 1, -1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, -1, -1, 1, 1, -1, 1, 1, -1, -1, 1, 1, -1, -1};
+
+#endif

openair1/PHY/CODING/nr_polar_init.c

@@ -193,7 +193,18 @@ t_nrPolar_params *nr_polar_params(int8_t messageType, uint16_t messageLength, ui
     newPolarInitNode->payloadBits = messageLength;
     newPolarInitNode->crcCorrectionBits = NR_POLAR_PUCCH_CRC_ERROR_CORRECTION_BITS;
     //LOG_D(PHY,"New polar node, encoderLength %d, aggregation_level %d\n",newPolarInitNode->encoderLength,aggregation_level);
-
+  } else if (messageType == 3) { // PSBCH
+    newPolarInitNode->n_max = NR_POLAR_PSBCH_N_MAX;
+    newPolarInitNode->i_il = NR_POLAR_PSBCH_I_IL;
+    newPolarInitNode->i_seg = NR_POLAR_PSBCH_I_SEG;
+    newPolarInitNode->n_pc = NR_POLAR_PSBCH_N_PC;
+    newPolarInitNode->n_pc_wm = NR_POLAR_PSBCH_N_PC_WM;
+    newPolarInitNode->i_bil = NR_POLAR_PSBCH_I_BIL;
+    newPolarInitNode->crcParityBits = NR_POLAR_PSBCH_CRC_PARITY_BITS;
+    newPolarInitNode->payloadBits = NR_POLAR_PSBCH_PAYLOAD_BITS;
+    newPolarInitNode->encoderLength = NR_POLAR_PSBCH_E;
+    newPolarInitNode->crcCorrectionBits = NR_POLAR_PSBCH_CRC_ERROR_CORRECTION_BITS;
+    newPolarInitNode->crc_generator_matrix = crc24c_generator_matrix(newPolarInitNode->payloadBits);//G_P
   } else {
     AssertFatal(1 == 0, "[nr_polar_init] Incorrect Message Type(%d)", messageType);
   }

openair1/PHY/INIT/lte_init.c

@@ -36,15 +36,10 @@
 #include <math.h>
 #include "nfapi/oai_integration/vendor_ext.h"
 #include <openair1/PHY/LTE_ESTIMATION/lte_estimation.h>
-extern uint32_t from_earfcn(int eutra_bandP,uint32_t dl_earfcn);
-extern int32_t get_uldl_offset(int eutra_bandP);
 
-extern uint16_t prach_root_sequence_map0_3[838];
-extern uint16_t prach_root_sequence_map4[138];
-uint8_t         dmrs1_tab[8] = { 0, 2, 3, 4, 6, 8, 9, 10 };
+const uint8_t dmrs1_tab[8] = {0, 2, 3, 4, 6, 8, 9, 10};
 
-
-int             N_RB_DL_array[6] = { 6, 15, 25, 50, 75, 100 };
+const int N_RB_DL_array[6] = {6, 15, 25, 50, 75, 100};
 
 #include "common/ran_context.h"
 extern RAN_CONTEXT_t RC;

openair1/PHY/INIT/lte_init_ue.c

@@ -35,6 +35,7 @@
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 #include "nfapi/oai_integration/vendor_ext.h"
+#include "PHY/phy_extern.h"
 void init_7_5KHz(void);
 
 uint8_t dmrs1_tab_ue[8] = {0,2,3,4,6,8,9,10};
@@ -360,8 +361,6 @@ void phy_config_harq_ue(module_id_t Mod_id,
   phy_vars_ue->ulsch[eNB_id]->Mlimit = max_harq_tx;
 }
 
-extern uint16_t beta_cqi[16];
-
 void phy_config_dedicated_ue(module_id_t Mod_id,int CC_id,uint8_t eNB_id,
                              struct LTE_PhysicalConfigDedicated *physicalConfigDedicated ) {
   static uint8_t first_dedicated_configuration = 0;

openair1/PHY/INIT/lte_parms.c

@@ -22,8 +22,8 @@
 #include "phy_init.h"
 #include "common/utils/LOG/log.h"
 
-uint16_t dl_S_table_normal[10]= {3,9,10,11,12,3,9,10,11,6};
-uint16_t dl_S_table_extended[10]= {3,8,9,10,3,8,9,5,0,0};
+static const uint16_t dl_S_table_normal[10] = {3, 9, 10, 11, 12, 3, 9, 10, 11, 6};
+static const uint16_t dl_S_table_extended[10] = {3, 8, 9, 10, 3, 8, 9, 5, 0, 0};
 
 void set_S_config(LTE_DL_FRAME_PARMS *fp) {
   int X = fp->srsX;

openair1/PHY/INIT/nr_init.c

@@ -26,6 +26,7 @@
 #include "PHY/NR_REFSIG/nr_refsig.h"
 #include "PHY/INIT/nr_phy_init.h"
 #include "PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h"
+#include "PHY/CODING/nrPolar_tools/nr_polar_psbch_defs.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
 #include "PHY/NR_TRANSPORT/nr_transport_common_proto.h"
 #include "openair1/PHY/MODULATION/nr_modulation.h"
@@ -38,7 +39,7 @@
 #include "PHY/NR_REFSIG/nr_refsig.h"
 #include "SCHED_NR/fapi_nr_l1.h"
 #include "nfapi_nr_interface.h"
-
+#include "executables/softmodem-common.h"
 #include "PHY/NR_REFSIG/ul_ref_seq_nr.h"
 
 

openair1/PHY/INIT/nr_init_ue.c

@@ -35,9 +35,9 @@
 #include "PHY/MODULATION/nr_modulation.h"
 #include "openair2/COMMON/prs_nr_paramdef.h"
 #include "SCHED_NR_UE/harq_nr.h"
+#include <nr-uesoftmodem.h>
 
 
-extern uint16_t beta_cqi[16];
 
 void RCconfig_nrUE_prs(void *cfg)
 {
@@ -202,6 +202,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
   // create shortcuts
   NR_DL_FRAME_PARMS *const fp            = &ue->frame_parms;
   NR_UE_COMMON *const common_vars        = &ue->common_vars;
+  NR_UE_PSBCH **const psbch_vars         = ue->psbch_vars;
   NR_UE_PRACH **const prach_vars         = ue->prach_vars;
   NR_UE_CSI_IM **const csiim_vars        = ue->csiim_vars;
   NR_UE_CSI_RS **const csirs_vars        = ue->csirs_vars;
@@ -353,6 +354,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
   // DLSCH
   for (gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++) {
     prach_vars[gNB_id] = (NR_UE_PRACH *)malloc16_clear(sizeof(NR_UE_PRACH));
+    psbch_vars[gNB_id] = (NR_UE_PSBCH *)malloc16_clear(sizeof(NR_UE_PSBCH));
     csiim_vars[gNB_id] = (NR_UE_CSI_IM *)malloc16_clear(sizeof(NR_UE_CSI_IM));
     csirs_vars[gNB_id] = (NR_UE_CSI_RS *)malloc16_clear(sizeof(NR_UE_CSI_RS));
     srs_vars[gNB_id] = (NR_UE_SRS *)malloc16_clear(sizeof(NR_UE_SRS));
@@ -471,6 +473,7 @@ void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
     free_and_zero(ue->csirs_vars[gNB_id]);
     free_and_zero(ue->srs_vars[gNB_id]);
 
+    free_and_zero(ue->psbch_vars[gNB_id]);
     free_and_zero(ue->prach_vars[gNB_id]);
   }
 
@@ -700,7 +703,12 @@ void phy_init_nr_top(PHY_VARS_NR_UE *ue) {
   crcTableInit();
   init_scrambling_luts();
   load_dftslib();
+  frame_parms->Nid_SL = 0;
   init_context_synchro_nr(frame_parms);
+  if (get_softmodem_params()->sl_mode>0) {
+    frame_parms->Nid_SL = 336;
+    init_context_synchro_nr(frame_parms);
+  }
   generate_ul_reference_signal_sequences(SHRT_MAX);
 }
 

openair1/PHY/INIT/nr_parms.c

@@ -22,65 +22,31 @@
 #include "nr_phy_init.h"
 #include "common/utils/nr/nr_common.h"
 #include "common/utils/LOG/log.h"
+#include "executables/softmodem-common.h"
 
 /// Subcarrier spacings in Hz indexed by numerology index
-uint32_t nr_subcarrier_spacing[MAX_NUM_SUBCARRIER_SPACING] = {15e3, 30e3, 60e3, 120e3, 240e3};
-uint16_t nr_slots_per_subframe[MAX_NUM_SUBCARRIER_SPACING] = {1, 2, 4, 8, 16};
+static const uint32_t nr_subcarrier_spacing[MAX_NUM_SUBCARRIER_SPACING] = {15e3, 30e3, 60e3, 120e3, 240e3};
+static const uint16_t nr_slots_per_subframe[MAX_NUM_SUBCARRIER_SPACING] = {1, 2, 4, 8, 16};
 
 // Table 5.4.3.3-1 38-101
-int nr_ssb_table[48][3] = {
-  {1, 15, nr_ssb_type_A},
-  {2, 15, nr_ssb_type_A},
-  {3, 15, nr_ssb_type_A},
-  {5, 15, nr_ssb_type_A},
-  {5, 30, nr_ssb_type_B},
-  {7, 15, nr_ssb_type_A},
-  {8, 15, nr_ssb_type_A},
-  {12, 15, nr_ssb_type_A},
-  {14, 15, nr_ssb_type_A},
-  {18, 15, nr_ssb_type_A},
-  {20, 15, nr_ssb_type_A},
-  {25, 15, nr_ssb_type_A},
-  {26, 15, nr_ssb_type_A},
-  {28, 15, nr_ssb_type_A},
-  {29, 15, nr_ssb_type_A},
-  {30, 15, nr_ssb_type_A},
-  {34, 15, nr_ssb_type_A},
-  {34, 30, nr_ssb_type_C},
-  {38, 15, nr_ssb_type_A},
-  {38, 30, nr_ssb_type_C},
-  {39, 15, nr_ssb_type_A},
-  {39, 30, nr_ssb_type_C},
-  {40, 30, nr_ssb_type_C},
-  {41, 15, nr_ssb_type_A},
-  {41, 30, nr_ssb_type_C},
-  {46, 30, nr_ssb_type_C},
-  {48, 30, nr_ssb_type_C},
-  {50, 30, nr_ssb_type_C},
-  {51, 15, nr_ssb_type_A},
-  {53, 15, nr_ssb_type_A},
-  {65, 15, nr_ssb_type_A},
-  {66, 15, nr_ssb_type_A},
-  {66, 30, nr_ssb_type_B},
-  {70, 15, nr_ssb_type_A},
-  {71, 15, nr_ssb_type_A},
-  {74, 15, nr_ssb_type_A},
-  {75, 15, nr_ssb_type_A},
-  {76, 15, nr_ssb_type_A},
-  {77, 30, nr_ssb_type_C},
-  {78, 30, nr_ssb_type_C},
-  {79, 30, nr_ssb_type_C},
-  {90, 15, nr_ssb_type_A},
-  {90, 30, nr_ssb_type_C},
-  {91, 15, nr_ssb_type_A},
-  {92, 15, nr_ssb_type_A},
-  {93, 15, nr_ssb_type_A},
-  {94, 15, nr_ssb_type_A},
-  {96, 30, nr_ssb_type_C}
-};
-
+static const int nr_ssb_table[48][3] = {
+    {1, 15, nr_ssb_type_A},  {2, 15, nr_ssb_type_A},  {3, 15, nr_ssb_type_A},  {5, 15, nr_ssb_type_A},  {5, 30, nr_ssb_type_B},
+    {7, 15, nr_ssb_type_A},  {8, 15, nr_ssb_type_A},  {12, 15, nr_ssb_type_A}, {14, 15, nr_ssb_type_A}, {18, 15, nr_ssb_type_A},
+    {20, 15, nr_ssb_type_A}, {25, 15, nr_ssb_type_A}, {26, 15, nr_ssb_type_A}, {28, 15, nr_ssb_type_A}, {29, 15, nr_ssb_type_A},
+    {30, 15, nr_ssb_type_A}, {34, 15, nr_ssb_type_A}, {34, 30, nr_ssb_type_C}, {38, 15, nr_ssb_type_A}, {38, 30, nr_ssb_type_C},
+    {39, 15, nr_ssb_type_A}, {39, 30, nr_ssb_type_C}, {40, 30, nr_ssb_type_C}, {41, 15, nr_ssb_type_A}, {41, 30, nr_ssb_type_C},
+    {46, 30, nr_ssb_type_C}, {48, 30, nr_ssb_type_C}, {50, 30, nr_ssb_type_C}, {51, 15, nr_ssb_type_A}, {53, 15, nr_ssb_type_A},
+    {65, 15, nr_ssb_type_A}, {66, 15, nr_ssb_type_A}, {66, 30, nr_ssb_type_B}, {70, 15, nr_ssb_type_A}, {71, 15, nr_ssb_type_A},
+    {74, 15, nr_ssb_type_A}, {75, 15, nr_ssb_type_A}, {76, 15, nr_ssb_type_A}, {77, 30, nr_ssb_type_C}, {78, 30, nr_ssb_type_C},
+    {79, 30, nr_ssb_type_C}, {90, 15, nr_ssb_type_A}, {90, 30, nr_ssb_type_C}, {91, 15, nr_ssb_type_A}, {92, 15, nr_ssb_type_A},
+    {93, 15, nr_ssb_type_A}, {94, 15, nr_ssb_type_A}, {96, 30, nr_ssb_type_C}};
 
 void set_Lmax(NR_DL_FRAME_PARMS *fp) {
+
+  if (get_softmodem_params()->sl_mode == 2) {
+    fp->Lmax = 1;
+    return;
+  }
   // definition of Lmax according to ts 38.213 section 4.1
   if (fp->dl_CarrierFreq < 6e9) {
     if(fp->frame_type && (fp->ssb_type==2))
@@ -190,7 +156,10 @@ void set_scs_parameters (NR_DL_FRAME_PARMS *fp, int mu, int N_RB_DL)
   while(fp->ofdm_symbol_size < N_RB_DL * 12)
     fp->ofdm_symbol_size <<= 1;
 
-  fp->first_carrier_offset = fp->ofdm_symbol_size - (N_RB_DL * 12 / 2);
+  if (get_softmodem_params()->sl_mode == 2)
+    fp->first_carrier_offset = 0;
+  else
+    fp->first_carrier_offset = fp->ofdm_symbol_size - (N_RB_DL * 12 / 2);
   fp->nb_prefix_samples    = fp->ofdm_symbol_size / 128 * 9;
   fp->nb_prefix_samples0   = fp->ofdm_symbol_size / 128 * (9 + (1 << mu));
   LOG_W(PHY,"Init: N_RB_DL %d, first_carrier_offset %d, nb_prefix_samples %d,nb_prefix_samples0 %d, ofdm_symbol_size %d\n",
@@ -323,6 +292,10 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
   LOG_D(PHY,"dl_bw_kHz %lu\n",dl_bw_khz);
   LOG_D(PHY,"dl_CarrierFreq %lu\n",fp->dl_CarrierFreq);
 
+  if (get_softmodem_params()->sl_mode != 0) {
+    fp->sl_CarrierFreq = ((dl_bw_khz >> 1) + config->carrier_config.sl_frequency) * 1000;
+  }
+
   uint64_t ul_bw_khz = (12*config->carrier_config.ul_grid_size[config->ssb_config.scs_common])*(15<<config->ssb_config.scs_common);
   fp->ul_CarrierFreq = ((ul_bw_khz>>1) + config->carrier_config.uplink_frequency)*1000 ;
 
@@ -372,6 +345,9 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
   }
 
   fp->ssb_start_subcarrier = (12 * config->ssb_table.ssb_offset_point_a + sco);
+  if (get_softmodem_params()->sl_mode == 2) {
+      fp->ssb_start_subcarrier = 0;
+  }
   set_Lmax(fp);
 
   fp->L_ssb = (((uint64_t) config->ssb_table.ssb_mask_list[0].ssb_mask)<<32) | config->ssb_table.ssb_mask_list[1].ssb_mask;
@@ -421,6 +397,11 @@ void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, uint64_t downlink
 
 }
 
+void nr_init_frame_parms_ue_sl(NR_DL_FRAME_PARMS *frame_parms, uint64_t sidelink_frequency, uint16_t nr_band) {
+  LOG_D(NR_PHY, "SL init parameters. SL freq %lu\n", sidelink_frequency);
+  frame_parms->sl_CarrierFreq = sidelink_frequency;
+  frame_parms->nr_band = nr_band;
+}
 
 void nr_dump_frame_parms(NR_DL_FRAME_PARMS *fp)
 {

openair1/PHY/INIT/nr_phy_init.h

@@ -29,6 +29,7 @@ int nr_get_ssb_start_symbol(NR_DL_FRAME_PARMS *fp,uint8_t i_ssb);
 int nr_init_frame_parms(nfapi_nr_config_request_scf_t *config, NR_DL_FRAME_PARMS *frame_parms);
 int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms, fapi_nr_config_request_t *config, uint16_t nr_band);
 void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, uint64_t downlink_frequency, int32_t uplink_frequency_offset, uint8_t mu, uint16_t nr_band);
+void nr_init_frame_parms_ue_sl(NR_DL_FRAME_PARMS *frame_parms, uint64_t sidelink_frequency, uint16_t nr_band);
 int init_nr_ue_signal(PHY_VARS_NR_UE *ue,int nb_connected_eNB);
 void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB);
 void init_nr_ue_transport(PHY_VARS_NR_UE *ue);
@@ -55,5 +56,5 @@ void free_nr_ue_ul_harq(NR_UL_UE_HARQ_t harq_list[NR_MAX_ULSCH_HARQ_PROCESSES],
 
 void phy_init_nr_top(PHY_VARS_NR_UE *ue);
 void phy_term_nr_top(void);
-
+void init_dfts(void);
 #endif

openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c

@@ -29,9 +29,40 @@
 #include "openair1/PHY/LTE_TRANSPORT/transport_vars.h"
 
 // round(exp(sqrt(-1)*(pi/2)*[0:1:N-1]/N)*pow2(15))
-static int16_t ru_90[2*128] = {32767, 0,32766, 402,32758, 804,32746, 1206,32729, 1608,32706, 2009,32679, 2411,32647, 2811,32610, 3212,32568, 3612,32522, 4011,32470, 4410,32413, 4808,32352, 5205,32286, 5602,32214, 5998,32138, 6393,32058, 6787,31972, 7180,31881, 7571,31786, 7962,31686, 8351,31581, 8740,31471, 9127,31357, 9512,31238, 9896,31114, 10279,30986, 10660,30853, 11039,30715, 11417,30572, 11793,30425, 12167,30274, 12540,30118, 12910,29957, 13279,29792, 13646,29622, 14010,29448, 14373,29269, 14733,29086, 15091,28899, 15447,28707, 15800,28511, 16151,28311, 16500,28106, 16846,27897, 17190,27684, 17531,27467, 17869,27246, 18205,27020, 18538,26791, 18868,26557, 19195,26320, 19520,26078, 19841,25833, 20160,25583, 20475,25330, 20788,25073, 21097,24812, 21403,24548, 21706,24279, 22006,24008, 22302,23732, 22595,23453, 22884,23170, 23170,22884, 23453,22595, 23732,22302, 24008,22006, 24279,21706, 24548,21403, 24812,21097, 25073,20788, 25330,20475, 25583,20160, 25833,19841, 26078,19520, 26320,19195, 26557,18868, 26791,18538, 27020,18205, 27246,17869, 27467,17531, 27684,17190, 27897,16846, 28106,16500, 28311,16151, 28511,15800, 28707,15447, 28899,15091, 29086,14733, 29269,14373, 29448,14010, 29622,13646, 29792,13279, 29957,12910, 30118,12540, 30274,12167, 30425,11793, 30572,11417, 30715,11039, 30853,10660, 30986,10279, 31114,9896, 31238,9512, 31357,9127, 31471,8740, 31581,8351, 31686,7962, 31786,7571, 31881,7180, 31972,6787, 32058,6393, 32138,5998, 32214,5602, 32286,5205, 32352,4808, 32413,4410, 32470,4011, 32522,3612, 32568,3212, 32610,2811, 32647,2411, 32679,2009, 32706,1608, 32729,1206, 32746,804, 32758,402, 32766};
+static const int16_t ru_90[2 * 128] = {
+    32767, 0,     32766, 402,   32758, 804,   32746, 1206,  32729, 1608,  32706, 2009,  32679, 2411,  32647, 2811,  32610, 3212,
+    32568, 3612,  32522, 4011,  32470, 4410,  32413, 4808,  32352, 5205,  32286, 5602,  32214, 5998,  32138, 6393,  32058, 6787,
+    31972, 7180,  31881, 7571,  31786, 7962,  31686, 8351,  31581, 8740,  31471, 9127,  31357, 9512,  31238, 9896,  31114, 10279,
+    30986, 10660, 30853, 11039, 30715, 11417, 30572, 11793, 30425, 12167, 30274, 12540, 30118, 12910, 29957, 13279, 29792, 13646,
+    29622, 14010, 29448, 14373, 29269, 14733, 29086, 15091, 28899, 15447, 28707, 15800, 28511, 16151, 28311, 16500, 28106, 16846,
+    27897, 17190, 27684, 17531, 27467, 17869, 27246, 18205, 27020, 18538, 26791, 18868, 26557, 19195, 26320, 19520, 26078, 19841,
+    25833, 20160, 25583, 20475, 25330, 20788, 25073, 21097, 24812, 21403, 24548, 21706, 24279, 22006, 24008, 22302, 23732, 22595,
+    23453, 22884, 23170, 23170, 22884, 23453, 22595, 23732, 22302, 24008, 22006, 24279, 21706, 24548, 21403, 24812, 21097, 25073,
+    20788, 25330, 20475, 25583, 20160, 25833, 19841, 26078, 19520, 26320, 19195, 26557, 18868, 26791, 18538, 27020, 18205, 27246,
+    17869, 27467, 17531, 27684, 17190, 27897, 16846, 28106, 16500, 28311, 16151, 28511, 15800, 28707, 15447, 28899, 15091, 29086,
+    14733, 29269, 14373, 29448, 14010, 29622, 13646, 29792, 13279, 29957, 12910, 30118, 12540, 30274, 12167, 30425, 11793, 30572,
+    11417, 30715, 11039, 30853, 10660, 30986, 10279, 31114, 9896,  31238, 9512,  31357, 9127,  31471, 8740,  31581, 8351,  31686,
+    7962,  31786, 7571,  31881, 7180,  31972, 6787,  32058, 6393,  32138, 5998,  32214, 5602,  32286, 5205,  32352, 4808,  32413,
+    4410,  32470, 4011,  32522, 3612,  32568, 3212,  32610, 2811,  32647, 2411,  32679, 2009,  32706, 1608,  32729, 1206,  32746,
+    804,   32758, 402,   32766};
 
-static int16_t ru_90c[2*128] = {32767, 0,32766, -402,32758, -804,32746, -1206,32729, -1608,32706, -2009,32679, -2411,32647, -2811,32610, -3212,32568, -3612,32522, -4011,32470, -4410,32413, -4808,32352, -5205,32286, -5602,32214, -5998,32138, -6393,32058, -6787,31972, -7180,31881, -7571,31786, -7962,31686, -8351,31581, -8740,31471, -9127,31357, -9512,31238, -9896,31114, -10279,30986, -10660,30853, -11039,30715, -11417,30572, -11793,30425, -12167,30274, -12540,30118, -12910,29957, -13279,29792, -13646,29622, -14010,29448, -14373,29269, -14733,29086, -15091,28899, -15447,28707, -15800,28511, -16151,28311, -16500,28106, -16846,27897, -17190,27684, -17531,27467, -17869,27246, -18205,27020, -18538,26791, -18868,26557, -19195,26320, -19520,26078, -19841,25833, -20160,25583, -20475,25330, -20788,25073, -21097,24812, -21403,24548, -21706,24279, -22006,24008, -22302,23732, -22595,23453, -22884,23170, -23170,22884, -23453,22595, -23732,22302, -24008,22006, -24279,21706, -24548,21403, -24812,21097, -25073,20788, -25330,20475, -25583,20160, -25833,19841, -26078,19520, -26320,19195, -26557,18868, -26791,18538, -27020,18205, -27246,17869, -27467,17531, -27684,17190, -27897,16846, -28106,16500, -28311,16151, -28511,15800, -28707,15447, -28899,15091, -29086,14733, -29269,14373, -29448,14010, -29622,13646, -29792,13279, -29957,12910, -30118,12540, -30274,12167, -30425,11793, -30572,11417, -30715,11039, -30853,10660, -30986,10279, -31114,9896, -31238,9512, -31357,9127, -31471,8740, -31581,8351, -31686,7962, -31786,7571, -31881,7180, -31972,6787, -32058,6393, -32138,5998, -32214,5602, -32286,5205, -32352,4808, -32413,4410, -32470,4011, -32522,3612, -32568,3212, -32610,2811, -32647,2411, -32679,2009, -32706,1608, -32729,1206, -32746,804, -32758,402, -32766};
+static const int16_t ru_90c[2 * 128] = {
+    32767, 0,      32766, -402,   32758, -804,   32746, -1206,  32729, -1608,  32706, -2009,  32679, -2411,  32647, -2811,
+    32610, -3212,  32568, -3612,  32522, -4011,  32470, -4410,  32413, -4808,  32352, -5205,  32286, -5602,  32214, -5998,
+    32138, -6393,  32058, -6787,  31972, -7180,  31881, -7571,  31786, -7962,  31686, -8351,  31581, -8740,  31471, -9127,
+    31357, -9512,  31238, -9896,  31114, -10279, 30986, -10660, 30853, -11039, 30715, -11417, 30572, -11793, 30425, -12167,
+    30274, -12540, 30118, -12910, 29957, -13279, 29792, -13646, 29622, -14010, 29448, -14373, 29269, -14733, 29086, -15091,
+    28899, -15447, 28707, -15800, 28511, -16151, 28311, -16500, 28106, -16846, 27897, -17190, 27684, -17531, 27467, -17869,
+    27246, -18205, 27020, -18538, 26791, -18868, 26557, -19195, 26320, -19520, 26078, -19841, 25833, -20160, 25583, -20475,
+    25330, -20788, 25073, -21097, 24812, -21403, 24548, -21706, 24279, -22006, 24008, -22302, 23732, -22595, 23453, -22884,
+    23170, -23170, 22884, -23453, 22595, -23732, 22302, -24008, 22006, -24279, 21706, -24548, 21403, -24812, 21097, -25073,
+    20788, -25330, 20475, -25583, 20160, -25833, 19841, -26078, 19520, -26320, 19195, -26557, 18868, -26791, 18538, -27020,
+    18205, -27246, 17869, -27467, 17531, -27684, 17190, -27897, 16846, -28106, 16500, -28311, 16151, -28511, 15800, -28707,
+    15447, -28899, 15091, -29086, 14733, -29269, 14373, -29448, 14010, -29622, 13646, -29792, 13279, -29957, 12910, -30118,
+    12540, -30274, 12167, -30425, 11793, -30572, 11417, -30715, 11039, -30853, 10660, -30986, 10279, -31114, 9896,  -31238,
+    9512,  -31357, 9127,  -31471, 8740,  -31581, 8351,  -31686, 7962,  -31786, 7571,  -31881, 7180,  -31972, 6787,  -32058,
+    6393,  -32138, 5998,  -32214, 5602,  -32286, 5205,  -32352, 4808,  -32413, 4410,  -32470, 4011,  -32522, 3612,  -32568,
+    3212,  -32610, 2811,  -32647, 2411,  -32679, 2009,  -32706, 1608,  -32729, 1206,  -32746, 804,   -32758, 402,   -32766};
 
 #define SCALE 0x3FFF
 
@@ -51,8 +82,8 @@ int32_t lte_ul_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
   uint8_t harq_pid; 
 
   int16_t delta_phase = 0;
-  int16_t *ru1 = ru_90;
-  int16_t *ru2 = ru_90;
+  const int16_t *ru1 = ru_90;
+  const int16_t *ru2 = ru_90;
   int16_t current_phase1,current_phase2;
   uint16_t aa,Msc_RS,Msc_RS_idx;
   uint16_t *Msc_idx_ptr;
@@ -67,8 +98,8 @@ int32_t lte_ul_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
   uint32_t v=frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[Ns+(subframe<<1)];
   int symbol_offset,i;
   //debug_msg("lte_ul_channel_estimation: cyclic shift %d\n",cyclicShift);
-  int16_t alpha_re[12] = {32767, 28377, 16383,     0,-16384,  -28378,-32768,-28378,-16384,    -1, 16383, 28377};
-  int16_t alpha_im[12] = {0,     16383, 28377, 32767, 28377,   16383,     0,-16384,-28378,-32768,-28378,-16384};
+  const int16_t alpha_re[12] = {32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384, -1, 16383, 28377};
+  const int16_t alpha_im[12] = {0, 16383, 28377, 32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384};
 #if defined(__x86_64__) || defined(__i386__)
   __m128i *rxdataF128,*ul_ref128,*ul_ch128;
   __m128i mmtmpU0,mmtmpU1,mmtmpU2,mmtmpU3;
@@ -390,8 +421,8 @@ int32_t lte_ul_channel_estimation_RRU(LTE_DL_FRAME_PARMS *frame_parms,
                                       int interpolate,
                                       uint16_t rnti) {
   int16_t delta_phase = 0;
-  int16_t *ru1 = ru_90;
-  int16_t *ru2 = ru_90;
+  const int16_t *ru1 = ru_90;
+  const int16_t *ru2 = ru_90;
   int16_t current_phase1,current_phase2;
   uint16_t aa,Msc_RS,Msc_RS_idx;
   uint16_t *Msc_idx_ptr;
@@ -403,8 +434,8 @@ int32_t lte_ul_channel_estimation_RRU(LTE_DL_FRAME_PARMS *frame_parms,
   int32_t tmp_estimates[N_rb_alloc*12] __attribute__((aligned(16)));
   int symbol_offset,i;
   //debug_msg("lte_ul_channel_estimation_RRU: cyclic shift %d\n",cyclicShift);
-  int16_t alpha_re[12] = {32767, 28377, 16383,     0,-16384,  -28378,-32768,-28378,-16384,    -1, 16383, 28377};
-  int16_t alpha_im[12] = {0,     16383, 28377, 32767, 28377,   16383,     0,-16384,-28378,-32768,-28378,-16384};
+  const int16_t alpha_re[12] = {32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384, -1, 16383, 28377};
+  const int16_t alpha_im[12] = {0, 16383, 28377, 32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384};
 #if defined(__x86_64__) || defined(__i386__)
   __m128i *rxdataF128,*ul_ref128,*ul_ch128;
   __m128i mmtmpU0,mmtmpU1,mmtmpU2,mmtmpU3;

openair1/PHY/LTE_REFSIG/lte_ul_ref.c

@@ -28,18 +28,52 @@
 #include "PHY/defs_eNB.h"
 #include "openair1/PHY/LTE_TRANSPORT/transport_vars.h"
 
-const uint16_t ref_primes[34] = {11, 23, 31, 47, 59, 71, 89, 107, 113, 139, 179, 191, 211, 239, 283, 293, 317, 359, 383, 431, 479, 523, 571, 599, 647, 719, 761, 863, 887, 953, 971, 1069, 1151, 1193};
+static const uint16_t ref_primes[34] = {11,  23,  31,  47,  59,  71,  89,  107, 113, 139, 179, 191, 211, 239, 283,  293,  317,
+                                        359, 383, 431, 479, 523, 571, 599, 647, 719, 761, 863, 887, 953, 971, 1069, 1151, 1193};
 
 int16_t *ul_ref_sigs[30][2][34];
 int16_t *ul_ref_sigs_rx[30][2][34]; //these contain the sequences in repeated format and quantized to QPSK ifdef IFFT_FPGA
 
 /* 36.211 table 5.5.1.2-1 */
-char ref12[360] = {-1,1,3,-3,3,3,1,1,3,1,-3,3,1,1,3,3,3,-1,1,-3,-3,1,-3,3,1,1,-3,-3,-3,-1,-3,-3,1,-3,1,-1,-1,1,1,1,1,-1,-3,-3,1,-3,3,-1,-1,3,1,-1,1,-1,-3,-1,1,-1,1,3,1,-3,3,-1,-1,1,1,-1,-1,3,-3,1,-1,3,-3,-3,-3,3,1,-1,3,3,-3,1,-3,-1,-1,-1,1,-3,3,-1,1,-3,3,1,1,-3,3,1,-1,-1,-1,1,1,3,-1,1,1,-3,-1,3,3,-1,-3,1,1,1,1,1,-1,3,-1,1,1,-3,-3,-1,-3,-3,3,-1,3,1,-1,-1,3,3,-3,1,3,1,3,3,1,-3,1,1,-3,1,1,1,-3,-3,-3,1,3,3,-3,3,-3,1,1,3,-1,-3,3,3,-3,1,-1,-3,-1,3,1,3,3,3,-1,1,3,-1,1,-3,-1,-1,1,1,3,1,-1,-3,1,3,1,-1,1,3,3,3,-1,-1,3,-1,-3,1,1,3,-3,3,-3,-3,3,1,3,-1,-3,3,1,1,-3,1,-3,-3,-1,-1,1,-3,-1,3,1,3,1,-1,-1,3,-3,-1,-3,-1,-1,-3,1,1,1,1,3,1,-1,1,-3,-1,-1,3,-1,1,-3,-3,-3,-3,-3,1,-1,-3,1,1,-3,-3,-3,-3,-1,3,-3,1,-3,3,1,1,-1,-3,-1,-3,1,-1,1,3,-1,1,1,1,3,1,3,3,-1,1,-1,-3,-3,1,1,-3,3,3,1,3,3,1,-3,-1,-1,3,1,3,-3,-3,3,-3,1,-1,-1,3,-1,-3,-3,-1,-3,-1,-3,3,1,-1,1,3,-3,-3,-1,3,-3,3,-1,3,3,-3,3,3,-1,-1,3,-3,-3,-1,-1,-3,-1,3,-3,3,1,-1};
+static const char ref12[360] = {
+    -1, 1,  3,  -3, 3,  3,  1,  1,  3,  1,  -3, 3,  1,  1,  3,  3,  3,  -1, 1,  -3, -3, 1,  -3, 3,  1,  1,  -3, -3, -3, -1,
+    -3, -3, 1,  -3, 1,  -1, -1, 1,  1,  1,  1,  -1, -3, -3, 1,  -3, 3,  -1, -1, 3,  1,  -1, 1,  -1, -3, -1, 1,  -1, 1,  3,
+    1,  -3, 3,  -1, -1, 1,  1,  -1, -1, 3,  -3, 1,  -1, 3,  -3, -3, -3, 3,  1,  -1, 3,  3,  -3, 1,  -3, -1, -1, -1, 1,  -3,
+    3,  -1, 1,  -3, 3,  1,  1,  -3, 3,  1,  -1, -1, -1, 1,  1,  3,  -1, 1,  1,  -3, -1, 3,  3,  -1, -3, 1,  1,  1,  1,  1,
+    -1, 3,  -1, 1,  1,  -3, -3, -1, -3, -3, 3,  -1, 3,  1,  -1, -1, 3,  3,  -3, 1,  3,  1,  3,  3,  1,  -3, 1,  1,  -3, 1,
+    1,  1,  -3, -3, -3, 1,  3,  3,  -3, 3,  -3, 1,  1,  3,  -1, -3, 3,  3,  -3, 1,  -1, -3, -1, 3,  1,  3,  3,  3,  -1, 1,
+    3,  -1, 1,  -3, -1, -1, 1,  1,  3,  1,  -1, -3, 1,  3,  1,  -1, 1,  3,  3,  3,  -1, -1, 3,  -1, -3, 1,  1,  3,  -3, 3,
+    -3, -3, 3,  1,  3,  -1, -3, 3,  1,  1,  -3, 1,  -3, -3, -1, -1, 1,  -3, -1, 3,  1,  3,  1,  -1, -1, 3,  -3, -1, -3, -1,
+    -1, -3, 1,  1,  1,  1,  3,  1,  -1, 1,  -3, -1, -1, 3,  -1, 1,  -3, -3, -3, -3, -3, 1,  -1, -3, 1,  1,  -3, -3, -3, -3,
+    -1, 3,  -3, 1,  -3, 3,  1,  1,  -1, -3, -1, -3, 1,  -1, 1,  3,  -1, 1,  1,  1,  3,  1,  3,  3,  -1, 1,  -1, -3, -3, 1,
+    1,  -3, 3,  3,  1,  3,  3,  1,  -3, -1, -1, 3,  1,  3,  -3, -3, 3,  -3, 1,  -1, -1, 3,  -1, -3, -3, -1, -3, -1, -3, 3,
+    1,  -1, 1,  3,  -3, -3, -1, 3,  -3, 3,  -1, 3,  3,  -3, 3,  3,  -1, -1, 3,  -3, -3, -1, -1, -3, -1, 3,  -3, 3,  1,  -1};
 
 /* 36.211 table 5.5.1.2-2 */
-char ref24[720] = {
-  -1,3,1,-3,3,-1,1,3,-3,3,1,3,-3,3,1,1,-1,1,3,-3,3,-3,-1,-3,-3,3,-3,-3,-3,1,-3,-3,3,-1,1,1,1,3,1,-1,3,-3,-3,1,3,1,1,-3,3,-1,3,3,1,1,-3,3,3,3,3,1,-1,3,-1,1,1,-1,-3,-1,-1,1,3,3,-1,-3,1,1,3,-3,1,1,-3,-1,-1,1,3,1,3,1,-1,3,1,1,-3,-1,-3,-1,-1,-1,-1,-3,-3,-1,1,1,3,3,-1,3,-1,1,-1,-3,1,-1,-3,-3,1,-3,-1,-1,-3,1,1,3,-1,1,3,1,-3,1,-3,1,1,-1,-1,3,-1,-3,3,-3,-3,-3,1,1,1,1,-1,-1,3,-3,-3,3,-3,1,-1,-1,1,-1,1,1,-1,-3,-1,1,-1,3,-1,-3,-3,3,3,-1,-1,-3,-1,3,1,3,1,3,1,1,-1,3,1,-1,1,3,-3,-1,-1,1,-3,1,3,-3,1,-1,-3,3,-3,3,-1,-1,-1,-1,1,-3,-3,-3,1,-3,-3,-3,1,-3,1,1,-3,3,3,-1,-3,-1,3,-3,3,3,3,-1,1,1,-3,1,-1,1,1,-3,1,1,-1,1,-3,-3,3,-1,3,-1,-1,-3,-3,-3,-1,-3,-3,1,-1,1,3,3,-1,1,-1,3,1,3,3,-3,-3,1,3,1,-1,-3,-3,-3,3,3,-3,3,3,-1,-3,3,-1,1,-3,1,1,3,3,1,1,1,-1,-1,1,-3,3,-1,1,1,-3,3,3,-1,-3,3,-3,-1,-3,-1,3,-1,-1,-1,-1,-3,-1,3,3,1,-1,1,3,3,3,-1,1,1,-3,1,3,-1,-3,3,-3,-3,3,1,3,1,-3,3,1,3,1,1,3,3,-1,-1,-3,1,-3,-1,3,1,1,3,-1,-1,1,-3,1,3,-3,1,-1,-3,-1,3,1,3,1,-1,-3,-3,-1,-1,-3,-3,-3,-1,-1,-3,3,-1,-1,-1,-1,1,1,-3,3,1,3,3,1,-1,1,-3,1,-3,1,1,-3,-1,1,3,-1,3,3,-1,-3,1,-1,-3,3,3,3,-1,1,1,3,-1,-3,-1,3,-1,-1,-1,1,1,1,1,1,-1,3,-1,-3,1,1,3,-3,1,-3,-1,1,1,-3,-3,3,1,1,-3,1,3,3,1,-1,-3,3,-1,3,3,3,-3,1,-1,1,-1,-3,-1,1,3,-1,3,-3,-3,-1,-3,3,-3,-3,-3,-1,-1,-3,-1,-3,3,1,3,-3,-1,3,-1,1,-1,3,-3,1,-1,-3,-3,1,1,-1,1,-1,1,-1,3,1,-3,-1,1,-1,1,-1,-1,3,3,-3,-1,1,-3,-3,-1,-3,3,1,-1,-3,-1,-3,-3,3,-3,3,-3,-1,1,3,1,-3,1,3,3,-1,-3,-1,-1,-1,-1,3,3,3,1,3,3,-3,1,3,-1,3,-1,3,3,-3,3,1,-1,3,3,1,-1,3,3,-1,-3,3,-3,-1,-1,3,-1,3,-1,-1,1,1,1,1,-1,-1,-3,-1,3,1,-1,1,-1,3,-1,3,1,1,-1,-1,-3,1,1,-3,1,3,-3,1,1,-3,-3,-1,-1,-3,-1,1,3,1,1,-3,-1,-1,-3,3,-3,3,1,-3,3,-3,1,-1,1,-3,1,1,1,-1,-3,3,3,1,1,3,-1,-3,-1,-1,-1,3,1,-3,-3,-1,3,-3,-1,-3,-1,-3,-1,-1,-3,-1,-1,1,-3,-1,-1,1,-1,-3,1,1,-3,1,-3,-3,3,1,1,-1,3,-1,-1,1,1,-1,-1,-3,-1,3,-1,3,-1,1,3,1,-1,3,1,3,-3,-3,1,-1,-1,1,3
-};
+static const char ref24[720] = {
+    -1, 3,  1,  -3, 3,  -1, 1,  3,  -3, 3,  1,  3,  -3, 3,  1,  1,  -1, 1,  3,  -3, 3,  -3, -1, -3, -3, 3,  -3, -3, -3, 1,  -3, -3,
+    3,  -1, 1,  1,  1,  3,  1,  -1, 3,  -3, -3, 1,  3,  1,  1,  -3, 3,  -1, 3,  3,  1,  1,  -3, 3,  3,  3,  3,  1,  -1, 3,  -1, 1,
+    1,  -1, -3, -1, -1, 1,  3,  3,  -1, -3, 1,  1,  3,  -3, 1,  1,  -3, -1, -1, 1,  3,  1,  3,  1,  -1, 3,  1,  1,  -3, -1, -3, -1,
+    -1, -1, -1, -3, -3, -1, 1,  1,  3,  3,  -1, 3,  -1, 1,  -1, -3, 1,  -1, -3, -3, 1,  -3, -1, -1, -3, 1,  1,  3,  -1, 1,  3,  1,
+    -3, 1,  -3, 1,  1,  -1, -1, 3,  -1, -3, 3,  -3, -3, -3, 1,  1,  1,  1,  -1, -1, 3,  -3, -3, 3,  -3, 1,  -1, -1, 1,  -1, 1,  1,
+    -1, -3, -1, 1,  -1, 3,  -1, -3, -3, 3,  3,  -1, -1, -3, -1, 3,  1,  3,  1,  3,  1,  1,  -1, 3,  1,  -1, 1,  3,  -3, -1, -1, 1,
+    -3, 1,  3,  -3, 1,  -1, -3, 3,  -3, 3,  -1, -1, -1, -1, 1,  -3, -3, -3, 1,  -3, -3, -3, 1,  -3, 1,  1,  -3, 3,  3,  -1, -3, -1,
+    3,  -3, 3,  3,  3,  -1, 1,  1,  -3, 1,  -1, 1,  1,  -3, 1,  1,  -1, 1,  -3, -3, 3,  -1, 3,  -1, -1, -3, -3, -3, -1, -3, -3, 1,
+    -1, 1,  3,  3,  -1, 1,  -1, 3,  1,  3,  3,  -3, -3, 1,  3,  1,  -1, -3, -3, -3, 3,  3,  -3, 3,  3,  -1, -3, 3,  -1, 1,  -3, 1,
+    1,  3,  3,  1,  1,  1,  -1, -1, 1,  -3, 3,  -1, 1,  1,  -3, 3,  3,  -1, -3, 3,  -3, -1, -3, -1, 3,  -1, -1, -1, -1, -3, -1, 3,
+    3,  1,  -1, 1,  3,  3,  3,  -1, 1,  1,  -3, 1,  3,  -1, -3, 3,  -3, -3, 3,  1,  3,  1,  -3, 3,  1,  3,  1,  1,  3,  3,  -1, -1,
+    -3, 1,  -3, -1, 3,  1,  1,  3,  -1, -1, 1,  -3, 1,  3,  -3, 1,  -1, -3, -1, 3,  1,  3,  1,  -1, -3, -3, -1, -1, -3, -3, -3, -1,
+    -1, -3, 3,  -1, -1, -1, -1, 1,  1,  -3, 3,  1,  3,  3,  1,  -1, 1,  -3, 1,  -3, 1,  1,  -3, -1, 1,  3,  -1, 3,  3,  -1, -3, 1,
+    -1, -3, 3,  3,  3,  -1, 1,  1,  3,  -1, -3, -1, 3,  -1, -1, -1, 1,  1,  1,  1,  1,  -1, 3,  -1, -3, 1,  1,  3,  -3, 1,  -3, -1,
+    1,  1,  -3, -3, 3,  1,  1,  -3, 1,  3,  3,  1,  -1, -3, 3,  -1, 3,  3,  3,  -3, 1,  -1, 1,  -1, -3, -1, 1,  3,  -1, 3,  -3, -3,
+    -1, -3, 3,  -3, -3, -3, -1, -1, -3, -1, -3, 3,  1,  3,  -3, -1, 3,  -1, 1,  -1, 3,  -3, 1,  -1, -3, -3, 1,  1,  -1, 1,  -1, 1,
+    -1, 3,  1,  -3, -1, 1,  -1, 1,  -1, -1, 3,  3,  -3, -1, 1,  -3, -3, -1, -3, 3,  1,  -1, -3, -1, -3, -3, 3,  -3, 3,  -3, -1, 1,
+    3,  1,  -3, 1,  3,  3,  -1, -3, -1, -1, -1, -1, 3,  3,  3,  1,  3,  3,  -3, 1,  3,  -1, 3,  -1, 3,  3,  -3, 3,  1,  -1, 3,  3,
+    1,  -1, 3,  3,  -1, -3, 3,  -3, -1, -1, 3,  -1, 3,  -1, -1, 1,  1,  1,  1,  -1, -1, -3, -1, 3,  1,  -1, 1,  -1, 3,  -1, 3,  1,
+    1,  -1, -1, -3, 1,  1,  -3, 1,  3,  -3, 1,  1,  -3, -3, -1, -1, -3, -1, 1,  3,  1,  1,  -3, -1, -1, -3, 3,  -3, 3,  1,  -3, 3,
+    -3, 1,  -1, 1,  -3, 1,  1,  1,  -1, -3, 3,  3,  1,  1,  3,  -1, -3, -1, -1, -1, 3,  1,  -3, -3, -1, 3,  -3, -1, -3, -1, -3, -1,
+    -1, -3, -1, -1, 1,  -3, -1, -1, 1,  -1, -3, 1,  1,  -3, 1,  -3, -3, 3,  1,  1,  -1, 3,  -1, -1, 1,  1,  -1, -1, -3, -1, 3,  -1,
+    3,  -1, 1,  3,  1,  -1, 3,  1,  3,  -3, -3, 1,  -1, -1, 1,  3};
 
 void generate_ul_ref_sigs(void) {
   double qbar,phase;

openair1/PHY/LTE_TRANSPORT/dci_tools_common.c

@@ -40,8 +40,7 @@
 #include "transport_common_proto.h"
 #include "SCHED/sched_common.h"
 //#define DEBUG_HARQ
-
-
+#include "openair1/PHY/LTE_TRANSPORT/dci_tools_common_extern.h"
 
 //#define DEBUG_DCI
 
@@ -98,69 +97,7 @@ uint16_t RIV2nb_rb_LUT100[6000];
 uint16_t RIV2first_rb_LUT100[6000];
 uint16_t RIV_max100=0;
 
-
-extern uint32_t current_dlsch_cqi;
-
-// Table 8.6.3-3 36.213
-uint16_t beta_cqi[16] = {0,   //reserved
-                         0,   //reserved
-                         9,   //1.125
-                         10,  //1.250
-                         11,  //1.375
-                         13,  //1.625
-                         14,  //1.750
-                         16,  //2.000
-                         18,  //2.250
-                         20,  //2.500
-                         23,  //2.875
-                         25,  //3.125
-                         28,  //3.500
-                         32,  //4.000
-                         40,  //5.000
-                         50
-                        }; //6.250
-
-// Table 8.6.3-2 36.213
-uint16_t beta_ri[16] = {10,   //1.250
-                        13,   //1.625
-                        16,   //2.000
-                        20,   //2.500
-                        25,   //3.125
-                        32,   //4.000
-                        40,   //5.000
-                        50,   //6.250
-                        64,   //8.000
-                        80,   //10.000
-                        101,  //12.625
-                        127,  //15.875
-                        160,  //20.000
-                        0,    //reserved
-                        0,    //reserved
-                        0
-                       };   //reserved
-
-// Table 8.6.3-2 36.213
-uint16_t beta_ack[16] = {16,  //2.000
-                         20,  //2.500
-                         25,  //3.125
-                         32,  //4.000
-                         40,  //5.000
-                         50,  //6.250
-                         64,  //8.000
-                         80,  //10.000
-                         101, //12.625
-                         127, //15.875
-                         160, //20.000
-                         248, //31.000
-                         400, //50.000
-                         640, //80.000
-                         808
-                        };//126.00
-
-int8_t delta_PUSCH_abs[4] = {-4,-1,1,4};
-int8_t delta_PUSCH_acc[4] = {-1,0,1,3};
-
-int8_t *delta_PUCCH_lut = delta_PUSCH_acc;
+const int8_t *delta_PUCCH_lut = delta_PUSCH_acc;
 
 uint32_t check_phich_reg(LTE_DL_FRAME_PARMS *frame_parms,uint32_t kprime,uint8_t lprime,uint8_t mi)
 {

openair1/PHY/LTE_TRANSPORT/dci_tools_common_extern.h

@@ -84,6 +84,6 @@ extern uint16_t RIV2nb_rb_LUT100[6000];
 extern uint16_t RIV2first_rb_LUT100[6000];
 extern uint16_t RIV_max100;
 
-extern int8_t *delta_PUCCH_lut;
-extern int8_t delta_PUSCH_acc[4];
-extern int8_t delta_PUSCH_abs[4];
+extern const int8_t *delta_PUCCH_lut;
+extern const int8_t delta_PUSCH_acc[4];
+extern const int8_t delta_PUSCH_abs[4];

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

@@ -131,8 +131,8 @@ void layer1prec2A(int32_t *antenna0_sample, int32_t *antenna1_sample, uint8_t pr
       ((int16_t *)antenna1_sample)[1] = (int16_t)((((int16_t *)antenna1_sample)[1]*ONE_OVER_SQRT2_Q15)>>15);  */
 }
 
-uint32_t FOUR[2]={0,4};
-uint32_t TWO[2]={0,2};
+static const uint32_t FOUR[2] = {0, 4};
+static const uint32_t TWO[2] = {0, 2};
 
 int allocate_REs_in_RB_no_pilots_QPSK_siso(PHY_VARS_eNB* phy_vars_eNB,
                                            int **txdataF,

openair1/PHY/LTE_TRANSPORT/phich.c

@@ -44,11 +44,6 @@
 
 //unsigned short phich_reg[MAX_NUM_PHICH_GROUPS][3];
 
-
-
-int32_t alam_bpsk_perm1[4] = {2,1,4,3}; // -conj(x) 1 (-1-j) -> 2 (1-j), 2->1, 3 (-1+j) -> (4) 1+j, 4->3
-int32_t alam_bpsk_perm2[4] = {3,4,2,1}; // conj(x) 1 (-1-j) -> 3 (-1+j), 3->1, 2 (1-j) -> 4 (1+j), 4->2
-
 // This routine generates the PHICH
 
 void generate_phich(LTE_DL_FRAME_PARMS *frame_parms,

openair1/PHY/LTE_TRANSPORT/power_control.c

@@ -28,10 +28,10 @@ double ratioPB[2][4]={{ 1.0,4.0/5.0,3.0/5.0,2.0/5.0},
           { 5.0/4.0,1.0,3.0/4.0,1.0/2.0}};
 */
 
-double ratioPB[2][4]={{ 0.00000,  -0.96910,  -2.21849,  -3.97940}, //in db
-                      { 0.96910,   0.00000,  -1.24939,  -3.01030}};
+static const double ratioPB[2][4] = {{0.00000, -0.96910, -2.21849, -3.97940}, // in db
+                                     {0.96910, 0.00000, -1.24939, -3.01030}};
 
-double pa_values[8]={-6.0,-4.77,-3.0,-1.77,0.0,1.0,2.0,3.0}; //reported by higher layers
+static const double pa_values[8] = {-6.0, -4.77, -3.0, -1.77, 0.0, 1.0, 2.0, 3.0}; // reported by higher layers
 
 double get_pa_dB(uint8_t pa)
 {

openair1/PHY/LTE_TRANSPORT/prach_common.c

@@ -36,9 +36,9 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "common/utils/lte/prach_utils.h"
 
-uint16_t NCS_unrestricted[16] = {0,13,15,18,22,26,32,38,46,59,76,93,119,167,279,419};
-uint16_t NCS_restricted[15]   = {15,18,22,26,32,38,46,55,68,82,100,128,158,202,237}; // high-speed case
-uint16_t NCS_4[7]             = {2,4,6,8,10,12,15};
+const uint16_t NCS_unrestricted[16] = {0, 13, 15, 18, 22, 26, 32, 38, 46, 59, 76, 93, 119, 167, 279, 419};
+const uint16_t NCS_restricted[15] = {15, 18, 22, 26, 32, 38, 46, 55, 68, 82, 100, 128, 158, 202, 237}; // high-speed case
+const uint16_t NCS_4[7] = {2, 4, 6, 8, 10, 12, 15};
 
 int16_t ru[2*839]; // quantized roots of unity
 uint32_t ZC_inv[839]; // multiplicative inverse for roots u
@@ -259,66 +259,41 @@ PRACH_TDD_PREAMBLE_MAP tdd_preamble_map[64][7] = {
 
 */
 
-uint16_t prach_root_sequence_map0_3[838] = { 129, 710, 140, 699, 120, 719, 210, 629, 168, 671, 84, 755, 105, 734, 93, 746, 70, 769, 60, 779,
-                                             2, 837, 1, 838,
-                                             56, 783, 112, 727, 148, 691,
-                                             80, 759, 42, 797, 40, 799,
-                                             35, 804, 73, 766, 146, 693,
-                                             31, 808, 28, 811, 30, 809, 27, 812, 29, 810,
-                                             24, 815, 48, 791, 68, 771, 74, 765, 178, 661, 136, 703,
-                                             86, 753, 78, 761, 43, 796, 39, 800, 20, 819, 21, 818,
-                                             95, 744, 202, 637, 190, 649, 181, 658, 137, 702, 125, 714, 151, 688,
-                                             217, 622, 128, 711, 142, 697, 122, 717, 203, 636, 118, 721, 110, 729, 89, 750, 103, 736, 61,
-                                             778, 55, 784, 15, 824, 14, 825,
-                                             12, 827, 23, 816, 34, 805, 37, 802, 46, 793, 207, 632, 179, 660, 145, 694, 130, 709, 223, 616,
-                                             228, 611, 227, 612, 132, 707, 133, 706, 143, 696, 135, 704, 161, 678, 201, 638, 173, 666, 106,
-                                             733, 83, 756, 91, 748, 66, 773, 53, 786, 10, 829, 9, 830,
-                                             7, 832, 8, 831, 16, 823, 47, 792, 64, 775, 57, 782, 104, 735, 101, 738, 108, 731, 208, 631, 184,
-                                             655, 197, 642, 191, 648, 121, 718, 141, 698, 149, 690, 216, 623, 218, 621,
-                                             152, 687, 144, 695, 134, 705, 138, 701, 199, 640, 162, 677, 176, 663, 119, 720, 158, 681, 164,
-                                             675, 174, 665, 171, 668, 170, 669, 87, 752, 169, 670, 88, 751, 107, 732, 81, 758, 82, 757, 100,
-                                             739, 98, 741, 71, 768, 59, 780, 65, 774, 50, 789, 49, 790, 26, 813, 17, 822, 13, 826, 6, 833,
-                                             5, 834, 33, 806, 51, 788, 75, 764, 99, 740, 96, 743, 97, 742, 166, 673, 172, 667, 175, 664, 187,
-                                             652, 163, 676, 185, 654, 200, 639, 114, 725, 189, 650, 115, 724, 194, 645, 195, 644, 192, 647,
-                                             182, 657, 157, 682, 156, 683, 211, 628, 154, 685, 123, 716, 139, 700, 212, 627, 153, 686, 213,
-                                             626, 215, 624, 150, 689,
-                                             225, 614, 224, 615, 221, 618, 220, 619, 127, 712, 147, 692, 124, 715, 193, 646, 205, 634, 206,
-                                             633, 116, 723, 160, 679, 186, 653, 167, 672, 79, 760, 85, 754, 77, 762, 92, 747, 58, 781, 62,
-                                             777, 69, 770, 54, 785, 36, 803, 32, 807, 25, 814, 18, 821, 11, 828, 4, 835,
-                                             3, 836, 19, 820, 22, 817, 41, 798, 38, 801, 44, 795, 52, 787, 45, 794, 63, 776, 67, 772, 72,
-                                             767, 76, 763, 94, 745, 102, 737, 90, 749, 109, 730, 165, 674, 111, 728, 209, 630, 204, 635, 117,
-                                             722, 188, 651, 159, 680, 198, 641, 113, 726, 183, 656, 180, 659, 177, 662, 196, 643, 155, 684,
-                                             214, 625, 126, 713, 131, 708, 219, 620, 222, 617, 226, 613,
-                                             230, 609, 232, 607, 262, 577, 252, 587, 418, 421, 416, 423, 413, 426, 411, 428, 376, 463, 395,
-                                             444, 283, 556, 285, 554, 379, 460, 390, 449, 363, 476, 384, 455, 388, 451, 386, 453, 361, 478,
-                                             387, 452, 360, 479, 310, 529, 354, 485, 328, 511, 315, 524, 337, 502, 349, 490, 335, 504, 324,
-                                             515,
-                                             323, 516, 320, 519, 334, 505, 359, 480, 295, 544, 385, 454, 292, 547, 291, 548, 381, 458, 399,
-                                             440, 380, 459, 397, 442, 369, 470, 377, 462, 410, 429, 407, 432, 281, 558, 414, 425, 247, 592,
-                                             277, 562, 271, 568, 272, 567, 264, 575, 259, 580,
-                                             237, 602, 239, 600, 244, 595, 243, 596, 275, 564, 278, 561, 250, 589, 246, 593, 417, 422, 248,
-                                             591, 394, 445, 393, 446, 370, 469, 365, 474, 300, 539, 299, 540, 364, 475, 362, 477, 298, 541,
-                                             312, 527, 313, 526, 314, 525, 353, 486, 352, 487, 343, 496, 327, 512, 350, 489, 326, 513, 319,
-                                             520, 332, 507, 333, 506, 348, 491, 347, 492, 322, 517,
-                                             330, 509, 338, 501, 341, 498, 340, 499, 342, 497, 301, 538, 366, 473, 401, 438, 371, 468, 408,
-                                             431, 375, 464, 249, 590, 269, 570, 238, 601, 234, 605,
-                                             257, 582, 273, 566, 255, 584, 254, 585, 245, 594, 251, 588, 412, 427, 372, 467, 282, 557, 403,
-                                             436, 396, 443, 392, 447, 391, 448, 382, 457, 389, 450, 294, 545, 297, 542, 311, 528, 344, 495,
-                                             345, 494, 318, 521, 331, 508, 325, 514, 321, 518,
-                                             346, 493, 339, 500, 351, 488, 306, 533, 289, 550, 400, 439, 378, 461, 374, 465, 415, 424, 270,
-                                             569, 241, 598,
-                                             231, 608, 260, 579, 268, 571, 276, 563, 409, 430, 398, 441, 290, 549, 304, 535, 308, 531, 358,
-                                             481, 316, 523,
-                                             293, 546, 288, 551, 284, 555, 368, 471, 253, 586, 256, 583, 263, 576,
-                                             242, 597, 274, 565, 402, 437, 383, 456, 357, 482, 329, 510,
-                                             317, 522, 307, 532, 286, 553, 287, 552, 266, 573, 261, 578,
-                                             236, 603, 303, 536, 356, 483,
-                                             355, 484, 405, 434, 404, 435, 406, 433,
-                                             235, 604, 267, 572, 302, 537,
-                                             309, 530, 265, 574, 233, 606,
-                                             367, 472, 296, 543,
-                                             336, 503, 305, 534, 373, 466, 280, 559, 279, 560, 419, 420, 240, 599, 258, 581, 229, 610
-                                           };
+const uint16_t prach_root_sequence_map0_3[838] = {
+    129, 710, 140, 699, 120, 719, 210, 629, 168, 671, 84,  755, 105, 734, 93,  746, 70,  769, 60,  779, 2,   837, 1,   838, 56,
+    783, 112, 727, 148, 691, 80,  759, 42,  797, 40,  799, 35,  804, 73,  766, 146, 693, 31,  808, 28,  811, 30,  809, 27,  812,
+    29,  810, 24,  815, 48,  791, 68,  771, 74,  765, 178, 661, 136, 703, 86,  753, 78,  761, 43,  796, 39,  800, 20,  819, 21,
+    818, 95,  744, 202, 637, 190, 649, 181, 658, 137, 702, 125, 714, 151, 688, 217, 622, 128, 711, 142, 697, 122, 717, 203, 636,
+    118, 721, 110, 729, 89,  750, 103, 736, 61,  778, 55,  784, 15,  824, 14,  825, 12,  827, 23,  816, 34,  805, 37,  802, 46,
+    793, 207, 632, 179, 660, 145, 694, 130, 709, 223, 616, 228, 611, 227, 612, 132, 707, 133, 706, 143, 696, 135, 704, 161, 678,
+    201, 638, 173, 666, 106, 733, 83,  756, 91,  748, 66,  773, 53,  786, 10,  829, 9,   830, 7,   832, 8,   831, 16,  823, 47,
+    792, 64,  775, 57,  782, 104, 735, 101, 738, 108, 731, 208, 631, 184, 655, 197, 642, 191, 648, 121, 718, 141, 698, 149, 690,
+    216, 623, 218, 621, 152, 687, 144, 695, 134, 705, 138, 701, 199, 640, 162, 677, 176, 663, 119, 720, 158, 681, 164, 675, 174,
+    665, 171, 668, 170, 669, 87,  752, 169, 670, 88,  751, 107, 732, 81,  758, 82,  757, 100, 739, 98,  741, 71,  768, 59,  780,
+    65,  774, 50,  789, 49,  790, 26,  813, 17,  822, 13,  826, 6,   833, 5,   834, 33,  806, 51,  788, 75,  764, 99,  740, 96,
+    743, 97,  742, 166, 673, 172, 667, 175, 664, 187, 652, 163, 676, 185, 654, 200, 639, 114, 725, 189, 650, 115, 724, 194, 645,
+    195, 644, 192, 647, 182, 657, 157, 682, 156, 683, 211, 628, 154, 685, 123, 716, 139, 700, 212, 627, 153, 686, 213, 626, 215,
+    624, 150, 689, 225, 614, 224, 615, 221, 618, 220, 619, 127, 712, 147, 692, 124, 715, 193, 646, 205, 634, 206, 633, 116, 723,
+    160, 679, 186, 653, 167, 672, 79,  760, 85,  754, 77,  762, 92,  747, 58,  781, 62,  777, 69,  770, 54,  785, 36,  803, 32,
+    807, 25,  814, 18,  821, 11,  828, 4,   835, 3,   836, 19,  820, 22,  817, 41,  798, 38,  801, 44,  795, 52,  787, 45,  794,
+    63,  776, 67,  772, 72,  767, 76,  763, 94,  745, 102, 737, 90,  749, 109, 730, 165, 674, 111, 728, 209, 630, 204, 635, 117,
+    722, 188, 651, 159, 680, 198, 641, 113, 726, 183, 656, 180, 659, 177, 662, 196, 643, 155, 684, 214, 625, 126, 713, 131, 708,
+    219, 620, 222, 617, 226, 613, 230, 609, 232, 607, 262, 577, 252, 587, 418, 421, 416, 423, 413, 426, 411, 428, 376, 463, 395,
+    444, 283, 556, 285, 554, 379, 460, 390, 449, 363, 476, 384, 455, 388, 451, 386, 453, 361, 478, 387, 452, 360, 479, 310, 529,
+    354, 485, 328, 511, 315, 524, 337, 502, 349, 490, 335, 504, 324, 515, 323, 516, 320, 519, 334, 505, 359, 480, 295, 544, 385,
+    454, 292, 547, 291, 548, 381, 458, 399, 440, 380, 459, 397, 442, 369, 470, 377, 462, 410, 429, 407, 432, 281, 558, 414, 425,
+    247, 592, 277, 562, 271, 568, 272, 567, 264, 575, 259, 580, 237, 602, 239, 600, 244, 595, 243, 596, 275, 564, 278, 561, 250,
+    589, 246, 593, 417, 422, 248, 591, 394, 445, 393, 446, 370, 469, 365, 474, 300, 539, 299, 540, 364, 475, 362, 477, 298, 541,
+    312, 527, 313, 526, 314, 525, 353, 486, 352, 487, 343, 496, 327, 512, 350, 489, 326, 513, 319, 520, 332, 507, 333, 506, 348,
+    491, 347, 492, 322, 517, 330, 509, 338, 501, 341, 498, 340, 499, 342, 497, 301, 538, 366, 473, 401, 438, 371, 468, 408, 431,
+    375, 464, 249, 590, 269, 570, 238, 601, 234, 605, 257, 582, 273, 566, 255, 584, 254, 585, 245, 594, 251, 588, 412, 427, 372,
+    467, 282, 557, 403, 436, 396, 443, 392, 447, 391, 448, 382, 457, 389, 450, 294, 545, 297, 542, 311, 528, 344, 495, 345, 494,
+    318, 521, 331, 508, 325, 514, 321, 518, 346, 493, 339, 500, 351, 488, 306, 533, 289, 550, 400, 439, 378, 461, 374, 465, 415,
+    424, 270, 569, 241, 598, 231, 608, 260, 579, 268, 571, 276, 563, 409, 430, 398, 441, 290, 549, 304, 535, 308, 531, 358, 481,
+    316, 523, 293, 546, 288, 551, 284, 555, 368, 471, 253, 586, 256, 583, 263, 576, 242, 597, 274, 565, 402, 437, 383, 456, 357,
+    482, 329, 510, 317, 522, 307, 532, 286, 553, 287, 552, 266, 573, 261, 578, 236, 603, 303, 536, 356, 483, 355, 484, 405, 434,
+    404, 435, 406, 433, 235, 604, 267, 572, 302, 537, 309, 530, 265, 574, 233, 606, 367, 472, 296, 543, 336, 503, 305, 534, 373,
+    466, 280, 559, 279, 560, 419, 420, 240, 599, 258, 581, 229, 610};
 
 uint16_t prach_root_sequence_map4[138] = {  1,138,2,137,3,136,4,135,5,134,6,133,7,132,8,131,9,130,10,129,
                                             11,128,12,127,13,126,14,125,15,124,16,123,17,122,18,121,19,120,20,119,
@@ -350,7 +325,7 @@ void dump_prach_config(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe) {
 void fill_du(uint8_t prach_fmt) {
   uint16_t iu,u,p;
   uint16_t N_ZC;
-  uint16_t *prach_root_sequence_map;
+  const uint16_t *prach_root_sequence_map;
 
   if (prach_fmt<4) {
     N_ZC = 839;
@@ -405,7 +380,7 @@ void compute_prach_seq(uint16_t rootSequenceIndex,
   unsigned int k,inv_u,i,NCS=0,num_preambles;
   int N_ZC;
   uint8_t prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type);
-  uint16_t *prach_root_sequence_map;
+  const uint16_t *prach_root_sequence_map;
   uint16_t u, preamble_offset;
   uint16_t n_shift_ra,n_shift_ra_bar, d_start,numshift;
   uint8_t not_found;

openair1/PHY/LTE_TRANSPORT/prach_extern.h

@@ -40,9 +40,9 @@
 //#define PRACH_DEBUG 1
 //#define PRACH_WRITE_OUTPUT_DEBUG 1
 
-extern uint16_t NCS_unrestricted[16];
-extern uint16_t NCS_restricted[15];
-extern uint16_t NCS_4[7];
+extern const uint16_t NCS_unrestricted[16];
+extern const uint16_t NCS_restricted[15];
+extern const uint16_t NCS_4[7];
 
 extern int16_t ru[2*839]; // quantized roots of unity
 extern uint32_t ZC_inv[839]; // multiplicative inverse for roots u

openair1/PHY/LTE_TRANSPORT/pucch.c

@@ -44,26 +44,20 @@
 
 #include "pucch_extern.h"
 
-int16_t cfo_pucch_np[24*7] = {20787,-25330,27244,-18205,31356,-9512,32767,0,31356,9511,27244,18204,20787,25329,
-                              27244,-18205,30272,-12540,32137,-6393,32767,0,32137,6392,30272,12539,27244,18204,
-                              31356,-9512,32137,-6393,32609,-3212,32767,0,32609,3211,32137,6392,31356,9511,
-                              32767,0,32767,0,32767,0,32767,0,32767,0,32767,0,32767,0,
-                              31356,9511,32137,6392,32609,3211,32767,0,32609,-3212,32137,-6393,31356,-9512,
-                              27244,18204,30272,12539,32137,6392,32767,0,32137,-6393,30272,-12540,27244,-18205,
-                              20787,25329,27244,18204,31356,9511,32767,0,31356,-9512,27244,-18205,20787,-25330
-                             };
-
-int16_t cfo_pucch_ep[24*6] = {24278,-22005,29621,-14010,32412,-4808,32412,4807,29621,14009,24278,22004,
-                              28897,-15447,31356,-9512,32609,-3212,32609,3211,31356,9511,28897,15446,
-                              31785,-7962,32412,-4808,32727,-1608,32727,1607,32412,4807,31785,7961,
-                              32767,0,32767,0,32767,0,32767,0,32767,0,32767,0,
-                              31785,7961,32412,4807,32727,1607,32727,-1608,32412,-4808,31785,-7962,
-                              28897,15446,31356,9511,32609,3211,32609,-3212,31356,-9512,28897,-15447,
-                              24278,22004,29621,14009,32412,4807,32412,-4808,29621,-14010,24278,-22005
-                             };
-
-
+static const int16_t cfo_pucch_np[24 * 7] = {
+    20787,  -25330, 27244, -18205, 31356, -9512, 32767, 0,     31356, 9511,  27244,  18204, 20787, 25329,  27244, -18205, 30272,
+    -12540, 32137,  -6393, 32767,  0,     32137, 6392,  30272, 12539, 27244, 18204,  31356, -9512, 32137,  -6393, 32609,  -3212,
+    32767,  0,      32609, 3211,   32137, 6392,  31356, 9511,  32767, 0,     32767,  0,     32767, 0,      32767, 0,      32767,
+    0,      32767,  0,     32767,  0,     31356, 9511,  32137, 6392,  32609, 3211,   32767, 0,     32609,  -3212, 32137,  -6393,
+    31356,  -9512,  27244, 18204,  30272, 12539, 32137, 6392,  32767, 0,     32137,  -6393, 30272, -12540, 27244, -18205, 20787,
+    25329,  27244,  18204, 31356,  9511,  32767, 0,     31356, -9512, 27244, -18205, 20787, -25330};
 
+static const int16_t cfo_pucch_ep[24 * 6] = {
+    24278, -22005, 29621, -14010, 32412, -4808, 32412, 4807,  29621, 14009, 24278, 22004, 28897, -15447, 31356, -9512, 32609,
+    -3212, 32609,  3211,  31356,  9511,  28897, 15446, 31785, -7962, 32412, -4808, 32727, -1608, 32727,  1607,  32412, 4807,
+    31785, 7961,   32767, 0,      32767, 0,     32767, 0,     32767, 0,     32767, 0,     32767, 0,      31785, 7961,  32412,
+    4807,  32727,  1607,  32727,  -1608, 32412, -4808, 31785, -7962, 28897, 15446, 31356, 9511,  32609,  3211,  32609, -3212,
+    31356, -9512,  28897, -15447, 24278, 22004, 29621, 14009, 32412, 4807,  32412, -4808, 29621, -14010, 24278, -22005};
 
 void dump_uci_stats(FILE *fd,PHY_VARS_eNB *eNB,int frame) {
 
@@ -194,10 +188,10 @@ uint16_t pucchfmt3_Baseseq_csh_remove( int16_t SubCarrierDeMapData[4][14][12][2]
 }
 
 #define MAXROW_TBL_SF5_OS_IDX    (5)    // Orthogonal sequence index
-const int16_t TBL_3_SF5_GEN_N_DASH_NS[MAXROW_TBL_SF5_OS_IDX] = {0,3,6,8,10};
+static const int16_t TBL_3_SF5_GEN_N_DASH_NS[MAXROW_TBL_SF5_OS_IDX] = {0, 3, 6, 8, 10};
 
 #define MAXROW_TBL_SF4_OS_IDX    (4)    // Orthogonal sequence index
-const int16_t TBL_3_SF4_GEN_N_DASH_NS[MAXROW_TBL_SF4_OS_IDX] = {0,3,6,9};
+static const int16_t TBL_3_SF4_GEN_N_DASH_NS[MAXROW_TBL_SF4_OS_IDX] = {0, 3, 6, 9};
 
 /* Channel estimation */
 uint16_t pucchfmt3_ChannelEstimation( int16_t SubCarrierDeMapData[4][14][12][2],
@@ -532,12 +526,10 @@ const int16_t TBL_3_SF5[MAXROW_TBL_SF5][MAXCLM_TBL_SF5][2] = {
 
 #define  MAXROW_TBL_SF4_fmt3 4
 #define  MAXCLM_TBL_SF4      4
-const int16_t TBL_3_SF4[MAXROW_TBL_SF4_fmt3][MAXCLM_TBL_SF4][2] = {
-  { {32767,0}, {32767,0}, {32767,0}, {32767,0}},
-  { {32767,0}, {-32767,0}, {32767,0}, {-32767,0}},
-  { {32767,0}, {32767,0}, {-32767,0}, {-32767,0}},
-  { {32767,0}, {-32767,0}, {-32767,0}, {32767,0}}
-};
+static const int16_t TBL_3_SF4[MAXROW_TBL_SF4_fmt3][MAXCLM_TBL_SF4][2] = {{{32767, 0}, {32767, 0}, {32767, 0}, {32767, 0}},
+                                                                          {{32767, 0}, {-32767, 0}, {32767, 0}, {-32767, 0}},
+                                                                          {{32767, 0}, {32767, 0}, {-32767, 0}, {-32767, 0}},
+                                                                          {{32767, 0}, {-32767, 0}, {-32767, 0}, {32767, 0}}};
 
 /* orthogonal sequence remove */
 uint16_t pucchfmt3_OrthSeqRemove( int16_t RemoveFrqDev_fmt3[4][2][5][12][2],
@@ -918,7 +910,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
   int16_t tmp_re,tmp_im,W_re=0,W_im=0;
   int16_t *rxptr;
   uint32_t symbol_offset;
-  int16_t stat0_ref_re[4],stat0_ref_im[4],stat1_ref_re[4],stat1_ref_im[4],*cfo;
+  int16_t stat0_ref_re[4], stat0_ref_im[4], stat1_ref_re[4], stat1_ref_im[4];
   int16_t chest0_re[4][12],chest0_im[4][12];
   int16_t chest1_re[4][12],chest1_im[4][12];
   int32_t chest_mag;
@@ -1214,7 +1206,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
 	    stat1_re[aa]=0;
 	    stat1_im[aa]=0;
             off=re<<1;
-            cfo =  (frame_parms->Ncp==0) ? &cfo_pucch_np[14*phase] : &cfo_pucch_ep[12*phase];
+            const int16_t *cfo = (frame_parms->Ncp == 0) ? &cfo_pucch_np[14 * phase] : &cfo_pucch_ep[12 * phase];
 
             for (l=0; l<(nsymb>>1); l++) {
               stat0_re[aa] += (((rxcomp[aa][off]*(int32_t)cfo[l<<1])>>15)     - ((rxcomp[aa][1+off]*(int32_t)cfo[1+(l<<1)])>>15))/nsymb;
@@ -1318,7 +1310,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
             stat0_ref_re[aa]=0;
             stat0_ref_im[aa]=0;
             off=re<<1;
-            cfo =  (frame_parms->Ncp==0) ? &cfo_pucch_np[14*phase] : &cfo_pucch_ep[12*phase];
+            const int16_t *cfo = (frame_parms->Ncp == 0) ? &cfo_pucch_np[14 * phase] : &cfo_pucch_ep[12 * phase];
 
             for (l=0; l<(nsymb>>1); l++) {
               if ((l<2)||(l>(nsymb>>1) - 3)) {  //data symbols
@@ -1398,7 +1390,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
       if (sigma2_dB<(dB_fixed(stat_max) - (IS_SOFTMODEM_IQPLAYER?0:pucch1_thres)) ) {//
         chL = (nsymb>>1)-4;
         chest_mag=0;
-        cfo =  (frame_parms->Ncp==0) ? &cfo_pucch_np[14*phase_max] : &cfo_pucch_ep[12*phase_max];
+        const int16_t *cfo = (frame_parms->Ncp == 0) ? &cfo_pucch_np[14 * phase_max] : &cfo_pucch_ep[12 * phase_max];
 
         for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
           for (re=0; re<12; re++) {

openair1/PHY/LTE_TRANSPORT/pucch_common.c

@@ -72,197 +72,300 @@ void init_ncs_cell(LTE_DL_FRAME_PARMS *frame_parms,uint8_t ncs_cell[20][7])
   }
 }
 
-int16_t W4[3][4] = {{32767, 32767, 32767, 32767},
-  {32767,-32768, 32767,-32768},
-  {32767,-32768,-32768, 32767}
-};
-int16_t W3_re[3][6] = {{32767, 32767, 32767},
-  {32767,-16384,-16384},
-  {32767,-16384,-16384}
-};
+const int16_t W4[3][4] = {{32767, 32767, 32767, 32767}, {32767, -32768, 32767, -32768}, {32767, -32768, -32768, 32767}};
+const int16_t W3_re[3][6] = {{32767, 32767, 32767}, {32767, -16384, -16384}, {32767, -16384, -16384}};
 
-int16_t W3_im[3][6] = {{0    ,0     ,0     },
-  {0    , 28377,-28378},
-  {0    ,-28378, 28377}
-};
+const int16_t W3_im[3][6] = {{0, 0, 0}, {0, 28377, -28378}, {0, -28378, 28377}};
 
-char *pucch_format_string[] = {
-  "format 1",
-  "format 1a",
-  "format 1b",
-  "pucch_format1b_csA2",
-  "pucch_format1b_csA3",
-  "pucch_format1b_csA4",
-  "format 2",
-  "format 2a",
-  "format 2b",
-  "pucch_format3"
-};
+const uint8_t chcod_tbl[128][48] = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                                    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                                     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
+                                    {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1,
+                                     1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1},
+                                    {0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0,
+                                     0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0},
+                                    {0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1,
+                                     1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+                                    {1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0,
+                                     0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1},
+                                    {1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0,
+                                     0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1},
+                                    {0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1,
+                                     1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0},
+                                    {0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0,
+                                     1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0},
+                                    {1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1,
+                                     0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1},
+                                    {1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1,
+                                     0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1},
+                                    {0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0,
+                                     1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0},
+                                    {0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1,
+                                     0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0},
+                                    {1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0,
+                                     1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1},
+                                    {1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0,
+                                     1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1},
+                                    {0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1,
+                                     0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0},
+                                    {0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1,
+                                     1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1},
+                                    {1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
+                                     0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0},
+                                    {1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0,
+                                     0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0},
+                                    {0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1,
+                                     1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1},
+                                    {0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0,
+                                     0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1},
+                                    {1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1,
+                                     1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0},
+                                    {1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1,
+                                     1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
+                                    {0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0,
+                                     0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1},
+                                    {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1,
+                                     0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1},
+                                    {1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0,
+                                     1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0},
+                                    {1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0,
+                                     1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0},
+                                    {0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1,
+                                     0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1},
+                                    {0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0,
+                                     1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1},
+                                    {1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1,
+                                     0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0},
+                                    {1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1,
+                                     0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0},
+                                    {0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0,
+                                     1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1},
+                                    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0,
+                                     0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1},
+                                    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
+                                     1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0},
+                                    {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1,
+                                     1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0},
+                                    {0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0,
+                                     0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1},
+                                    {0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1,
+                                     1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1},
+                                    {1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0,
+                                     0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0},
+                                    {1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0,
+                                     0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0},
+                                    {0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1,
+                                     1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1},
+                                    {0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0,
+                                     1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1},
+                                    {1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1,
+                                     0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0},
+                                    {1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1,
+                                     0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0},
+                                    {0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0,
+                                     1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1},
+                                    {0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1,
+                                     0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1},
+                                    {1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0,
+                                     1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0},
+                                    {1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0,
+                                     1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0},
+                                    {0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1,
+                                     0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1},
+                                    {0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1,
+                                     1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0},
+                                    {1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0,
+                                     0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1},
+                                    {1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0,
+                                     0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1},
+                                    {0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1,
+                                     1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0},
+                                    {0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0,
+                                     0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0},
+                                    {1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1,
+                                     1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1},
+                                    {1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1,
+                                     1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1},
+                                    {0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0,
+                                     0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0},
+                                    {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1,
+                                     0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0},
+                                    {1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0,
+                                     1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1},
+                                    {1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0,
+                                     1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1},
+                                    {0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1,
+                                     0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0},
+                                    {0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0,
+                                     1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+                                    {1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1,
+                                     0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1},
+                                    {1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1,
+                                     0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1},
+                                    {0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0,
+                                     1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0},
+                                    {0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0,
+                                     1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1},
+                                    {1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1,
+                                     0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0},
+                                    {1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1,
+                                     0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0},
+                                    {0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0,
+                                     1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1},
+                                    {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1,
+                                     0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
+                                    {1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0,
+                                     1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0},
+                                    {1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0,
+                                     1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0},
+                                    {0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1,
+                                     0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1},
+                                    {0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0,
+                                     0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1},
+                                    {1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1,
+                                     1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
+                                    {1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1,
+                                     1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0},
+                                    {0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0,
+                                     0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1},
+                                    {0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+                                     1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1},
+                                    {1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
+                                     0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0},
+                                    {1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0,
+                                     0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0},
+                                    {0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
+                                     1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1},
+                                    {0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1,
+                                     0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0},
+                                    {1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0,
+                                     1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1},
+                                    {1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+                                     1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1},
+                                    {0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+                                     0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0},
+                                    {0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0,
+                                     1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0},
+                                    {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1,
+                                     0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1},
+                                    {1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1,
+                                     0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1},
+                                    {0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,
+                                     1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0},
+                                    {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1,
+                                     1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0},
+                                    {1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
+                                     0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1},
+                                    {1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0,
+                                     0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1},
+                                    {0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1,
+                                     1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0},
+                                    {0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0,
+                                     0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0},
+                                    {1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1,
+                                     1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1},
+                                    {1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1,
+                                     1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1},
+                                    {0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0,
+                                     0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0},
+                                    {0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0,
+                                     1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0},
+                                    {1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1,
+                                     0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1},
+                                    {1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1,
+                                     0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1},
+                                    {0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0,
+                                     1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0},
+                                    {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1,
+                                     0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0},
+                                    {1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0,
+                                     1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1},
+                                    {1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0,
+                                     1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1},
+                                    {0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1,
+                                     0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0},
+                                    {0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0,
+                                     0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0},
+                                    {1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1,
+                                     1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1},
+                                    {1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1,
+                                     1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1},
+                                    {0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0,
+                                     0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0},
+                                    {0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1,
+                                     1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0},
+                                    {1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0,
+                                     0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1},
+                                    {1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+                                     0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1},
+                                    {0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+                                     1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0},
+                                    {0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1,
+                                     0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1},
+                                    {1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0,
+                                     1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0},
+                                    {1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
+                                     1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0},
+                                    {0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1,
+                                     0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1},
+                                    {0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0,
+                                     1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1},
+                                    {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1,
+                                     0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
+                                    {1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1,
+                                     0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0},
+                                    {0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0,
+                                     1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1},
+                                    {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1,
+                                     1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
+                                    {1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0,
+                                     0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0},
+                                    {1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0,
+                                     0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0},
+                                    {0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1,
+                                     1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1},
+                                    {0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0,
+                                     0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1},
+                                    {1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1,
+                                     1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0},
+                                    {1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1,
+                                     1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0},
+                                    {0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0,
+                                     0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1}};
 
-
-
-uint8_t chcod_tbl[128][48] = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-  {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
-  {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1},
-  {0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0},
-  {0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0},
-  {1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1},
-  {1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1},
-  {0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0},
-  {0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0},
-  {1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1},
-  {1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1},
-  {0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0},
-  {0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0},
-  {1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1},
-  {1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1},
-  {0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0},
-  {0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1},
-  {1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0},
-  {1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0},
-  {0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1},
-  {0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1},
-  {1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0},
-  {1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0},
-  {0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1},
-  {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1},
-  {1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0},
-  {1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0},
-  {0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1},
-  {0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1},
-  {1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0},
-  {1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0},
-  {0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1},
-  {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1},
-  {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0},
-  {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0},
-  {0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1},
-  {0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1},
-  {1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0},
-  {1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0},
-  {0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1},
-  {0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1},
-  {1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0},
-  {1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0},
-  {0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1},
-  {0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1},
-  {1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0},
-  {1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0},
-  {0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1},
-  {0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0},
-  {1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1},
-  {1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1},
-  {0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0},
-  {0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0},
-  {1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1},
-  {1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1},
-  {0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0},
-  {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0},
-  {1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1},
-  {1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1},
-  {0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0},
-  {0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-  {1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1},
-  {1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1},
-  {0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0},
-  {0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1},
-  {1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0},
-  {1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0},
-  {0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1},
-  {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-  {1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0},
-  {1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0},
-  {0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1},
-  {0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1},
-  {1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0},
-  {1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0},
-  {0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1},
-  {0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1},
-  {1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0},
-  {1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0},
-  {0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1},
-  {0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0},
-  {1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1},
-  {1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1},
-  {0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0},
-  {0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0},
-  {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1},
-  {1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1},
-  {0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0},
-  {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0},
-  {1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1},
-  {1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1},
-  {0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0},
-  {0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0},
-  {1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1},
-  {1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1},
-  {0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0},
-  {0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0},
-  {1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1},
-  {1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1},
-  {0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0},
-  {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0},
-  {1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1},
-  {1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1},
-  {0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0},
-  {0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0},
-  {1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1},
-  {1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1},
-  {0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0},
-  {0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0},
-  {1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1},
-  {1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1},
-  {0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0},
-  {0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1},
-  {1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0},
-  {1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0},
-  {0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1},
-  {0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1},
-  {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
-  {1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0, 1, 0, 0, 0},
-  {0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1},
-  {0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
-  {1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0},
-  {1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0},
-  {0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1},
-  {0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1},
-  {1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0},
-  {1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0},
-  {0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1} };
-
-int16_t alpha_re[12] = {32767, 28377, 16383,     0,-16384,  -28378,-32768,-28378,-16384,    -1, 16383, 28377};
-int16_t alpha_im[12] = {0,     16383, 28377, 32767, 28377,   16383,     0,-16384,-28378,-32768,-28378,-16384};
+const int16_t alpha_re[12] = {32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384, -1, 16383, 28377};
+const int16_t alpha_im[12] = {0, 16383, 28377, 32767, 28377, 16383, 0, -16384, -28378, -32768, -28378, -16384};
 
 // W5_TBL
-int16_t W5_fmt3_re[5][5] = { {32767, 32767, 32767, 32767, 32767},
-  {32767, 10125, -26509, -26509, 10125},
-  {32767, -26509, 10125, 10125, -26509},
-  {32767, -26509, 10125, 10125, -26509},
-  {32767, 10125, -26509, -26509, 10125} };
+const int16_t W5_fmt3_re[5][5] = {{32767, 32767, 32767, 32767, 32767},
+                                  {32767, 10125, -26509, -26509, 10125},
+                                  {32767, -26509, 10125, 10125, -26509},
+                                  {32767, -26509, 10125, 10125, -26509},
+                                  {32767, 10125, -26509, -26509, 10125}};
 
-int16_t W5_fmt3_im[5][5] = { {0, 0, 0, 0, 0},
-  {0, 31163, 19259, -19259, -31163},
-  {0, 19259, -31163, 31163, -19259},
-  {0, -19259, 31163, -31163, 19259},
-  {0, -31163, -19259, 19259, 31163} };
+const int16_t W5_fmt3_im[5][5] = {{0, 0, 0, 0, 0},
+                                  {0, 31163, 19259, -19259, -31163},
+                                  {0, 19259, -31163, 31163, -19259},
+                                  {0, -19259, 31163, -31163, 19259},
+                                  {0, -31163, -19259, 19259, 31163}};
 
-int16_t W4_fmt3[4][4] = { {32767, 32767, 32767, 32767},
-  {32767, -32767, 32767, -32767},
-  {32767, 32767, -32767, -32767},
-  {32767, -32767, -32767, 32767} };
+const int16_t W4_fmt3[4][4] = {{32767, 32767, 32767, 32767},
+                               {32767, -32767, 32767, -32767},
+                               {32767, 32767, -32767, -32767},
+                               {32767, -32767, -32767, 32767}};
 
 // W2 TBL
-int16_t W2[2] = {32767, 32767};
+const int16_t W2[2] = {32767, 32767};
 
 // e^j*pai*floor (ncs_cell(ns,l)/64)/2
-int16_t RotTBL_re[4] = {32767, 0, -32767, 0};
-int16_t RotTBL_im[4] = {0, 32767, 0, -32767};
+const int16_t RotTBL_re[4] = {32767, 0, -32767, 0};
+const int16_t RotTBL_im[4] = {0, 32767, 0, -32767};
 
 //np4_tbl, np5_tbl
-uint8_t Np5_TBL[5] = {0, 3, 6, 8, 10};
-uint8_t Np4_TBL[4] = {0, 3, 6, 9};
+const uint8_t Np5_TBL[5] = {0, 3, 6, 8, 10};
+const uint8_t Np4_TBL[4] = {0, 3, 6, 9};
 
 // alpha_TBL
-int16_t alphaTBL_re[12] = {32767, 28377, 16383, 0, -16383, -28377, -32767, -28377, -16383, 0, 16383, 28377};
-int16_t alphaTBL_im[12] = {0, 16383, 28377, 32767, 28377, 16383, 0, -16383, -28377, -32767, -28377, -16383};
-
+const int16_t alphaTBL_re[12] = {32767, 28377, 16383, 0, -16383, -28377, -32767, -28377, -16383, 0, 16383, 28377};
+const int16_t alphaTBL_im[12] = {0, 16383, 28377, 32767, 28377, 16383, 0, -16383, -28377, -32767, -28377, -16383};

openair1/PHY/LTE_TRANSPORT/pucch_extern.h

@@ -47,37 +47,45 @@
 #define D_NPUCCH_SF5    5
 #define D_NPUCCH_SF4    4
 
-extern int16_t W4[3][4];
+extern const int16_t W4[3][4];
 
-extern int16_t W3_re[3][6];
+extern const int16_t W3_re[3][6];
 
+extern const int16_t W3_im[3][6];
 
-extern int16_t W3_im[3][6];
+extern const int16_t alpha_re[12];
+extern const int16_t alpha_im[12];
 
-extern int16_t alpha_re[12];
-extern int16_t alpha_im[12];
+static char const* const pucch_format_string[] = {"format 1",
+                                                  "format 1a",
+                                                  "format 1b",
+                                                  "pucch_format1b_csA2",
+                                                  "pucch_format1b_csA3",
+                                                  "pucch_format1b_csA4",
+                                                  "format 2",
+                                                  "format 2a",
+                                                  "format 2b",
+                                                  "pucch_format3"};
 
-extern char *pucch_format_string[];
+extern const uint8_t chcod_tbl[128][48];
 
-extern uint8_t chcod_tbl[128][48];
+extern const int16_t W5_fmt3_re[5][5];
 
-extern int16_t W5_fmt3_re[5][5];
+extern const int16_t W5_fmt3_im[5][5];
 
-extern int16_t W5_fmt3_im[5][5];
+extern const int16_t W4_fmt3[4][4];
 
-extern int16_t W4_fmt3[4][4];
+extern const int16_t W2[2];
 
-extern int16_t W2[2];
-
-extern int16_t RotTBL_re[4];
-extern int16_t RotTBL_im[4];
+extern const int16_t RotTBL_re[4];
+extern const int16_t RotTBL_im[4];
 
 //np4_tbl, np5_tbl
-extern uint8_t Np5_TBL[5];
-extern uint8_t Np4_TBL[4];
+extern const uint8_t Np5_TBL[5];
+extern const uint8_t Np4_TBL[4];
 
 // alpha_TBL
-extern int16_t alphaTBL_re[12];
-extern int16_t alphaTBL_im[12];
+extern const int16_t alphaTBL_re[12];
+extern const int16_t alphaTBL_im[12];
 
 #endif

openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c

@@ -32,6 +32,7 @@
 
 #include "PHY/defs_UE.h"
 #include "PHY/phy_extern_ue.h"
+#include "PHY/phy_extern.h"
 #include "SCHED_UE/sched_UE.h"
 #ifdef DEBUG_DCI_TOOLS
 #include "PHY/phy_vars.h"
@@ -63,10 +64,6 @@
 
 int flag_LA=0;
 
-extern uint16_t beta_cqi[16];
-extern uint16_t beta_ri[16];
-extern uint16_t beta_ack[16];
-
 static const double p_qpsk[8] = {5982.42405670359,
                                  -21568.1135917693,
                                  31293.9987036905,

openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c

@@ -33,51 +33,31 @@
 #include "PHY/phy_extern.h"
 #include "common/utils/LOG/log.h"
 
-static unsigned short msrsb_6_40[8][4] = {
-  {36, 12, 4, 4},
-  {32, 16, 8, 4},
-  {24, 4, 4, 4},
-  {20, 4, 4, 4},
-  {16, 4, 4, 4},
-  {12, 4, 4, 4},
-  {8, 4, 4, 4},
-  {4, 4, 4, 4}
-};
+static const unsigned short msrsb_6_40[8][4] =
+    {{36, 12, 4, 4}, {32, 16, 8, 4}, {24, 4, 4, 4}, {20, 4, 4, 4}, {16, 4, 4, 4}, {12, 4, 4, 4}, {8, 4, 4, 4}, {4, 4, 4, 4}};
 
-static unsigned short msrsb_41_60[8][4] = {
-  {48,24,12,4},
-  {48,16,8,4},
-  {40,20,4,4},
-  {36,12,4,4},
-  {32,16,8,4},
-  {24,4,4,4},
-  {20,4,4,4},
-  {16,4,4,4}
-};
+static const unsigned short msrsb_41_60[8][4] =
+    {{48, 24, 12, 4}, {48, 16, 8, 4}, {40, 20, 4, 4}, {36, 12, 4, 4}, {32, 16, 8, 4}, {24, 4, 4, 4}, {20, 4, 4, 4}, {16, 4, 4, 4}};
 
-static unsigned short msrsb_61_80[8][4] = {
-  {72,24,12,4},
-  {64,32,16,4},
-  {60,20,4,4},
-  {48,24,12,4},
-  {48,16,8,4},
-  {40,20,4,4},
-  {36,12,4,4},
-  {32,16,8,4}
-};
+static const unsigned short msrsb_61_80[8][4] = {{72, 24, 12, 4},
+                                                 {64, 32, 16, 4},
+                                                 {60, 20, 4, 4},
+                                                 {48, 24, 12, 4},
+                                                 {48, 16, 8, 4},
+                                                 {40, 20, 4, 4},
+                                                 {36, 12, 4, 4},
+                                                 {32, 16, 8, 4}};
 
-static unsigned short msrsb_81_110[8][4] = {
-  {96,48,24,4},
-  {96,32,16,4},
-  {80,40,20,4},
-  {72,24,12,4},
-  {64,32,16,4},
-  {60,20,4,4},
-  {48,24,12,4},
-  {48,16,8,4}
-};
+static const unsigned short msrsb_81_110[8][4] = {{96, 48, 24, 4},
+                                                  {96, 32, 16, 4},
+                                                  {80, 40, 20, 4},
+                                                  {72, 24, 12, 4},
+                                                  {64, 32, 16, 4},
+                                                  {60, 20, 4, 4},
+                                                  {48, 24, 12, 4},
+                                                  {48, 16, 8, 4}};
 
-unsigned short transmission_offset_tdd[16] = {2,6,10,18,14,22,26,30,70,74,194,326,586,210};
+// static const unsigned short transmission_offset_tdd[16] = {2,6,10,18,14,22,26,30,70,74,194,326,586,210};
 
 int compareints (const void * a, const void * b)
 {

openair1/PHY/MODULATION/modulation_common.h

@@ -51,7 +51,7 @@ void PHY_ofdm_mod(int *input,
 void normal_prefix_mod(int32_t *txdataF,int32_t *txdata,uint8_t nsymb,LTE_DL_FRAME_PARMS *frame_parms);
 void nr_normal_prefix_mod(c16_t *txdataF, c16_t *txdata, uint8_t nsymb, NR_DL_FRAME_PARMS *frame_parms, uint32_t slot);
 
-void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms);
+void do_OFDM_mod(c16_t **txdataF, c16_t **txdata, uint32_t frame,uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms);
 
 
 /** @}*/

openair1/PHY/MODULATION/nr_modulation.c

@@ -23,98 +23,90 @@
 #include "PHY/NR_REFSIG/nr_mod_table.h"
 
 //Table 6.3.1.5-1 Precoding Matrix W 1 layer 2 antenna ports 'n' = -1 and 'o' = -j
-char nr_W_1l_2p[6][2][1] = {
-  {{'1'}, {'0'}},//pmi 0
-  {{'0'}, {'1'}},
-  {{'1'}, {'1'}},
-  {{'1'}, {'n'}},
-  {{'1'}, {'j'}},
-  {{'1'}, {'o'}}//pmi 5
+const char nr_W_1l_2p[6][2][1] = {
+    {{'1'}, {'0'}}, // pmi 0
+    {{'0'}, {'1'}},
+    {{'1'}, {'1'}},
+    {{'1'}, {'n'}},
+    {{'1'}, {'j'}},
+    {{'1'}, {'o'}} // pmi 5
 };
 
 //Table 6.3.1.5-3 Precoding Matrix W 1 layer 4 antenna ports 'n' = -1 and 'o' = -j
-char nr_W_1l_4p[28][4][1] = {
-  {{'1'}, {'0'}, {'0'}, {'0'}},//pmi 0
-  {{'0'}, {'1'}, {'0'}, {'0'}},
-  {{'0'}, {'0'}, {'1'}, {'0'}},
-  {{'0'}, {'0'}, {'0'}, {'1'}},
-  {{'1'}, {'0'}, {'1'}, {'0'}},
-  {{'1'}, {'0'}, {'n'}, {'0'}},
-  {{'1'}, {'0'}, {'j'}, {'0'}},
-  {{'1'}, {'0'}, {'o'}, {'0'}},//pmi 7
-  {{'0'}, {'1'}, {'0'}, {'1'}},//pmi 8
-  {{'0'}, {'1'}, {'0'}, {'n'}},
-  {{'0'}, {'1'}, {'0'}, {'j'}},
-  {{'0'}, {'1'}, {'0'}, {'o'}},
-  {{'1'}, {'1'}, {'1'}, {'1'}},
-  {{'1'}, {'1'}, {'j'}, {'j'}},
-  {{'1'}, {'1'}, {'n'}, {'n'}},
-  {{'1'}, {'1'}, {'o'}, {'o'}},
-  {{'1'}, {'j'}, {'1'}, {'j'}},//pmi 16
-  {{'1'}, {'j'}, {'j'}, {'n'}},
-  {{'1'}, {'j'}, {'n'}, {'o'}},
-  {{'1'}, {'j'}, {'o'}, {'1'}},
-  {{'1'}, {'n'}, {'1'}, {'n'}},
-  {{'1'}, {'n'}, {'j'}, {'o'}},
-  {{'1'}, {'n'}, {'n'}, {'1'}},
-  {{'1'}, {'n'}, {'o'}, {'j'}},//pmi 23
-  {{'1'}, {'o'}, {'1'}, {'o'}},//pmi 24
-  {{'1'}, {'o'}, {'j'}, {'1'}},
-  {{'1'}, {'o'}, {'n'}, {'j'}},
-  {{'1'}, {'o'}, {'o'}, {'n'}}//pmi 27
+const char nr_W_1l_4p[28][4][1] = {
+    {{'1'}, {'0'}, {'0'}, {'0'}}, // pmi 0
+    {{'0'}, {'1'}, {'0'}, {'0'}},
+    {{'0'}, {'0'}, {'1'}, {'0'}},
+    {{'0'}, {'0'}, {'0'}, {'1'}},
+    {{'1'}, {'0'}, {'1'}, {'0'}},
+    {{'1'}, {'0'}, {'n'}, {'0'}},
+    {{'1'}, {'0'}, {'j'}, {'0'}},
+    {{'1'}, {'0'}, {'o'}, {'0'}}, // pmi 7
+    {{'0'}, {'1'}, {'0'}, {'1'}}, // pmi 8
+    {{'0'}, {'1'}, {'0'}, {'n'}},
+    {{'0'}, {'1'}, {'0'}, {'j'}},
+    {{'0'}, {'1'}, {'0'}, {'o'}},
+    {{'1'}, {'1'}, {'1'}, {'1'}},
+    {{'1'}, {'1'}, {'j'}, {'j'}},
+    {{'1'}, {'1'}, {'n'}, {'n'}},
+    {{'1'}, {'1'}, {'o'}, {'o'}},
+    {{'1'}, {'j'}, {'1'}, {'j'}}, // pmi
+                                  // 16
+    {{'1'}, {'j'}, {'j'}, {'n'}},
+    {{'1'}, {'j'}, {'n'}, {'o'}},
+    {{'1'}, {'j'}, {'o'}, {'1'}},
+    {{'1'}, {'n'}, {'1'}, {'n'}},
+    {{'1'}, {'n'}, {'j'}, {'o'}},
+    {{'1'}, {'n'}, {'n'}, {'1'}},
+    {{'1'}, {'n'}, {'o'}, {'j'}}, // pmi 23
+    {{'1'}, {'o'}, {'1'}, {'o'}}, // pmi 24
+    {{'1'}, {'o'}, {'j'}, {'1'}},
+    {{'1'}, {'o'}, {'n'}, {'j'}},
+    {{'1'}, {'o'}, {'o'}, {'n'}} // pmi 27
 };
 
 //Table 6.3.1.5-4 Precoding Matrix W 2 antenna ports layers 2  'n' = -1 and 'o' = -j
-char nr_W_2l_2p[3][2][2] = {
-  {{'1', '0'}, {'0', '1'}},//pmi 0
-  {{'1', '1'}, {'1', 'n'}},
-  {{'1', '1'}, {'j', 'o'}} //pmi 2
+const char nr_W_2l_2p[3][2][2] = {
+    {{'1', '0'}, {'0', '1'}}, // pmi 0
+    {{'1', '1'}, {'1', 'n'}},
+    {{'1', '1'}, {'j', 'o'}} // pmi 2
 };
 
 //Table 6.3.1.5-5 Precoding Matrix W 2 layers 4 antenna ports 'n' = -1 and 'o' = -j
-char nr_W_2l_4p[22][4][2] = {
-  {{'1', '0'}, {'0', '1'}, {'0', '0'}, {'0', '0'}},//pmi 0
-  {{'1', '0'}, {'0', '0'}, {'0', '1'}, {'0', '0'}},
-  {{'1', '0'}, {'0', '0'}, {'0', '0'}, {'0', '1'}},
-  {{'0', '0'}, {'1', '0'}, {'0', '1'}, {'0', '0'}},//pmi 3
-  {{'0', '0'}, {'1', '0'}, {'0', '0'}, {'0', '1'}},//pmi 4
-  {{'0', '0'}, {'0', '0'}, {'1', '0'}, {'0', '1'}},
-  {{'1', '0'}, {'0', '1'}, {'1', '0'}, {'0', 'o'}},
-  {{'1', '0'}, {'0', '1'}, {'1', '0'}, {'0', 'j'}},
-  {{'1', '0'}, {'0', '1'}, {'o', '0'}, {'0', '1'}},//pmi 8
-  {{'1', '0'}, {'0', '1'}, {'o', '0'}, {'0', 'n'}},
-  {{'1', '0'}, {'0', '1'}, {'n', '0'}, {'0', 'o'}},
-  {{'1', '0'}, {'0', '1'}, {'n', '0'}, {'0', 'j'}},//pmi 11
-  {{'1', '0'}, {'0', '1'}, {'j', '0'}, {'0', '1'}},//pmi 12
-  {{'1', '0'}, {'0', '1'}, {'j', '0'}, {'0', 'n'}},
-  {{'1', '1'}, {'1', '1'}, {'1', 'n'}, {'1', 'n'}},
-  {{'1', '1'}, {'1', '1'}, {'j', 'o'}, {'j', 'o'}},//pmi 15
-  {{'1', '1'}, {'j', 'j'}, {'1', 'n'}, {'j', 'o'}},//pmi 16
-  {{'1', '1'}, {'j', 'j'}, {'j', 'o'}, {'n', '1'}},
-  {{'1', '1'}, {'n', 'n'}, {'1', 'n'}, {'n', '1'}},
-  {{'1', '1'}, {'n', 'n'}, {'j', 'o'}, {'o', 'j'}},//pmi 19
-  {{'1', '1'}, {'o', 'o'}, {'1', 'n'}, {'o', 'j'}},
-  {{'1', '1'}, {'o', 'o'}, {'j', 'o'}, {'1', 'n'}}//pmi 21
+const char nr_W_2l_4p[22][4][2] = {
+    {{'1', '0'}, {'0', '1'}, {'0', '0'}, {'0', '0'}}, // pmi 0
+    {{'1', '0'}, {'0', '0'}, {'0', '1'}, {'0', '0'}}, {{'1', '0'}, {'0', '0'}, {'0', '0'}, {'0', '1'}},
+    {{'0', '0'}, {'1', '0'}, {'0', '1'}, {'0', '0'}}, // pmi 3
+    {{'0', '0'}, {'1', '0'}, {'0', '0'}, {'0', '1'}}, // pmi 4
+    {{'0', '0'}, {'0', '0'}, {'1', '0'}, {'0', '1'}}, {{'1', '0'}, {'0', '1'}, {'1', '0'}, {'0', 'o'}},
+    {{'1', '0'}, {'0', '1'}, {'1', '0'}, {'0', 'j'}}, {{'1', '0'}, {'0', '1'}, {'o', '0'}, {'0', '1'}}, // pmi 8
+    {{'1', '0'}, {'0', '1'}, {'o', '0'}, {'0', 'n'}}, {{'1', '0'}, {'0', '1'}, {'n', '0'}, {'0', 'o'}},
+    {{'1', '0'}, {'0', '1'}, {'n', '0'}, {'0', 'j'}}, // pmi 11
+    {{'1', '0'}, {'0', '1'}, {'j', '0'}, {'0', '1'}}, // pmi 12
+    {{'1', '0'}, {'0', '1'}, {'j', '0'}, {'0', 'n'}}, {{'1', '1'}, {'1', '1'}, {'1', 'n'}, {'1', 'n'}},
+    {{'1', '1'}, {'1', '1'}, {'j', 'o'}, {'j', 'o'}}, // pmi 15
+    {{'1', '1'}, {'j', 'j'}, {'1', 'n'}, {'j', 'o'}}, // pmi 16
+    {{'1', '1'}, {'j', 'j'}, {'j', 'o'}, {'n', '1'}}, {{'1', '1'}, {'n', 'n'}, {'1', 'n'}, {'n', '1'}},
+    {{'1', '1'}, {'n', 'n'}, {'j', 'o'}, {'o', 'j'}}, // pmi 19
+    {{'1', '1'}, {'o', 'o'}, {'1', 'n'}, {'o', 'j'}}, {{'1', '1'}, {'o', 'o'}, {'j', 'o'}, {'1', 'n'}} // pmi 21
 };
 
 //Table 6.3.1.5-6 Precoding Matrix W 3 layers 4 antenna ports 'n' = -1 and 'o' = -j
-char nr_W_3l_4p[7][4][3] = {
-  {{'1', '0', '0'}, {'0', '1', '0'}, {'0', '0', '1'},{'0', '0', '0'}},//pmi 0
-  {{'1', '0', '0'}, {'0', '1', '0'}, {'1', '0', '0'},{'0', '0', '1'}},
-  {{'1', '0', '0'}, {'0', '1', '0'}, {'n', '0', '0'},{'0', '0', '1'}},
-  {{'1', '1', '1'}, {'1', 'n', '1'}, {'1', '1', 'n'},{'1', 'n', 'n'}},//pmi 3
-  {{'1', '1', '1'}, {'1', 'n', '1'}, {'j', 'j', 'o'},{'j', 'o', 'o'}},//pmi 4
-  {{'1', '1', '1'}, {'n', '1', 'n'}, {'1', '1', 'n'},{'n', '1', '1'}},
-  {{'1', '1', '1'}, {'n', '1', 'n'}, {'j', 'j', 'o'},{'o', 'j', 'j'}}
-};
+const char nr_W_3l_4p[7][4][3] = {{{'1', '0', '0'}, {'0', '1', '0'}, {'0', '0', '1'}, {'0', '0', '0'}}, // pmi 0
+                                  {{'1', '0', '0'}, {'0', '1', '0'}, {'1', '0', '0'}, {'0', '0', '1'}},
+                                  {{'1', '0', '0'}, {'0', '1', '0'}, {'n', '0', '0'}, {'0', '0', '1'}},
+                                  {{'1', '1', '1'}, {'1', 'n', '1'}, {'1', '1', 'n'}, {'1', 'n', 'n'}}, // pmi 3
+                                  {{'1', '1', '1'}, {'1', 'n', '1'}, {'j', 'j', 'o'}, {'j', 'o', 'o'}}, // pmi 4
+                                  {{'1', '1', '1'}, {'n', '1', 'n'}, {'1', '1', 'n'}, {'n', '1', '1'}},
+                                  {{'1', '1', '1'}, {'n', '1', 'n'}, {'j', 'j', 'o'}, {'o', 'j', 'j'}}};
 
 //Table 6.3.1.5-7 Precoding Matrix W 4 layers 4 antenna ports 'n' = -1 and 'o' = -j
-char nr_W_4l_4p[5][4][4] = {
-  {{'1', '0', '0', '0'}, {'0', '1', '0', '0'}, {'0', '0', '1', '0'}, {'0', '0', '0', '1'}},//pmi 0
-  {{'1', '1', '0', '0'}, {'0', '0', '1', '1'}, {'1', 'n', '0', '0'}, {'0', '0', '1', 'n'}},
-  {{'1', '1', '0', '0'}, {'0', '0', '1', '1'}, {'j', 'o', '0', '0'}, {'0', '0', 'j', 'o'}},
-  {{'1', '1', '1', '1'}, {'1', 'n', '1', 'n'}, {'1', '1', 'n', 'n'}, {'1', 'n', 'n', '1'}},//pmi 3
-  {{'1', '1', '1', '1'}, {'1', 'n', '1', 'n'}, {'j', 'j', 'o', 'o'}, {'j', 'o', 'o', 'j'}}//pmi 4
+const char nr_W_4l_4p[5][4][4] = {
+    {{'1', '0', '0', '0'}, {'0', '1', '0', '0'}, {'0', '0', '1', '0'}, {'0', '0', '0', '1'}}, // pmi 0
+    {{'1', '1', '0', '0'}, {'0', '0', '1', '1'}, {'1', 'n', '0', '0'}, {'0', '0', '1', 'n'}},
+    {{'1', '1', '0', '0'}, {'0', '0', '1', '1'}, {'j', 'o', '0', '0'}, {'0', '0', 'j', 'o'}},
+    {{'1', '1', '1', '1'}, {'1', 'n', '1', 'n'}, {'1', '1', 'n', 'n'}, {'1', 'n', 'n', '1'}}, // pmi 3
+    {{'1', '1', '1', '1'}, {'1', 'n', '1', 'n'}, {'j', 'j', 'o', 'o'}, {'j', 'o', 'o', 'j'}} // pmi 4
 };
 
 void nr_modulation(uint32_t *in,
@@ -607,7 +599,8 @@ void init_symbol_rotation(NR_DL_FRAME_PARMS *fp) {
 
   uint64_t dl_CarrierFreq = fp->dl_CarrierFreq;
   uint64_t ul_CarrierFreq = fp->ul_CarrierFreq;
-  double f[2] = {(double)dl_CarrierFreq, (double)ul_CarrierFreq};
+  uint64_t sl_CarrierFreq = fp->sl_CarrierFreq;
+  double f[3] = {(double)dl_CarrierFreq, (double)ul_CarrierFreq, (double)sl_CarrierFreq};
 
   const int nsymb = fp->symbols_per_slot * fp->slots_per_frame/10;
   const double Tc=(1/480e3/4096);
@@ -615,10 +608,10 @@ void init_symbol_rotation(NR_DL_FRAME_PARMS *fp) {
   const double Ncp0=16*64 + (144*64*(1/(float)(1<<fp->numerology_index)));
   const double Ncp1=(144*64*(1/(float)(1<<fp->numerology_index)));
 
-  for (uint8_t ll = 0; ll < 2; ll++){
+  for (uint8_t ll = 0; ll < sizeof(f)/sizeof(f[0]); ll++){
 
     double f0 = f[ll];
-    LOG_D(PHY, "Doing symbol rotation calculation for gNB TX/RX, f0 %f Hz, Nsymb %d\n", f0, nsymb);
+    LOG_I(PHY, "Doing symbol rotation calculation for gNB TX/RX, f0 %f Hz, Nsymb %d\n", f0, nsymb);
     c16_t *symbol_rotation = fp->symbol_rotation[ll];
 
     double tl = 0.0;
@@ -673,7 +666,7 @@ void init_timeshift_rotation(NR_DL_FRAME_PARMS *fp)
   }
 }
 
-int nr_layer_precoder(int16_t **datatx_F_precoding, char *prec_matrix, uint8_t n_layers, int32_t re_offset)
+int nr_layer_precoder(int16_t **datatx_F_precoding, const char *prec_matrix, uint8_t n_layers, int32_t re_offset)
 {
   int32_t precodatatx_F = 0;
 

openair1/PHY/MODULATION/nr_modulation.h

@@ -29,12 +29,12 @@
 
 #define DMRS_MOD_ORDER 2
 /*Precoding matices: W[pmi][antenna_port][layer]*/
-extern char nr_W_1l_2p[6][2][1];
-extern char nr_W_2l_2p[3][2][2];
-extern char nr_W_1l_4p[28][4][1];
-extern char nr_W_2l_4p[22][4][2];
-extern char nr_W_3l_4p[7][4][3];
-extern char nr_W_4l_4p[5][4][4];
+extern const char nr_W_1l_2p[6][2][1];
+extern const char nr_W_2l_2p[3][2][2];
+extern const char nr_W_1l_4p[28][4][1];
+extern const char nr_W_2l_4p[22][4][2];
+extern const char nr_W_3l_4p[7][4][3];
+extern const char nr_W_4l_4p[5][4][4];
 /*! \brief Perform NR modulation. TS 38.211 V15.4.0 subclause 5.1
   @param[in] in, Pointer to input bits
   @param[in] length, size of input bits
@@ -112,7 +112,8 @@ void apply_nr_rotation(NR_DL_FRAME_PARMS *fp,
 		       c16_t* txdata,
 		       int slot,
 		       int first_symbol,
-		       int nsymb);
+		       int nsymb,
+		       int link_type);
 
 void init_symbol_rotation(NR_DL_FRAME_PARMS *fp);
 
@@ -122,17 +123,15 @@ void apply_nr_rotation_ul(NR_DL_FRAME_PARMS *frame_parms,
 			  c16_t *rxdataF,
 			  int slot,
 			  int first_symbol,
-			  int nsymb);
+			  int nsymb,
+			  int link_type);
 
 /*! \brief Perform NR precoding. TS 38.211 V15.4.0 subclause 6.3.1.5
   @param[in] datatx_F_precoding, Pointer to n_layers*re data array
   @param[in] prec_matrix, Pointer to precoding matrix
   @param[in] n_layers, number of DLSCH layers
 */
-int nr_layer_precoder(int16_t **datatx_F_precoding,
-		char *prec_matrix,
-		uint8_t n_layers,
-		int32_t re_offset);
+int nr_layer_precoder(int16_t **datatx_F_precoding, const char *prec_matrix, uint8_t n_layers, int32_t re_offset);
 
 int nr_layer_precoder_cm(int16_t **datatx_F_precoding,
                 int *prec_matrix,

openair1/PHY/MODULATION/ofdm_mod.c

@@ -37,6 +37,7 @@ This section deals with basic functions for OFDM Modulation.
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "modulation_common.h"
 #include "PHY/LTE_TRANSPORT/transport_common_proto.h"
+#include "../executables/softmodem-common.h"
 //#define DEBUG_OFDM_MOD
 
 
@@ -45,15 +46,15 @@ void normal_prefix_mod(int32_t *txdataF,int32_t *txdata,uint8_t nsymb,LTE_DL_FRA
 
 
   
-  PHY_ofdm_mod(txdataF,        // input
-               txdata,         // output
+  PHY_ofdm_mod((int *)txdataF,        // input
+               (int *)txdata,         // output
                frame_parms->ofdm_symbol_size,                
 
                1,                 // number of symbols
                frame_parms->nb_prefix_samples0,               // number of prefix samples
                CYCLIC_PREFIX);
-  PHY_ofdm_mod(txdataF+frame_parms->ofdm_symbol_size,        // input
-               txdata+OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0,         // output
+  PHY_ofdm_mod((int *)txdataF+frame_parms->ofdm_symbol_size,        // input
+               (int *)txdata+OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES0,         // output
                frame_parms->ofdm_symbol_size,                
                nsymb-1,
                frame_parms->nb_prefix_samples,               // number of prefix samples
@@ -280,7 +281,7 @@ void PHY_ofdm_mod(int *input,                       /// pointer to complex input
 }
 
 
-void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms)
+void do_OFDM_mod(c16_t **txdataF, c16_t **txdata, uint32_t frame,uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms)
 {
 
   int aa, slot_offset, slot_offset_F;
@@ -292,39 +293,39 @@ void do_OFDM_mod(int32_t **txdataF, int32_t **txdata, uint32_t frame,uint16_t ne
     if (is_pmch_subframe(frame,next_slot>>1,frame_parms)) {
       if ((next_slot%2)==0) {
         LOG_D(PHY,"Frame %d, subframe %d: Doing MBSFN modulation (slot_offset %d)\n",frame,next_slot>>1,slot_offset);
-        PHY_ofdm_mod(&txdataF[aa][slot_offset_F],        // input
-                     &txdata[aa][slot_offset],         // output
+        PHY_ofdm_mod((int *)&txdataF[aa][slot_offset_F],        // input
+                     (int *)&txdata[aa][slot_offset],         // output
                      frame_parms->ofdm_symbol_size,                
                      12,                 // number of symbols
                      frame_parms->ofdm_symbol_size>>2,               // number of prefix samples
                      CYCLIC_PREFIX);
 
         if (frame_parms->Ncp == EXTENDED)
-          PHY_ofdm_mod(&txdataF[aa][slot_offset_F],        // input
-                       &txdata[aa][slot_offset],         // output
+          PHY_ofdm_mod((int *)&txdataF[aa][slot_offset_F],        // input
+                       (int *)&txdata[aa][slot_offset],         // output
                        frame_parms->ofdm_symbol_size,                
                        2,                 // number of symbols
                        frame_parms->nb_prefix_samples,               // number of prefix samples
                        CYCLIC_PREFIX);
         else {
           LOG_D(PHY,"Frame %d, subframe %d: Doing PDCCH modulation\n",frame,next_slot>>1);
-          normal_prefix_mod(&txdataF[aa][slot_offset_F],
-                            &txdata[aa][slot_offset],
+          normal_prefix_mod((int32_t *)&txdataF[aa][slot_offset_F],
+                            (int32_t *)&txdata[aa][slot_offset],
                             2,
                             frame_parms);
         }
       }
     } else {
       if (frame_parms->Ncp == EXTENDED)
-        PHY_ofdm_mod(&txdataF[aa][slot_offset_F],        // input
-                     &txdata[aa][slot_offset],         // output
+        PHY_ofdm_mod((int *)&txdataF[aa][slot_offset_F],        // input
+                     (int *)&txdata[aa][slot_offset],         // output
                      frame_parms->ofdm_symbol_size,                
                      6,                 // number of symbols
                      frame_parms->nb_prefix_samples,               // number of prefix samples
                      CYCLIC_PREFIX);
       else {
-        normal_prefix_mod(&txdataF[aa][slot_offset_F],
-                          &txdata[aa][slot_offset],
+        normal_prefix_mod((int32_t *)&txdataF[aa][slot_offset_F],
+                          (int32_t *)&txdata[aa][slot_offset],
                           7,
                           frame_parms);
       }
@@ -337,17 +338,18 @@ void apply_nr_rotation(NR_DL_FRAME_PARMS *fp,
                        c16_t *txdataF,
                        int slot,
                        int first_symbol,
-                       int nsymb)
+                       int nsymb,
+                       int link_type)
 {
   int symb_offset = (slot%fp->slots_per_subframe)*fp->symbols_per_slot;
 
-  c16_t *symbol_rotation = fp->symbol_rotation[0] + symb_offset;
+  c16_t *symbol_rotation = fp->symbol_rotation[link_type] + symb_offset;
 
   for (int sidx = first_symbol; sidx < first_symbol + nsymb; sidx++) {
     c16_t *this_rotation = symbol_rotation + sidx;
     c16_t *this_symbol = (txdataF) + sidx * fp->ofdm_symbol_size;
 
-    LOG_D(PHY,"Rotating symbol %d, slot %d, symbol_subframe_index %d (%d,%d)\n",
+    LOG_I(PHY,"Rotating symbol %d, slot %d, symbol_subframe_index %d (%d,%d)\n",
       sidx,
       slot,
       sidx + symb_offset,
@@ -371,4 +373,4 @@ void apply_nr_rotation(NR_DL_FRAME_PARMS *fp,
     }
   }
 }
-                       
+