Merge branch 'develop-nr' into nr_polar_uci

.gitignore

+cmake_targets/log/
+cmake_targets/ran_build/
+targets/bin/
+

ci-scripts/Jenkinsfile-gitlab

@@ -45,6 +45,44 @@ pipeline {
                     }
                 }
             }
+            post {
+                failure {
+                    script {
+                        def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI"
+                        addGitLabMRComment comment: message
+                    }
+                }
+            }
+        }
+
+        stage ("Start VM -- cppcheck") {
+            steps {
+                sh "./ci-scripts/createVM.sh --variant cppcheck --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+            }
+        }
+
+        stage ("Start VM -- enb-usrp") {
+            steps {
+                sh "./ci-scripts/createVM.sh --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+            }
+        }
+
+        stage ("Start VM -- phy-sim") {
+            steps {
+                sh "./ci-scripts/createVM.sh --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+            }
+        }
+
+        stage ("Start VM -- gnb-usrp") {
+            steps {
+                sh "./ci-scripts/createVM.sh --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+            }
+        }
+
+        stage ("Start VM -- nu-ue-usrp") {
+            steps {
+                sh "./ci-scripts/createVM.sh --variant nu-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+            }
         }
 
         stage ("Variant Builds") {

ci-scripts/buildOnVM.sh

@@ -24,12 +24,14 @@ function usage {
     echo "    --workspace #### OR -ws ####"
     echo "    Specify the workspace."
     echo ""
-    echo "    --variant enb-usrp   OR -v1"
-    echo "    --variant basic-sim  OR -v2"
-    echo "    --variant phy-sim    OR -v3"
-    echo "    --variant cppcheck   OR -v4"
-    echo "    --variant gnb-usrp   OR -v5"
-    echo "    --variant nu-ue-usrp OR -v6"
+    echo "    --variant enb-usrp     OR -v1"
+    echo "    --variant basic-sim    OR -v2"
+    echo "    --variant phy-sim      OR -v3"
+    echo "    --variant cppcheck     OR -v4"
+    echo "    --variant gnb-usrp     OR -v5"
+    echo "    --variant nu-ue-usrp   OR -v6"
+    echo "    --variant enb-ethernet OR -v7"
+    echo "    --variant ue-ethernet  OR -v8"
     echo "    Specify the variant to build."
     echo ""
     echo "    --keep-vm-alive OR -k"
@@ -44,12 +46,14 @@ function variant_usage {
     echo "OAI VM Build Check script"
     echo "   Original Author: Raphael Defosseux"
     echo ""
-    echo "    --variant enb-usrp   OR -v1"
-    echo "    --variant basic-sim  OR -v2"
-    echo "    --variant phy-sim    OR -v3"
-    echo "    --variant cppcheck   OR -v4"
-    echo "    --variant gnb-usrp   OR -v5"
-    echo "    --variant nu-ue-usrp OR -v6"
+    echo "    --variant enb-usrp     OR -v1"
+    echo "    --variant basic-sim    OR -v2"
+    echo "    --variant phy-sim      OR -v3"
+    echo "    --variant cppcheck     OR -v4"
+    echo "    --variant gnb-usrp     OR -v5"
+    echo "    --variant nu-ue-usrp   OR -v6"
+    echo "    --variant enb-ethernet OR -v7"
+    echo "    --variant ue-ethernet  OR -v8"
     echo ""
 }
 
@@ -65,6 +69,7 @@ VM_TEMPLATE=ci-
 JOB_NAME=XX
 BUILD_ID=XX
 VM_NAME=ci-enb-usrp
+VM_MEMORY=2048
 ARCHIVES_LOC=enb_usrp
 LOG_PATTERN=.Rel14.txt
 NB_PATTERN_FILES=4
@@ -126,10 +131,11 @@ case $key in
     ;;
     -v4)
     VM_NAME=ci-cppcheck
+    VM_MEMORY=8192
     ARCHIVES_LOC=cppcheck
     LOG_PATTERN=cppcheck.xml
     NB_PATTERN_FILES=1
-    BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2"
+    BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 -i openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c"
     shift
     ;;
     -v5)
@@ -148,6 +154,22 @@ case $key in
     BUILD_OPTIONS="--nrUE -w USRP"
     shift
     ;;
+    -v7)
+    VM_NAME=ci-enb-ethernet
+    ARCHIVES_LOC=enb_eth
+    LOG_PATTERN=.Rel14.txt
+    NB_PATTERN_FILES=6
+    BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
+    shift
+    ;;
+    -v8)
+    VM_NAME=ci-ue-ethernet
+    ARCHIVES_LOC=ue_eth
+    LOG_PATTERN=.Rel14.txt
+    NB_PATTERN_FILES=6
+    BUILD_OPTIONS="--UE -t ETHERNET --noS1"
+    shift
+    ;;
     --variant)
     variant="$2"
     case $variant in
@@ -174,10 +196,11 @@ case $key in
         ;;
         cppcheck)
         VM_NAME=ci-cppcheck
+        VM_MEMORY=8192
         ARCHIVES_LOC=cppcheck
         LOG_PATTERN=cppcheck.xml
         NB_PATTERN_FILES=1
-        BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2"
+        BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2 -i openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.c"
         ;;
         gnb-usrp)
         VM_NAME=ci-gnb-usrp
@@ -193,6 +216,20 @@ case $key in
         NB_PATTERN_FILES=4
         BUILD_OPTIONS="--nrUE -w USRP"
         ;;
+        enb-ethernet)
+        VM_NAME=ci-enb-ethernet
+        ARCHIVES_LOC=enb_eth
+        LOG_PATTERN=.Rel14.txt
+        NB_PATTERN_FILES=6
+        BUILD_OPTIONS="--eNB -t ETHERNET --noS1"
+        ;;
+        ue-ethernet)
+        VM_NAME=ci-ue-ethernet
+        ARCHIVES_LOC=ue_eth
+        LOG_PATTERN=.Rel14.txt
+        NB_PATTERN_FILES=6
+        BUILD_OPTIONS="--UE -t ETHERNET --noS1"
+        ;;
         *)
         echo ""
         echo "Syntax Error: Invalid Variant option -> $variant"
@@ -240,10 +277,16 @@ echo "JENKINS_WKSP        = $JENKINS_WKSP"
 echo "ARCHIVES_LOC        = $ARCHIVES_LOC"
 echo "BUILD_OPTIONS       = $BUILD_OPTIONS"
 
-echo "############################################################"
-echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
-echo "############################################################"
-uvt-kvm create $VM_NAME release=xenial --memory 2048 --cpu 4 --unsafe-caching --template ci-scripts/template-host.xml
+IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME`
+
+if [ $IS_VM_ALIVE -eq 0 ]
+then
+    echo "############################################################"
+    echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
+    echo "############################################################"
+    uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu 4 --unsafe-caching --template ci-scripts/template-host.xml
+fi
+
 echo "Waiting for VM to be started"
 uvt-kvm wait $VM_NAME --insecure
 
@@ -267,7 +310,8 @@ then
     echo "sudo apt-get --yes install zip cppcheck >> zip-install.txt 2>&1" >> $VM_CMDS
 else
     echo "echo \"sudo apt-get --yes --quiet install zip subversion libboost-dev \"" >> $VM_CMDS
-    echo "sudo apt-get --yes install zip subversion libboost-dev > zip-install.txt 2>&1" >> $VM_CMDS
+    echo "sudo apt-get update > zip-install.txt 2>&1" >> $VM_CMDS
+    echo "sudo apt-get --yes install zip subversion libboost-dev >> zip-install.txt 2>&1" >> $VM_CMDS
 fi
 echo "mkdir tmp" >> $VM_CMDS
 echo "cd tmp" >> $VM_CMDS

ci-scripts/createVM.sh

+#!/bin/bash
+
+function usage {
+    echo "OAI VM Creation script"
+    echo "   Original Author: Raphael Defosseux"
+    echo "   Requirements:"
+    echo "     -- uvtool uvtool-libvirt apt-cacher"
+    echo "     -- xenial image already synced"
+    echo "   Default:"
+    echo "     -- eNB with USRP"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo "    createVM.sh [OPTIONS]"
+    echo ""
+    echo "Options:"
+    echo "--------"
+    echo "    --job-name #### OR -jn ####"
+    echo "    Specify the name of the Jenkins job."
+    echo ""
+    echo "    --build-id #### OR -id ####"
+    echo "    Specify the build ID of the Jenkins job."
+    echo ""
+    echo "    --variant enb-usrp     OR -v1"
+    echo "    --variant basic-sim    OR -v2"
+    echo "    --variant phy-sim      OR -v3"
+    echo "    --variant cppcheck     OR -v4"
+    echo "    --variant gnb-usrp     OR -v5"
+    echo "    --variant nu-ue-usrp   OR -v6"
+    echo "    --variant enb-ethernet OR -v7"
+    echo "    --variant ue-ethernet  OR -v8"
+    echo "    Specify the variant to build."
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+function variant_usage {
+    echo "OAI VM Build Check script"
+    echo "   Original Author: Raphael Defosseux"
+    echo ""
+    echo "    --variant enb-usrp     OR -v1"
+    echo "    --variant basic-sim    OR -v2"
+    echo "    --variant phy-sim      OR -v3"
+    echo "    --variant cppcheck     OR -v4"
+    echo "    --variant gnb-usrp     OR -v5"
+    echo "    --variant nu-ue-usrp   OR -v6"
+    echo "    --variant enb-ethernet OR -v7"
+    echo "    --variant ue-ethernet  OR -v8"
+    echo ""
+}
+
+if [ $# -lt 1 ] || [ $# -gt 6 ]
+then
+    echo "Syntax Error: not the correct number of arguments"
+    echo ""
+    usage
+    exit 1
+fi
+
+VM_TEMPLATE=ci-
+VM_MEMORY=2048
+JOB_NAME=XX
+BUILD_ID=XX
+VM_NAME=ci-enb-usrp
+
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    shift
+    usage
+    exit 0
+    ;;
+    -jn|--job-name)
+    JOB_NAME="$2"
+    shift
+    shift
+    ;;
+    -id|--build-id)
+    BUILD_ID="$2"
+    shift
+    shift
+    ;;
+    -v1)
+    VM_NAME=ci-enb-usrp
+    shift
+    ;;
+    -v2)
+    VM_NAME=ci-basic-sim
+    shift
+    ;;
+    -v3)
+    VM_NAME=ci-phy-sim
+    shift
+    ;;
+    -v4)
+    VM_NAME=ci-cppcheck
+    VM_MEMORY=8192
+    shift
+    ;;
+    -v5)
+    VM_NAME=ci-gnb-usrp
+    shift
+    ;;
+    -v6)
+    VM_NAME=ci-ue-nr-usrp
+    shift
+    ;;
+    -v7)
+    VM_NAME=ci-enb-ethernet
+    shift
+    ;;
+    -v8)
+    VM_NAME=ci-ue-ethernet
+    shift
+    ;;
+    --variant)
+    variant="$2"
+    case $variant in
+        enb-usrp)
+        VM_NAME=ci-enb-usrp
+        ;;
+        basic-sim)
+        VM_NAME=ci-basic-sim
+        ;;
+        phy-sim)
+        VM_NAME=ci-phy-sim
+        ;;
+        cppcheck)
+        VM_NAME=ci-cppcheck
+        VM_MEMORY=8192
+        ;;
+        gnb-usrp)
+        VM_NAME=ci-gnb-usrp
+        ;;
+        nu-ue-usrp)
+        VM_NAME=ci-ue-nr-usrp
+        ;;
+        enb-ethernet)
+        VM_NAME=ci-enb-ethernet
+        ;;
+        ue-ethernet)
+        VM_NAME=ci-ue-ethernet
+        ;;
+        *)
+        echo ""
+        echo "Syntax Error: Invalid Variant option -> $variant"
+        echo ""
+        variant_usage
+        exit 1
+    esac
+    shift
+    shift
+    ;;
+    *)
+    echo "Syntax Error: unknown option: $key"
+    echo ""
+    usage
+    exit 1
+esac
+done
+
+if [ "$JOB_NAME" == "XX" ] || [ "$BUILD_ID" == "XX" ]
+then
+    VM_TEMPLATE=ci-
+else
+    VM_TEMPLATE=${JOB_NAME}-b${BUILD_ID}-
+fi
+
+VM_NAME=`echo $VM_NAME | sed -e "s#ci-#$VM_TEMPLATE#"`
+VM_CMDS=${VM_NAME}_cmds.txt
+
+echo "VM_NAME             = $VM_NAME"
+
+echo "############################################################"
+echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
+echo "############################################################"
+uvt-kvm create $VM_NAME release=xenial --memory $VM_MEMORY --cpu 4 --unsafe-caching --template ci-scripts/template-host.xml
+echo "Waiting for VM to be started"
+uvt-kvm wait $VM_NAME --insecure
+
+VM_IP_ADDR=`uvt-kvm ip $VM_NAME`
+echo "$VM_NAME has for IP addr = $VM_IP_ADDR"
+exit 0

ci-scripts/doGitLabMerge.sh

@@ -104,6 +104,10 @@ git checkout -f $SOURCE_COMMIT_ID
 
 git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"
 
-exit 0
-
-
+STATUS=`git status | egrep -c "You have unmerged paths.|fix conflicts"`
+if [ $STATUS -ne 0 ]
+then
+    echo "There are merge conflicts.. Cannot perform further build tasks"
+    STATUS=-1
+fi
+exit $STATUS

ci-scripts/reportBuildLocally.sh

@@ -232,6 +232,10 @@ function sca_summary_table_footer {
         echo "        <th>Total</th>" >> ./build_results.html
         echo "        <th>Unknown</th>" >> ./build_results.html
         echo "        <th>Unknown</th>" >> ./build_results.html
+        if [ -f ccp_error_cnt.txt ]
+        then
+            rm -f ccp_error_cnt.txt
+        fi
     fi
     echo "      </tr>" >> ./build_results.html
     echo "   </table>" >> ./build_results.html
@@ -528,6 +532,30 @@ then
     summary_table_footer
 fi
 
+if [ -f archives/enb_eth/lte-softmodem-nos1.Rel14.txt ]
+then
+    summary_table_header "OAI Build eNB -- ETHERNET transport option"
+    summary_table_row "LTE SoftModem w/o S1 - Release 14" ./archives/enb_eth/lte-softmodem-nos1.Rel14.txt "Built target lte-softmodem" ./enb_eth_row1.html
+    summary_table_row "Coding - Release 14" ./archives/enb_eth/coding.Rel14.txt "Built target coding" ./enb_eth_row2.html
+    summary_table_row "OAI ETHERNET transport - Release 14" ./archives/enb_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
+    summary_table_row "Parameters Lib Config - Release 14" ./archives/enb_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./enb_eth_row4.html
+    summary_table_row "RB Tools - Release 14" ./archives/enb_eth/rb_tool.Rel14.txt "Built target rb_tool" ./enb_eth_row5.html
+    summary_table_row "NAS Mesh - Release 14" ./archives/enb_eth/nasmesh.Rel14.txt "Built target nasmesh" ./enb_eth_row6.html
+    summary_table_footer
+fi
+
+if [ -f archives/ue_eth/lte-uesoftmodem-nos1.Rel14.txt ]
+then
+    summary_table_header "OAI Build UE -- ETHERNET transport option"
+    summary_table_row "LTE UE SoftModem w/o S1 - Release 14" ./archives/ue_eth/lte-uesoftmodem-nos1.Rel14.txt "Built target lte-uesoftmodem" ./ue_eth_row1.html
+    summary_table_row "Coding - Release 14" ./archives/ue_eth/coding.Rel14.txt "Built target coding" ./ue_eth_row2.html
+    summary_table_row "OAI ETHERNET transport - Release 14" ./archives/ue_eth/oai_eth_transpro.Rel14.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
+    summary_table_row "Parameters Lib Config - Release 14" ./archives/ue_eth/params_libconfig.Rel14.txt "Built target params_libconfig" ./ue_eth_row4.html
+    summary_table_row "RB Tools - Release 14" ./archives/ue_eth/rb_tool.Rel14.txt "Built target rb_tool" ./ue_eth_row5.html
+    summary_table_row "NAS Mesh - Release 14" ./archives/ue_eth/nasmesh.Rel14.txt "Built target nasmesh" ./ue_eth_row6.html
+    summary_table_footer
+fi
+
 echo "   <h3>Details</h3>" >> ./build_results.html
 
 for DETAILS_TABLE in `ls ./enb_usrp_row*.html`
@@ -550,7 +578,15 @@ for DETAILS_TABLE in `ls ./nrue_usrp_row*.html`
 do
     cat $DETAILS_TABLE >> ./build_results.html
 done
-rm -f ./enb_usrp_row*.html ./basic_sim_row*.html ./phy_sim_row*.html ./gnb_usrp_row*.html ./nrue_usrp_row*.html
+for DETAILS_TABLE in `ls ./enb_eth_row*.html`
+do
+    cat $DETAILS_TABLE >> ./build_results.html
+done
+for DETAILS_TABLE in `ls ./ue_eth_row*.html`
+do
+    cat $DETAILS_TABLE >> ./build_results.html
+done
+rm -f ./enb_usrp_row*.html ./basic_sim_row*.html ./phy_sim_row*.html ./gnb_usrp_row*.html ./nrue_usrp_row*.html ./enb_eth_row*.html ./ue_eth_row*.html
 
 echo "</body>" >> ./build_results.html
 echo "</html>" >> ./build_results.html

cmake_targets/build_oai

@@ -544,7 +544,7 @@ function main() {
   if [ "$NOS1" = "1" ] ; then
       build_dir=noS1_ran_build
       if [ "$gNB" = "1" ] ; then
-         exec=nr-softmodem
+         exec=nr-softmodem-nos1
        elif [ "$nrUE" = "1" ] ; then
          exec=nr-uesoftmodem-nos1
        elif [ "$eNB" = "1" ] ; then

cmake_targets/noS1_ran_build/CMakeLists.template

+set (  DEBUG_OMG False )
+set (  DISABLE_XER_PRINT False )
+set (  DRIVER2013 True )
+set (  ENABLE_ITTI True )
+set (  ENABLE_NAS_UE_LOGGING False )
+set (  ENABLE_NEW_MULTICAST True )
+set (  ENABLE_RAL False )
+set (  ENABLE_SECURITY False )
+set (  ENABLE_STANDALONE_EPC False)
+set (  ENABLE_USE_CPU_EXECUTION_TIME True )
+set (  ENABLE_USE_MME False )
+set (  ENABLE_USE_RAW_SOCKET_FOR_SGI False)
+set (  ENABLE_VCD_FIFO False )
+set (  ENB_MODE True )
+set (  EXMIMO_IOT True )
+set (  JUMBO_FRAME True )
+set (  LARGE_SCALE False )
+set (  LINK_ENB_PDCP_TO_GTPV1U False)
+set (  LINUX_LIST False )
+set (  LINUX True )
+set (  LOCALIZATION False )
+set (  LOG_NO_THREAD 1 )
+set (  DEADLINE_SCHEDULER False )
+set (  MAC_CONTEXT 1 )
+set (  MAX_NUM_CCs 1 )
+set (  MESSAGE_CHART_GENERATOR         False )
+set (  MESSAGE_CHART_GENERATOR_RLC_MAC False )
+set (  MESSAGE_CHART_GENERATOR_PHY     False )
+set (  MSG_PRINT False )
+set (  MU_RECEIVER False )
+set (  NAS_ADDRESS_FIX False )
+set (  NAS_BUILT_IN_UE False)
+set (  NAS_MME False )
+set (  NAS_UE False )
+set (  NB_ANTENNAS_RX "2" )
+set (  NB_ANTENNAS_TX "2" )
+set (  NO_RRM True )
+set (  OAISIM False )
+set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
+set (  OAI_NW_DRIVER_USE_NETLINK True )
+set (  OPENAIR2 True )
+set (  OPENAIR_LTE True )
+set (  PACKAGE_NAME "nr-softmodem-nos1" )
+set (  PDCP_USE_NETLINK True )
+set (  PDCP_MSG_PRINT False )
+set (  PHY_CONTEXT False )
+set (  PHY_EMUL False )
+set (  PHYSIM True )
+set (  RF_BOARD "False" )
+set (  RRC_ASN1_VERSION "Rel15" )
+set (  RLC_STOP_ON_LOST_PDU False )
+set (  RRC_MSG_PRINT False )
+set (  SECU False )
+set (  SMBV False )
+set (  TEST_OMG False )
+set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
+set (  USE_MME "R10" )
+set (  XER_PRINT False )
+set (  DEBUG_PHY False )
+set (  DEBUG_PHY_PROC False)
+set (  DEBUG_DLSCH False)

cmake_targets/tools/build_helper

@@ -277,7 +277,7 @@ check_install_usrp_uhd_driver(){
         $SUDO apt-get -y --allow-unauthenticated install libuhd-dev libuhd003 uhd-host
     elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
         $SUDO $INSTALLER -y install python boost libusb-devel libusbx-devel boost-devel python-mako python-docutils cmake
-        $SUDO pip install requests
+        $SUDO -H pip install requests
         if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
             # until EPEL repo hasn't bumped UHD driver to >=3.10 in EPEL, build driver from source
             $SUDO $INSTALLER -y remove uhd uhd-devel uhd-firmware
@@ -460,8 +460,8 @@ check_install_additional_tools (){
 
   #The packages below are already installed for Redhat distros (RHEL, CentOS, Fedora)
   if [[ "$OS_DISTRO" == "ubuntu" ]]; then
-    $SUDO pip install paramiko
-    $SUDO pip install pyroute2 colorama
+    $SUDO -H pip install paramiko
+    $SUDO -H pip install pyroute2 colorama
     log_netiface=$OPENAIR_DIR/cmake_targets/log/netiface_install_log.txt
     echo_info "Installing Netinterfaces package. The logfile for installation is in $log_netiface"
     (
@@ -659,10 +659,9 @@ install_asn1c_from_source(){
     echo_info "\nInstalling ASN1. The log file for ASN1 installation is here: $asn1_install_log "
     (
     $SUDO rm -rf /tmp/asn1c
-    # GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c
-    git clone https://github.com/velichkov/asn1c /tmp/asn1c
+    git clone https://github.com/brchiu/asn1c /tmp/asn1c
     cd /tmp/asn1c
-    git checkout s1ap
+    git checkout velichkov_s1ap_plus_option_group
     test -f configure || autoreconf -iv
     ./configure
     make -j`nproc`

cmake_targets/tools/generate_asn1

@@ -107,12 +107,16 @@ case "$module" in
   ;;
   NR_RRC )
     	export ASN1C_PREFIX=NR_
-  	asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
+  	asn1c -gen-PER -fcompound-names -findirect-choice -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
   ;;
   S1AP )
 	export ASN1C_PREFIX=S1AP_
   	asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
   ;;
+  X2AP )
+	export ASN1C_PREFIX=X2AP_
+  	asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
+  ;;
 esac
 
 
@@ -129,12 +133,16 @@ case "$module" in
   ;; 
   NR_RRC )
     	export ASN1C_PREFIX=NR_
-  	asn1c -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
+  	asn1c -fcompound-names -findirect-choice -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
   ;;
   S1AP )
     	export ASN1C_PREFIX=S1AP_
     	asn1c -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
   ;;
+  X2AP )
+    	export ASN1C_PREFIX=X2AP_
+    	asn1c -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
+  ;;
 esac
 
 fi

common/ran_context.h

@@ -49,7 +49,8 @@
 
 #include "PHY/defs_L1_NB_IoT.h"
 #include "RRC/LTE/defs_NB_IoT.h"
-#include "RRC/NR/defs_NR.h"
+#include "RRC/NR/nr_rrc_defs.h"
+
 
 typedef struct {
   /// RAN context config file name
@@ -68,14 +69,22 @@ typedef struct {
   int nb_macrlc_inst;
   /// Number of NB_IoT MACRLC instances in this node
   int nb_nb_iot_macrlc_inst;
+  /// Number of NR MACRLC instances in this node
+  int nb_nr_macrlc_inst;
   /// Number of component carriers per instance in this node
   int *nb_mac_CC;
+  /// Number of component carriers per instance in this node
+  int *nb_nr_mac_CC;
   /// Number of L1 instances in this node
   int nb_L1_inst;
   /// Number of NB_IoT L1 instances in this node
   int nb_nb_iot_L1_inst;
+  /// Number of NR L1 instances in this node
+  int nb_nr_L1_inst;  
   /// Number of Component Carriers per instance in this node
   int *nb_L1_CC;
+  /// Number of NR Component Carriers per instance in this node
+  int *nb_nr_L1_CC;
   /// Number of RU instances in this node
   int nb_RU;
   /// FlexRAN context variables
@@ -96,6 +105,8 @@ typedef struct {
   struct eNB_MAC_INST_s **mac;
   /// NB_IoT MAC context variables
   struct eNB_MAC_INST_NB_IoT_s **nb_iot_mac;
+  /// NR MAC context variables
+  struct gNB_MAC_INST_s **nrmac;
   /// GTPu descriptor 
   gtpv1u_data_t *gtpv1u_data_g;
   /// RU descriptors. These describe what each radio unit is supposed to do and contain the necessary functions for fronthaul interfaces

nfapi/oai_integration/nfapi_vnf.c

@@ -31,7 +31,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "nfapi_interface.h"
+#include "nfapi_nr_interface.h"
 #include "nfapi_vnf_interface.h"
 #include "nfapi.h"
 #include "vendor_ext.h"
@@ -1161,6 +1161,25 @@ int oai_nfapi_dl_config_req(nfapi_dl_config_request_t *dl_config_req)
   return retval;
 }
 
+int oai_nfapi_nr_dl_config_req(nfapi_nr_dl_config_request_t *dl_config_req)
+{
+  nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;
+
+  dl_config_req->header.phy_id = 1; // DJP HACK TODO FIXME - need to pass this around!!!!
+
+  int retval = nfapi_vnf_p7_dl_config_req(p7_config, dl_config_req);
+
+  dl_config_req->dl_config_request_body.number_pdcch_ofdm_symbols           = 1;
+  dl_config_req->dl_config_request_body.number_dci                          = 0;
+  dl_config_req->dl_config_request_body.number_pdu                          = 0;
+  dl_config_req->dl_config_request_body.number_pdsch_rnti                   = 0;
+
+  if (retval!=0) {
+    LOG_E(PHY, "%s() Problem sending retval:%d\n", __FUNCTION__, retval);
+  }
+  return retval;
+}
+
 int oai_nfapi_tx_req(nfapi_tx_request_t *tx_req)
 {
   nfapi_vnf_p7_config_t *p7_config = vnf.p7_vnfs[0].config;

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

+#ifndef _FAPI_NR_UE_CONSTANTS_H_
+#define _FAPI_NR_UE_CONSTANTS_H_
+
+//  constants defined by specification 38.331
+#define FAPI_NR_MAX_NUM_DL_ALLOCATIONS             16
+#define FAPI_NR_MAX_NUM_UL_ALLOCATIONS             16
+#define FAPI_NR_MAX_NUM_SERVING_CELLS              32
+#define FAPI_NR_MAX_NUM_ZP_CSI_RS_RESOURCE_PER_SET 16
+#define FAPI_NR_MAX_NUM_CANDIDATE_BEAMS            16
+#define FAPI_NR_MAX_RA_OCCASION_PER_CSIRS          64
+
+
+/// RX_IND
+#define FAPI_NR_RX_PDU_TYPE_MIB 0x01
+#define FAPI_NR_RX_PDU_TYPE_SIB 0x02 
+#define FAPI_NR_RX_PDU_TYPE_DLSCH 0x03 
+#define FAPI_NR_DCI_IND 0x04
+
+#define FAPI_NR_SIBS_MASK_SIB1 0x1
+
+
+/// DCI_IND
+#define FAPI_NR_DCI_TYPE_0_0 0x01
+#define FAPI_NR_DCI_TYPE_0_1 0x02
+#define FAPI_NR_DCI_TYPE_1_0 0x03
+#define FAPI_NR_DCI_TYPE_1_1 0x04
+#define FAPI_NR_DCI_TYPE_2_0 0x05
+#define FAPI_NR_DCI_TYPE_2_1 0x06
+#define FAPI_NR_DCI_TYPE_2_2 0x07
+#define FAPI_NR_DCI_TYPE_2_3 0x08
+
+
+/// TX_REQ
+
+
+/// DL_CONFIG_REQ
+
+#define FAPI_NR_DL_CONFIG_LIST_NUM 10
+
+#define FAPI_NR_DL_CONFIG_TYPE_DCI 0x01
+#define FAPI_NR_DL_CONFIG_TYPE_DLSCH 0x02
+
+#define CCE_REG_MAPPING_TYPE_INTERLEAVED 0x01
+#define CCE_REG_MAPPING_TYPE_NON_INTERLEAVED 0x02
+
+#define PRECODER_GRANULARITY_SAME_AS_REG_BUNDLE 0x01
+#define PRECODER_GRANULARITY_ALL_CONTIGUOUS_RBS 0x02
+
+/// UL_CONFIG_REQ
+#define FAPI_NR_UL_CONFIG_LIST_NUM 10
+
+#define FAPI_NR_DL_CONFIG_TYPE_PRACH 0x01
+#define FAPI_NR_DL_CONFIG_TYPE_PUCCH 0x02
+#define FAPI_NR_DL_CONFIG_TYPE_PUSCH 0x03
+
+
+#endif
\ No newline at end of file

openair1/PHY/CODING/TESTBENCH/ldpctest.c

@@ -25,8 +25,18 @@
 #include <string.h>
 
 #include "SIMULATION/TOOLS/sim.h"
+#include "PHY/CODING/nrLDPC_encoder/defs.h"
+#include "PHY/CODING/nrLDPC_decoder/nrLDPC_decoder.h"
 
+#define MAX_NUM_DLSCH_SEGMENTS 16
 
+#ifndef malloc16
+#  ifdef __AVX2__
+#    define malloc16(x) memalign(32,x)
+#  else
+#    define malloc16(x) memalign(16,x)
+#  endif
+#endif
 
 // 4-bit quantizer
 char quantize4bit(double D,double x)
@@ -66,7 +76,7 @@ int test_ldpc(short No_iteration,
               int denom_rate,
               double SNR,
               unsigned char qbits,
-              short block_length,
+              unsigned short block_length,
               unsigned int ntrials,
               unsigned int *errors,
               unsigned int *crc_misses)
@@ -107,7 +117,9 @@ int test_ldpc(short No_iteration,
   modulated_input = (double *)malloc(sizeof(double) * 68*384);
   channel_output  = (double *)malloc(sizeof(double) * 68*384);
   channel_output_fixed  = (char *)malloc16(sizeof(char) * 68*384);
-  estimated_output = (unsigned char*) malloc16(sizeof(unsigned char) * block_length/8);
+  estimated_output = (unsigned char*) malloc16(sizeof(unsigned char) * block_length);
+
+  memset(channel_output_fixed,0,sizeof(char) * 68*384);
 
   reset_meas(&time);
   reset_meas(&time_optim);
@@ -124,14 +136,14 @@ int test_ldpc(short No_iteration,
   }
 
   //determine number of bits in codeword
-  //if (block_length>3840)
+  if ((block_length>3840) && (block_length <= MAX_BLOCK_LENGTH))
   {
     BG=1;
     Kb = 22;
     nrows=46; //parity check bits
     ncols=22; //info bits
   }
-  /*else if (block_length<=3840)
+  else if (block_length<=3840) 
   {
     BG=2;
     nrows=42; //parity check bits
@@ -145,11 +157,14 @@ int test_ldpc(short No_iteration,
       Kb = 8;
     else
       Kb = 6;
-      }*/
-
+  }
+  else {
+    printf("block_length %d not supported\n",block_length);
+    exit(-1);
+  }
+  
   //find minimum value in all sets of lifting size
   Zc=0;
-
   for (i1=0; i1 < 51; i1++)
   {
     if (lift_size[i1] >= (double) block_length/Kb)
@@ -165,7 +180,7 @@ int test_ldpc(short No_iteration,
   //  printf("puncture:%d\n",no_punctured_columns);
   removed_bit=(nrows-no_punctured_columns-2) * Zc+block_length-(int)(block_length/((float)nom_rate/(float)denom_rate));
   if (ntrials==0)
-    ldpc_encoder_orig(test_input[0],channel_input[0], block_length, nom_rate, denom_rate, 1);
+    ldpc_encoder_orig(test_input[0],channel_input[0], block_length, BG, 1);
   
   for (trial=0; trial < ntrials; trial++)
   {
@@ -173,20 +188,20 @@ int test_ldpc(short No_iteration,
     //// encoder
     start_meas(&time);
     for(j=0;j<n_segments;j++) {
-      ldpc_encoder_orig(test_input[j], channel_input[j],block_length,nom_rate,denom_rate,0);
+      ldpc_encoder_orig(test_input[j], channel_input[j],block_length,BG,0);
     }
     stop_meas(&time);
 
     start_meas(&time_optim);
-    ldpc_encoder_optim_8seg(test_input,channel_input_optim,block_length,nom_rate,denom_rate,n_segments,&tinput,&tprep,&tparity,&toutput);
+    ldpc_encoder_optim_8seg(test_input,channel_input_optim,block_length,BG,n_segments,&tinput,&tprep,&tparity,&toutput);
     /*for(j=0;j<n_segments;j++) {
-      ldpc_encoder_optim(test_input[j],channel_input_optim[j],block_length,nom_rate,denom_rate,&tinput,&tprep,&tparity,&toutput);
+      ldpc_encoder_optim(test_input[j],channel_input_optim[j],block_length,BG,&tinput,&tprep,&tparity,&toutput);
       }*/
     stop_meas(&time_optim);
     
     if (ntrials==1)    
       for (j=0;j<n_segments;j++)
-	for (i = 0; i < block_length+(nrows-no_punctured_columns) * Zc - removed_bit; i++)
+	for (i = 0; i < 3*block_length; i++)
 	  if (channel_input[j][i]!=channel_input_optim[j][i]) {
 	    printf("differ in seg %d pos %d (%d,%d)\n",j,i,channel_input[j][i],channel_input_optim[j][i]);
 	    return (-1);
@@ -199,9 +214,9 @@ int test_ldpc(short No_iteration,
     //printf("%d ",channel_input[i]);
 
     //if ((BG==2) && (Zc==128||Zc==256))
-    if (0)
+    if (1)
     {
-      for (i = 2*Zc; i < (Kb+nrows-no_punctured_columns) * Zc-removed_bit; i++)
+      for (i = 2*Zc; i < 3*block_length; i++)
       {
 #ifdef DEBUG_CODER
         if ((i&0xf)==0)
@@ -209,7 +224,7 @@ int test_ldpc(short No_iteration,
 #endif
 
         if (channel_input[0][i-2*Zc]==0)
-          modulated_input[i]=1/sqrt(2);  //QPSK
+          modulated_input[i]=1/sqrt(2);  //BPSK
         else
           modulated_input[i]=-1/sqrt(2);
 
@@ -218,16 +233,12 @@ int test_ldpc(short No_iteration,
 	//printf("llr[%d]=%d\n",i,channel_output_fixed[i]);
       }
 
-      //for (i=(Kb+nrows) * Zc-5;i<(Kb+nrows) * Zc;i++)
-      //{
-      //  printf("channel_input[%d]=%d\n",i,channel_input[i]);
-      //printf("%lf %d\n",channel_output[i], channel_output_fixed[i]);
-      //printf("v[%d]=%lf\n",i,modulated_input[i]);}
-#ifdef DEBUG_CODER
-      printf("\n");
-      exit(-1);
-#endif
-
+      /*
+	the LDPC decoder supports several rates and the input has to be adapted accordingly (by padding with zeros to the next lower supported rate). Moreover, the first 2*Z LLRs are zero (since they are punctured and not transmitted) then you have the LLRs corresponding to the systematic bits. After that come the filler bits, the encoder uses 0 for the filler bits hence for the decoder you need to put 127 (max LLR for bit 0) at their place. Then come the LLRs corresponding to the punctured bits followed by zeros to pad for the supported decoder rate.
+      */
+      for (i=0;i<2*Zc;i++) 
+	channel_output_fixed[i] = 0;
+      
       decParams.BG=BG;
       decParams.Z=Zc;
       decParams.R=13;
@@ -236,9 +247,9 @@ int test_ldpc(short No_iteration,
 
       // decode the sequence
       // decoder supports BG2, Z=128 & 256
-      //esimated_output=ldpc_decoder(channel_output_fixed, block_length, No_iteration, (double)((float)nom_rate/(float)denom_rate));
+      //estimated_output=ldpc_decoder(channel_output_fixed, block_length, No_iteration, (double)((float)nom_rate/(float)denom_rate));
 
-      nrLDPC_decoder(&decParams, channel_output_fixed, estimated_output, NULL);
+      nrLDPC_decoder(&decParams, (int8_t*) channel_output_fixed, (int8_t*) estimated_output, NULL);
 
       //for (i=(Kb+nrows) * Zc-5;i<(Kb+nrows) * Zc;i++)
       //  printf("esimated_output[%d]=%d\n",i,esimated_output[i]);
@@ -248,15 +259,15 @@ int test_ldpc(short No_iteration,
       {
         if (estimated_output[i] != test_input[0][i])
         {
-	  //printf("error pos %d (%d, %d)\n",i,estimated_output[i],test_input[i]);
+	  printf("error pos %d (%d, %d)\n",i,estimated_output[i],test_input[0][i]);
           *errors = (*errors) + 1;
           break;
         }
       }
 
     }
-    /*else if (trial==0)
-      printf("decoder is not supported\n");*/
+    else if (trial==0)
+      printf("decoder is not supported\n");
   }
 
   for(j=0;j<MAX_NUM_DLSCH_SEGMENTS;j++) {

openair1/PHY/CODING/nrLDPC_encoder/defs.h

@@ -31,6 +31,18 @@
 
 #include "PHY/TOOLS/time_meas.h"
 
+/*ldpc_encoder.c*/
+int encode_parity_check_part_orig(unsigned char *c,unsigned char *d, short BG,short Zc,short Kb,short block_length);
+
+/*ldpc_encoder2.c*/
+void encode_parity_check_part_optim(uint8_t *c,uint8_t *d, short BG,short Zc,short Kb);
+int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,short block_length,short BG,time_stats_t *tinput,time_stats_t *tprep,time_stats_t *tparity,time_stats_t *toutput);
+int ldpc_encoder_optim_8seg(unsigned char **test_input,unsigned char **channel_input,short block_length,short BG,int n_segments,time_stats_t *tinput,time_stats_t *tprep,time_stats_t *tparity,time_stats_t *toutput);
+
+/*ldpc_generate_coefficient.c*/
+int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,short block_length,short BG,unsigned char gen_code);
+
+/*
 int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Zc,short Kb);
 int encode_parity_check_part_orig(unsigned char *c,unsigned char *d, short BG,short Zc,short Kb,short block_length);
 int ldpc_encoder(unsigned char *test_input,unsigned char *channel_input,short block_length, double rate);
@@ -38,4 +50,4 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho
 int ldpc_encoder_multi_segment(unsigned char **test_input,unsigned char **channel_input,short block_length,double rate,uint8_t n_segments);
 int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,short block_length,int nom_rate,int denom_rate,time_stats_t *tinput,time_stats_t *tprep,time_stats_t *tparity,time_stats_t *toutput);
 int ldpc_encoder_optim_8seg(unsigned char **test_input,unsigned char **channel_input,short block_length,int nom_rate,int denom_rate,int n_segments,time_stats_t *tinput,time_stats_t *tprep,time_stats_t *tparity,time_stats_t *toutput);
-
+*/

openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder2.c

@@ -198,10 +198,10 @@ void encode_parity_check_part_optim(uint8_t *c,uint8_t *d, short BG,short Zc,sho
 }
 
 
-int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,short block_length,int nom_rate,int denom_rate,time_stats_t *tinput,time_stats_t *tprep,time_stats_t *tparity,time_stats_t *toutput)
+int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,short block_length,short BG,time_stats_t *tinput,time_stats_t *tprep,time_stats_t *tparity,time_stats_t *toutput)
 {
 
-  short BG,Zc,Kb,nrows,ncols;
+  short Kb,Zc,nrows,ncols;
   int i,i1;
   int no_punctured_columns,removed_bit;
 
@@ -211,16 +211,14 @@ int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,sh
   int simd_size;
 
   //determine number of bits in codeword
-  //if (block_length>3840)
+  if (BG==1)
     {
-      BG=1;
       Kb = 22;
       nrows=46; //parity check bits
       ncols=22; //info bits
     }
-    /*else if (block_length<=3840)
+    else if (BG==2)
     {
-      BG=2;
       nrows=42; //parity check bits
       ncols=10; // info bits
       
@@ -232,7 +230,7 @@ int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,sh
       Kb = 8;
     else
       Kb = 6;
-      }*/
+    }
 
   //find minimum value in all sets of lifting size
   Zc=0;
@@ -315,10 +313,10 @@ int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,sh
   return 0;
 }
 
-int ldpc_encoder_optim_8seg(unsigned char **test_input,unsigned char **channel_input,short block_length,int nom_rate,int denom_rate,int n_segments,time_stats_t *tinput,time_stats_t *tprep,time_stats_t *tparity,time_stats_t *toutput)
+int ldpc_encoder_optim_8seg(unsigned char **test_input,unsigned char **channel_input,short block_length,short BG,int n_segments,time_stats_t *tinput,time_stats_t *tprep,time_stats_t *tparity,time_stats_t *toutput)
 {
 
-  short BG,Zc,Kb,nrows,ncols;
+  short Kb,Zc,nrows,ncols;
   int i,i1,j;
   int no_punctured_columns,removed_bit;
   //Table of possible lifting sizes
@@ -345,16 +343,14 @@ int ldpc_encoder_optim_8seg(unsigned char **test_input,unsigned char **channel_i
   AssertFatal(n_segments>0&&n_segments<=8,"0 < n_segments %d <= 8\n",n_segments);
 
   //determine number of bits in codeword
-  //if (block_length>3840)
+  if (BG==1)
     {
-      BG=1;
       Kb = 22;
       nrows=46; //parity check bits
       ncols=22; //info bits
     }
-    /*else if (block_length<=3840)
+    else if (BG==2)
     {
-      BG=2;
       nrows=42; //parity check bits
       ncols=10; // info bits
       
@@ -366,7 +362,7 @@ int ldpc_encoder_optim_8seg(unsigned char **test_input,unsigned char **channel_i
       Kb = 8;
     else
       Kb = 6;
-      }*/
+    }
 
   //find minimum value in all sets of lifting size
   Zc=0;

openair1/PHY/CODING/nrLDPC_encoder/ldpc_generate_coefficient.c

@@ -361,13 +361,13 @@ short *choose_generator_matrix(short BG,short Zc)
   return Gen_shift_values;
 }
 
-int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,short block_length,int nom_rate,int denom_rate,unsigned char gen_code)
+int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,short block_length,short BG,unsigned char gen_code)
 {
   unsigned char c[22*384]; //padded input, unpacked, max size
   unsigned char d[68*384]; //coded output, unpacked, max size
   unsigned char channel_temp,temp;
   short *Gen_shift_values, *no_shift_values, *pointer_shift_values;
-  short BG,Zc,Kb,nrows,ncols;
+  short Zc,Kb,nrows,ncols;
   int i,i1,i2,i3,i4,i5,temp_prime,var;
   int no_punctured_columns,removed_bit;
   //Table of possible lifting sizes
@@ -378,16 +378,14 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho
   int indlist2[1000];
 
   //determine number of bits in codeword
-  //if (block_length>3840)
+  if (BG==1)
   {
-    BG=1;
     Kb = 22;
     nrows=46; //parity check bits
     ncols=22; //info bits
   }
-  /*else if (block_length<=3840)
+  else if (BG==2)
   {
-    BG=2;
     nrows=42;  //parity check bits
     ncols=10;  // info bits
 
@@ -399,7 +397,7 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho
       Kb = 8;
     else
       Kb = 6;
-      }*/
+  }
 
   //find minimum value in all sets of lifting size
   Zc=0;
@@ -417,6 +415,8 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho
     return(-1);
   }
 
+  int K = ncols*Zc;
+
   Gen_shift_values=choose_generator_matrix(BG,Zc);
   if (Gen_shift_values==NULL) {
     printf("ldpc_encoder_orig: could not find generator matrix\n");
@@ -438,9 +438,15 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho
   }
   
   no_punctured_columns=(int)((nrows-2)*Zc+block_length-block_length*3)/Zc;
+  //nrows - no_punctured_columns = 2 +2*block_length/Zc
   removed_bit=(nrows-no_punctured_columns-2) * Zc+block_length-(block_length*3);
+  // ((nrows-no_punctured_columns) * Zc-removed_bit) =
+  // 2Zc + 2*block_length
   //printf("%d\n",no_punctured_columns);
   //printf("%d\n",removed_bit);
+  //printf("%d\n",nrows-no_punctured_columns);
+  //printf("%d\n",((nrows-no_punctured_columns) * Zc-removed_bit));
+  
   // unpack input
   memset(c,0,sizeof(unsigned char) * ncols * Zc);
   memset(d,0,sizeof(unsigned char) * nrows * Zc);
@@ -608,8 +614,8 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho
   }
 
   // information part and puncture columns
-  memcpy(&channel_input[0], &c[2*Zc], (block_length-2*Zc)*sizeof(unsigned char));
-  memcpy(&channel_input[block_length-2*Zc], &d[0], ((nrows-no_punctured_columns) * Zc-removed_bit)*sizeof(unsigned char));
+  memcpy(&channel_input[0], &c[2*Zc], (block_length-2*Zc)*sizeof(unsigned char)); //systematic bits
+  memcpy(&channel_input[block_length-2*Zc], &d[0], ((nrows-no_punctured_columns) * Zc-removed_bit)*sizeof(unsigned char)); //systematic bits 2Zc + 2*block_length 
   //memcpy(channel_input,c,Kb*Zc*sizeof(unsigned char));
   return 0;
 }

openair1/PHY/INIT/nr_init.c

@@ -33,6 +33,10 @@
 #include "assertions.h"
 #include <math.h>
 
+#include "PHY/NR_REFSIG/defs.h" 
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "SCHED_NR/fapi_nr_l1.h"
+
 extern uint32_t from_earfcn(int eutra_bandP,uint32_t dl_earfcn);
 extern int32_t get_uldl_offset(int eutra_bandP);
 
@@ -40,36 +44,35 @@ int l1_north_init_gNB() {
 
   int i,j;
 
-  if (RC.nb_L1_inst > 0 && RC.nb_L1_CC != NULL && RC.gNB != NULL)
+  if (RC.nb_nr_L1_inst > 0 && RC.nb_nr_L1_CC != NULL && RC.gNB != NULL)
   {
-    AssertFatal(RC.nb_L1_inst>0,"nb_L1_inst=%d\n",RC.nb_L1_inst);
-    AssertFatal(RC.nb_L1_CC!=NULL,"nb_L1_CC is null\n");
+    AssertFatal(RC.nb_nr_L1_inst>0,"nb_nr_L1_inst=%d\n",RC.nb_nr_L1_inst);
+    AssertFatal(RC.nb_nr_L1_CC!=NULL,"nb_nr_L1_CC is null\n");
     AssertFatal(RC.gNB!=NULL,"RC.gNB is null\n");
 
-    LOG_I(PHY,"%s() RC.nb_L1_inst:%d\n", __FUNCTION__, RC.nb_L1_inst);
+    LOG_I(PHY,"%s() RC.nb_nr_L1_inst:%d\n", __FUNCTION__, RC.nb_nr_L1_inst);
 
-    for (i=0;i<RC.nb_L1_inst;i++) {
+    for (i=0;i<RC.nb_nr_L1_inst;i++) {
       AssertFatal(RC.gNB[i]!=NULL,"RC.gNB[%d] is null\n",i);
-      AssertFatal(RC.nb_L1_CC[i]>0,"RC.nb_L1_CC[%d]=%d\n",i,RC.nb_L1_CC[i]);
+      AssertFatal(RC.nb_nr_L1_CC[i]>0,"RC.nb_nr_L1_CC[%d]=%d\n",i,RC.nb_nr_L1_CC[i]);
 
-      LOG_I(PHY,"%s() RC.nb_L1_CC[%d]:%d\n", __FUNCTION__, i,  RC.nb_L1_CC[i]);
+      LOG_I(PHY,"%s() RC.nb_nr_L1_CC[%d]:%d\n", __FUNCTION__, i,  RC.nb_nr_L1_CC[i]);
 
-      for (j=0;j<RC.nb_L1_CC[i];j++) {
+      for (j=0;j<RC.nb_nr_L1_CC[i];j++) {
         AssertFatal(RC.gNB[i][j]!=NULL,"RC.gNB[%d][%d] is null\n",i,j);
 
-        if ((RC.gNB[i][j]->if_inst =  IF_Module_init(i))<0) return(-1); 
+        if ((RC.gNB[i][j]->if_inst =  NR_IF_Module_init(i))<0) return(-1); 
 
         LOG_I(PHY,"%s() RC.gNB[%d][%d] installing callbacks\n", __FUNCTION__, i,  j);
 
-        RC.gNB[i][j]->if_inst->PHY_config_req = phy_config_request;
-        nr_phy_config_request(RC.gNB[i][j]);
-        RC.gNB[i][j]->if_inst->schedule_response = schedule_response;
+        RC.gNB[i][j]->if_inst->NR_PHY_config_req = nr_phy_config_request;
+        RC.gNB[i][j]->if_inst->NR_Schedule_response = nr_schedule_response;
       }
     }
   }
   else
   {
-    LOG_I(PHY,"%s() Not installing PHY callbacks - RC.nb_L1_inst:%d RC.nb_L1_CC:%p RC.gNB:%p\n", __FUNCTION__, RC.nb_L1_inst, RC.nb_L1_CC, RC.gNB);
+    LOG_I(PHY,"%s() Not installing PHY callbacks - RC.nb_nr_L1_inst:%d RC.nb_nr_L1_CC:%p RC.gNB:%p\n", __FUNCTION__, RC.nb_nr_L1_inst, RC.nb_nr_L1_CC, RC.gNB);
   }
   return(0);
 }
@@ -82,7 +85,7 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
 
   // shortcuts
   NR_DL_FRAME_PARMS* const fp       = &gNB->frame_parms;
-  nfapi_config_request_t* cfg       = &gNB->gNB_config;
+  nfapi_nr_config_request_t* cfg       = &gNB->gNB_config;
   NR_gNB_COMMON* const common_vars  = &gNB->common_vars;
   LTE_eNB_PUSCH** const pusch_vars   = gNB->pusch_vars;
   LTE_eNB_SRS* const srs_vars        = gNB->srs_vars;
@@ -227,7 +230,7 @@ void phy_config_request(PHY_Config_t *phy_config) {
 
   uint8_t Mod_id              = phy_config->Mod_id;
   int CC_id                   = phy_config->CC_id;
-  nfapi_config_request_t *cfg = phy_config->cfg;
+  nfapi_nr_config_request_t *cfg = phy_config->cfg;
 
   NR_DL_FRAME_PARMS *fp;
   PHICH_RESOURCE_t phich_resource_table[4]={oneSixth,half,one,two};
@@ -269,7 +272,7 @@ void phy_config_request(PHY_Config_t *phy_config) {
 void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
 {
 //  NR_DL_FRAME_PARMS* const fp       = &gNB->frame_parms;
-  nfapi_config_request_t *cfg       = &gNB->gNB_config;
+  nfapi_nr_config_request_t *cfg       = &gNB->gNB_config;
   NR_gNB_COMMON* const common_vars  = &gNB->common_vars;
   LTE_eNB_PUSCH** const pusch_vars   = gNB->pusch_vars;
   LTE_eNB_SRS* const srs_vars        = gNB->srs_vars;
@@ -338,10 +341,11 @@ void install_schedule_handlers(IF_Module_t *if_inst)
 }*/
 
 /// this function is a temporary addition for NR configuration
-void nr_phy_config_request(PHY_VARS_gNB *gNB)
+
+/*void nr_phy_config_request(PHY_VARS_gNB *gNB)
 {
   NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
-  nfapi_config_request_t *gNB_config = &gNB->gNB_config;
+  nfapi_nr_config_request_t *gNB_config = &gNB->gNB_config;
 
   //overwrite for new NR parameters
   gNB_config->nfapi_config.rf_bands.rf_band[0] = 22;
@@ -367,4 +371,63 @@ void nr_phy_config_request(PHY_VARS_gNB *gNB)
 
   gNB->configured                                   = 1;
   LOG_I(PHY,"gNB configured\n");
+}*/
+
+
+void nr_phy_config_request(NR_PHY_Config_t *phy_config)
+{
+
+  uint8_t Mod_id                  = phy_config->Mod_id;
+  int     CC_id                   = phy_config->CC_id;
+
+  NR_DL_FRAME_PARMS         *fp         = &RC.gNB[Mod_id][CC_id]->frame_parms;
+  nfapi_nr_config_request_t *gNB_config = &RC.gNB[Mod_id][CC_id]->gNB_config;
+
+
+  gNB_config->nfapi_config.rf_bands.rf_band[0]          = phy_config->cfg->nfapi_config.rf_bands.rf_band[0]; //22
+  gNB_config->nfapi_config.earfcn.value                 = phy_config->cfg->nfapi_config.earfcn.value; //6600
+  gNB_config->subframe_config.numerology_index_mu.value = phy_config->cfg->subframe_config.numerology_index_mu.value;//1
+  gNB_config->rf_config.tx_antenna_ports.value          = phy_config->cfg->rf_config.tx_antenna_ports.value; //1
+  gNB_config->rf_config.dl_channel_bandwidth.value      = phy_config->cfg->rf_config.dl_channel_bandwidth.value;//106;
+  gNB_config->rf_config.ul_channel_bandwidth.value      = phy_config->cfg->rf_config.ul_channel_bandwidth.value;//106;
+  gNB_config->sch_config.half_frame_index.value         = 0;
+  gNB_config->sch_config.ssb_subcarrier_offset.value    = phy_config->cfg->sch_config.ssb_subcarrier_offset.value;//0;
+  gNB_config->sch_config.n_ssb_crb.value                = 86;
+  gNB_config->sch_config.physical_cell_id.value         = phy_config->cfg->sch_config.physical_cell_id.value;
+
+  if (phy_config->cfg->subframe_config.duplex_mode.value == 0) {
+    gNB_config->subframe_config.duplex_mode.value    = TDD;
+  }
+  else {
+    gNB_config->subframe_config.duplex_mode.value    = FDD;
+  }
+
+  RC.gNB[Mod_id][CC_id]->mac_enabled     = 1;
+
+  fp->dl_CarrierFreq = from_earfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.earfcn.value);
+  fp->ul_CarrierFreq = fp->dl_CarrierFreq - (get_uldl_offset(gNB_config->nfapi_config.rf_bands.rf_band[0])*100000);
+  fp->threequarter_fs                    = 0;
+
+  LOG_I(PHY,"Configuring MIB for instance %d, CCid %d : (band %d,N_RB_DL %d, N_RB_UL %d, Nid_cell %d,gNB_tx_antenna_ports %d,DL freq %u)\n",
+  Mod_id, 
+  CC_id, 
+  gNB_config->nfapi_config.rf_bands.rf_band[0], 
+  gNB_config->rf_config.dl_channel_bandwidth.value, 
+  gNB_config->rf_config.ul_channel_bandwidth.value, 
+  gNB_config->sch_config.physical_cell_id.value, 
+  gNB_config->rf_config.tx_antenna_ports.value,
+  fp->dl_CarrierFreq );
+
+  nr_init_frame_parms(gNB_config, fp);
+
+  if (RC.gNB[Mod_id][CC_id]->configured == 1){
+    LOG_E(PHY,"Already gNB already configured, do nothing\n");
+    return;
+  }
+
+  RC.gNB[Mod_id][CC_id]->configured     = 1;
+  LOG_I(PHY,"gNB %d/%d configured\n",Mod_id,CC_id);
+
+
+
 }

openair1/PHY/INIT/nr_init_ru.c

@@ -100,12 +100,12 @@ int nr_phy_init_RU(RU_t *ru) {
       LOG_D(PHY,"[INIT] prach_vars->rxsigF[%d] = %p\n",i,ru->prach_rxsigF[i]);
     }
     
-    AssertFatal(RC.nb_L1_inst <= NUMBER_OF_eNB_MAX,"gNB instances %d > %d\n",
-		RC.nb_L1_inst,NUMBER_OF_eNB_MAX);
+    AssertFatal(RC.nb_nr_L1_inst <= NUMBER_OF_eNB_MAX,"gNB instances %d > %d\n",
+		RC.nb_nr_L1_inst,NUMBER_OF_gNB_MAX);
 
-    LOG_E(PHY,"[INIT] %s() RC.nb_L1_inst:%d \n", __FUNCTION__, RC.nb_L1_inst);
+    LOG_E(PHY,"[INIT] %s() RC.nb_nr_L1_inst:%d \n", __FUNCTION__, RC.nb_nr_L1_inst);
 
-    for (i=0; i<RC.nb_L1_inst; i++) {
+    for (i=0; i<RC.nb_nr_L1_inst; i++) {
       for (p=0;p<15;p++) {
         LOG_D(PHY,"[INIT] %s() nb_antenna_ports_eNB:%d \n", __FUNCTION__, ru->gNB_list[i]->gNB_config.rf_config.tx_antenna_ports.value);
 	if (p<ru->gNB_list[i]->gNB_config.rf_config.tx_antenna_ports.value || p==5) {
@@ -178,7 +178,7 @@ void nr_phy_free_RU(RU_t *ru)
     free_and_zero(ru->prach_rxsigF);
     /* ru->prach_rxsigF_br is not allocated -> don't free */
 
-    for (i = 0; i < RC.nb_L1_inst; i++) {
+    for (i = 0; i < RC.nb_nr_L1_inst; i++) {
       for (p = 0; p < 15; p++) {
 	if (p < ru->gNB_list[i]->gNB_config.rf_config.tx_antenna_ports.value || p == 5) {
 	  for (j=0; j<ru->nb_tx; j++) free_and_zero(ru->beam_weights[i][p][j]);

openair1/PHY/INIT/nr_init_ue.c

@@ -33,6 +33,7 @@
 #include "PHY/NR_UE_TRANSPORT/nr_transport_ue.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h"
 
 //uint8_t dmrs1_tab_ue[8] = {0,2,3,4,6,8,9,10};
 
@@ -656,6 +657,9 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
 
   printf("Initializing UE vars (abstraction %"PRIu8") for eNB TXant %"PRIu8", UE RXant %"PRIu8"\n",abstraction_flag,fp->nb_antennas_tx,fp->nb_antennas_rx);
   //LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_UE][MOD %02u][]\n", ue->Mod_id+NB_eNB_INST);
+  
+  //phy_init_nr_top(&ue->frame_parms);
+  //nr_init_frame_parms_ue(&ue->frame_parms);
 
   // many memory allocation sizes are hard coded
   AssertFatal( fp->nb_antennas_rx <= 2, "hard coded allocation for ue_common_vars->dl_ch_estimates[eNB_id]" );
@@ -841,17 +845,17 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
       pbch_vars[eNB_id]->rxdataF_ext         = (int32_t**)malloc16( fp->nb_antennas_rx*sizeof(int32_t*) );
       pbch_vars[eNB_id]->rxdataF_comp        = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
       pbch_vars[eNB_id]->dl_ch_estimates_ext = (int32_t**)malloc16_clear( 8*sizeof(int32_t*) );
-      pbch_vars[eNB_id]->llr                 = (int8_t*)malloc16_clear( 1920 );
+      pbch_vars[eNB_id]->llr                 = (int8_t*)malloc16_clear( 1920 );//
       prach_vars[eNB_id]->prachF             = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
       prach_vars[eNB_id]->prach              = (int16_t*)malloc16_clear( sizeof(int)*(7*2*sizeof(int)*(fp->ofdm_symbol_size*12)) );
 
       for (i=0; i<fp->nb_antennas_rx; i++) {
-        pbch_vars[eNB_id]->rxdataF_ext[i]    = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
+        pbch_vars[eNB_id]->rxdataF_ext[i]    = (int32_t*)malloc16_clear( sizeof(int32_t)*20*12*4 );
 
         for (j=0; j<4; j++) {//fp->nb_antennas_tx;j++) {
           int idx = (j<<1)+i;
-          pbch_vars[eNB_id]->rxdataF_comp[idx]        = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
-          pbch_vars[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*6*12*4 );
+          pbch_vars[eNB_id]->rxdataF_comp[idx]        = (int32_t*)malloc16_clear( sizeof(int32_t)*20*12*4 );
+          pbch_vars[eNB_id]->dl_ch_estimates_ext[idx] = (int32_t*)malloc16_clear( sizeof(int32_t)*20*12*4 );
         }
       }
     }
@@ -870,7 +874,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
 
   if (abstraction_flag == 0) {
     for (th_id=0; th_id<RX_NB_TH_MAX; th_id++) {
-        phy_init_lte_ue__PDSCH( (*pdsch_vars_th)[th_id][eNB_id], fp );
+        //phy_init_lte_ue__PDSCH( (*pdsch_vars_th)[th_id][eNB_id], fp );
         (*pdsch_vars_th)[th_id][eNB_id]->llr[1] = (int16_t*)malloc16_clear( (8*((3*8*8448)+12))*sizeof(int16_t) );
     }
 
@@ -955,6 +959,9 @@ void phy_init_nr_top(NR_DL_FRAME_PARMS *frame_parms)
 
   generate_ul_reference_signal_sequences(SHRT_MAX);
 
+  // Polar encoder init for PBCH
+  nr_polar_init(&frame_parms->pbch_polar_params, 1);
+
   //lte_sync_time_init(frame_parms);
 
   //generate_ul_ref_sigs();

openair1/PHY/INIT/nr_parms.c

@@ -26,7 +26,7 @@
 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, 16, 32};
 
-int nr_init_frame_parms(nfapi_config_request_t* config,
+int nr_init_frame_parms(nfapi_nr_config_request_t* config,
                         NR_DL_FRAME_PARMS *frame_parms)
 {
 
@@ -146,13 +146,12 @@ int nr_init_frame_parms(nfapi_config_request_t* config,
   frame_parms->samples_per_subframe = (frame_parms->samples_per_subframe_wCP + (frame_parms->nb_prefix_samples0 * frame_parms->slots_per_subframe) +
                                       (frame_parms->nb_prefix_samples * frame_parms->slots_per_subframe * (frame_parms->symbols_per_slot - 1)));
   frame_parms->samples_per_frame = 10 * frame_parms->samples_per_subframe;
-
+  frame_parms->freq_range = (frame_parms->dl_CarrierFreq < 6e9)? nr_FR1 : nr_FR2;
 
   return 0;
 }
 
-int nr_init_frame_parms_ue(nfapi_config_request_t* config,
-                        NR_DL_FRAME_PARMS *frame_parms)
+int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms)
 {
 
   int N_RB = 106;
@@ -165,18 +164,6 @@ int nr_init_frame_parms_ue(nfapi_config_request_t* config,
   LOG_I(PHY,"Initializing frame parms for mu %d, N_RB %d, Ncp %d\n",mu, N_RB, Ncp);
 #endif
 
-  frame_parms->frame_type          = FDD;
-  frame_parms->tdd_config          = 3;
-  //frame_parms[CC_id]->tdd_config_S        = 0;
-  frame_parms->N_RB_DL             = 100;
-  frame_parms->N_RB_UL             = 100;
-  frame_parms->Ncp                 = NORMAL;
-  //frame_parms[CC_id]->Ncp_UL              = NORMAL;
-  frame_parms->Nid_cell            = 0;
-  //frame_parms[CC_id]->num_MBSFN_config    = 0;
-  frame_parms->nb_antenna_ports_eNB  = 1;
-  frame_parms->nb_antennas_tx      = 1;
-  frame_parms->nb_antennas_rx      = 1;
 
   if (Ncp == EXTENDED)
     AssertFatal(mu == NR_MU_2,"Invalid cyclic prefix %d for numerology index %d\n", Ncp, mu);
@@ -295,7 +282,7 @@ int nr_init_frame_parms_ue(nfapi_config_request_t* config,
   //frame_parms->samples_per_subframe = (frame_parms->samples_per_subframe_wCP + (frame_parms->nb_prefix_samples0 * frame_parms->slots_per_subframe) +
   //                                    (frame_parms->nb_prefix_samples * frame_parms->slots_per_subframe * (frame_parms->symbols_per_slot - 1)));
   frame_parms->samples_per_frame = 10 * frame_parms->samples_per_subframe;
-
+  frame_parms->freq_range = (frame_parms->dl_CarrierFreq < 6e9)? nr_FR1 : nr_FR2;
 
   return 0;
 }

openair1/PHY/INIT/phy_init.h

@@ -374,12 +374,14 @@ void phy_config_request(PHY_Config_t *phy_config);
 
 int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf);
 void dump_frame_parms(LTE_DL_FRAME_PARMS *frame_parms);
-int nr_init_frame_parms(nfapi_config_request_t* config, NR_DL_FRAME_PARMS *frame_parms);
-int nr_init_frame_parms_ue(nfapi_config_request_t* config, NR_DL_FRAME_PARMS *frame_parms);
+int nr_init_frame_parms(nfapi_nr_config_request_t* config, NR_DL_FRAME_PARMS *frame_parms);
+int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms);
+int init_nr_ue_signal(PHY_VARS_NR_UE *ue,int nb_connected_eNB,uint8_t abstraction_flag);
 void nr_dump_frame_parms(NR_DL_FRAME_PARMS *frame_parms);
 int phy_init_nr_gNB(PHY_VARS_gNB *gNB, unsigned char is_secondary_gNB, unsigned char abstraction_flag);
-void nr_phy_config_request(PHY_VARS_gNB *gNB);
+void nr_phy_config_request(NR_PHY_Config_t *gNB);
 void phy_free_nr_gNB(PHY_VARS_gNB *gNB);
+int l1_north_init_gNB(void);
 
 /** @} */
 #endif

openair1/PHY/MODULATION/modulation_UE.h

@@ -48,12 +48,13 @@ int slot_fep(PHY_VARS_UE *phy_vars_ue,
              int no_prefix,
 	     int reset_freq_est);
 
-int slot_fep_pbch(PHY_VARS_NR_UE *phy_vars_ue,
+int nr_slot_fep(PHY_VARS_NR_UE *phy_vars_ue,
              unsigned char l,
              unsigned char Ns,
              int sample_offset,
              int no_prefix,
-	     int reset_freq_est);
+	     int reset_freq_est,
+			 NR_CHANNEL_EST_t channel);
 
 int slot_fep_mbsfn(PHY_VARS_UE *phy_vars_ue,
                    unsigned char l,

openair1/PHY/MODULATION/slot_fep.c

@@ -23,17 +23,19 @@
 #include "PHY/defs_nr_UE.h"
 #include "modulation_UE.h"
 #include "PHY/LTE_ESTIMATION/lte_estimation.h"
+#include "PHY/NR_UE_ESTIMATION/nr_estimation.h"
 
 //#define DEBUG_FEP
 
 #define SOFFSET 0
 
-int slot_fep_pbch(PHY_VARS_NR_UE *ue,
+int nr_slot_fep(PHY_VARS_NR_UE *ue,
              unsigned char l,
              unsigned char Ns,
              int sample_offset,
              int no_prefix,
-			 int reset_freq_est)
+			 int reset_freq_est,
+			 NR_CHANNEL_EST_t channel)
 {
   NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
   NR_UE_COMMON *common_vars   = &ue->common_vars;
@@ -44,9 +46,14 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,
   unsigned int nb_prefix_samples0 = (no_prefix ? 0 : frame_parms->nb_prefix_samples0);
   unsigned int subframe_offset;//,subframe_offset_F;
   unsigned int slot_offset;
-  int i;
+  //int i;
   unsigned int frame_length_samples = frame_parms->samples_per_subframe * 10;
   unsigned int rx_offset;
+  //NR_UE_PDCCH *pdcch_vars  = ue->pdcch_vars[ue->current_thread_id[Ns>>1]][0];
+  uint16_t coreset_start_subcarrier = frame_parms->first_carrier_offset;
+  uint16_t nb_rb_coreset = 24;
+  uint16_t bwp_start_subcarrier = frame_parms->first_carrier_offset;
+  uint16_t nb_rb_pdsch = 100;
 
   /*LTE_UE_DLSCH_t **dlsch_ue = phy_vars_ue->dlsch_ue[eNB_id];
   unsigned char harq_pid = dlsch_ue[0]->current_harq_pid;
@@ -94,10 +101,10 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,
     slot_offset = (frame_parms->samples_per_tti>>1) * (Ns%2);
   }
 
-  if (l<0 || l>=7-frame_parms->Ncp) {
+  /*if (l<0 || l>=7-frame_parms->Ncp) {
     printf("slot_fep: l must be between 0 and %d\n",7-frame_parms->Ncp);
     return(-1);
-  }
+    }*/
 
   if (Ns<0 || Ns>=20) {
     printf("slot_fep: Ns must be between 0 and 19\n");
@@ -181,12 +188,15 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,
   }
 
   if (ue->perfect_ce == 0) {
-    if ((l>0) && (l<4)) {
+
+  switch(channel){
+  case NR_PBCH_EST:
+    //if ((l>4) && (l<8)) {
       for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {
 
-#ifdef DEBUG_FEP
+//#ifdef DEBUG_FEP
         printf("Channel estimation eNB %d, aatx %d, slot %d, symbol %d\n",eNB_id,aa,Ns,l);
-#endif
+//#endif
 #if UE_TIMING_TRACE
         start_meas(&ue->dlsch_channel_estimation_stats);
 #endif
@@ -195,8 +205,10 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,
                                   aa,
                                   l,
                                   symbol);
-      }
-
+      //}
+#if UE_TIMING_TRACE
+        stop_meas(&ue->dlsch_channel_estimation_stats);
+#endif
 
       // do frequency offset estimation here!
       // use channel estimates from current symbol (=ch_t) and last symbol (ch_{t-1})
@@ -221,6 +233,60 @@ int slot_fep_pbch(PHY_VARS_NR_UE *ue,
 
       }
     }
+  break;
+
+  case NR_PDCCH_EST:
+      for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {
+
+#ifdef DEBUG_FEP
+          printf("Channel estimation eNB %d, aatx %d, slot %d, symbol %d\n",eNB_id,aa,Ns,l);
+#endif
+#if UE_TIMING_TRACE
+          start_meas(&ue->dlsch_channel_estimation_stats);
+#endif
+          nr_pdcch_channel_estimation(ue,eNB_id,0,
+                                    Ns,
+                                    aa,
+                                    l,
+                                    symbol,
+									coreset_start_subcarrier,
+									nb_rb_coreset);
+#if UE_TIMING_TRACE
+        stop_meas(&ue->dlsch_channel_estimation_stats);
+#endif
+      }
+    break;
+
+  case NR_PDSCH_EST:
+      for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {
+
+#ifdef DEBUG_FEP
+          printf("Channel estimation eNB %d, aatx %d, slot %d, symbol %d\n",eNB_id,aa,Ns,l);
+#endif
+#if UE_TIMING_TRACE
+          start_meas(&ue->dlsch_channel_estimation_stats);
+#endif
+          nr_pdsch_channel_estimation(ue,eNB_id,0,
+                                    Ns,
+                                    aa,
+                                    l,
+                                    symbol,
+									bwp_start_subcarrier,
+									nb_rb_pdsch);
+#if UE_TIMING_TRACE
+        stop_meas(&ue->dlsch_channel_estimation_stats);
+#endif
+      }
+    break;
+
+  case NR_SSS_EST:
+  break;
+
+  default:
+    LOG_E(PHY,"[UE][FATAL] Unknown channel format %d\n",channel);
+    return(-1);
+    break;
+  }
 
   }
 

openair1/PHY/NR_REFSIG/nr_dmrs_rx.c

@@ -41,6 +41,7 @@
 
 #include "refsig_defs_ue.h"
 #include "PHY/defs_nr_UE.h"
+#include "nr_mod_table.h"
 #include "log.h"
 
 /*Table 7.4.1.1.2-1/2 from 38.211 */
@@ -49,18 +50,69 @@ int wt1[8][2] = {{1,1},{1,1},{1,1},{1,1},{1,-1},{1,-1},{1,-1},{1,-1}};
 int wf2[12][2] = {{1,1},{1,-1},{1,1},{1,-1},{1,1},{1,-1},{1,1},{1,1},{1,1},{1,-1},{1,1},{1,1}};
 int wt2[12][2] = {{1,1},{1,1},{1,1},{1,1},{1,1},{1,1},{1,-1},{1,-1},{1,-1},{1,-1},{1,-1},{1,-1}};
 
-short nr_mod_table[14] = {0,0,23170,23170,-23170,-23170,23170,23170,23170,-23170,-23170,23170,-23170,-23170};
-//extern short nr_mod_table[NR_MOD_TABLE_SIZE_SHORT];
 
+short nr_rx_mod_table[NR_MOD_TABLE_SIZE_SHORT] = {0,0,23170,-23170,-23170,23170,23170,-23170,23170,23170,-23170,-23170,-23170,23170};
+
+/*int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
+						uint8_t eNB_offset,
+						unsigned int Ns,
+						unsigned int nr_gold_pdcch[7][20][3][10],
+						int32_t *output,
+						unsigned short p,
+						int length_dmrs,
+						unsigned short nb_rb_coreset)
+{
+  int32_t qpsk[4],n;
+  int w,ind,l,ind_dword,ind_qpsk_symb,kp,k;
+  short pamp;
+  pamp = ONE_OVER_SQRT2_Q15;
+
+  // This includes complex conjugate for channel estimation
+  ((short *)&qpsk[0])[0] = pamp;
+  ((short *)&qpsk[0])[1] = -pamp;
+  ((short *)&qpsk[1])[0] = -pamp;
+  ((short *)&qpsk[1])[1] = -pamp;
+  ((short *)&qpsk[2])[0] = pamp;
+  ((short *)&qpsk[2])[1] = pamp;
+  ((short *)&qpsk[3])[0] = -pamp;
+  ((short *)&qpsk[3])[1] = pamp;
+
+  if (p==2000) {
+        for (n=0; n<nb_rb_coreset*3; n++) {
+        	for (l =0; l<length_dmrs; l++){
+        		for (kp=0; kp<3; kp++){
+
+        			ind = 3*n+kp;
+        			ind_dword = ind>>4;
+        			ind_qpsk_symb = ind&0xf;
+
+        			output[k] = qpsk[(nr_gold_pdcch[eNB_offset][Ns][l][ind_dword]>>(2*ind_qpsk_symb))&3];
+
+#ifdef DEBUG_DL_DMRS
+          LOG_I(PHY,"Ns %d, p %d, ind_dword %d, ind_qpsk_symbol %d\n",
+                Ns,p,idx_dword,idx_qpsk_symb);
+          LOG_I(PHY,"index = %d\n",(nr_gold_pdsch[0][Ns][lprime][ind_dword]>>(2*ind_qpsk_symb))&3);
+#endif
+
+          	  	  	k++;
+        		}
+        	}
+        }
+  } else {
+    LOG_E(PHY,"Illegal PDCCH DMRS port %d\n",p);
+  }
+
+  return(0);
+}*/
 
 int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
-						unsigned int ncp,
+						uint8_t eNB_offset,
 						unsigned int Ns,
 						unsigned int nr_gold_pdsch[2][20][2][21],
 						int32_t *output,
 						unsigned short p,
 						int length_dmrs,
-						unsigned short nb_pdsch_rb)
+						unsigned short nb_rb_pdsch)
 {
   int32_t qpsk[4],nqpsk[4],*qpsk_p, n;
   int w,mprime,ind,l,ind_dword,ind_qpsk_symb,kp,lp, config_type, k;
@@ -74,7 +126,7 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
   printf("dmrs config type %d port %d\n", config_type, p);
 
   // Compute the correct pilot amplitude, sqrt_rho_b = Q3.13
-  pamp = 23170; //ONE_OVER_SQRT2_Q15;
+  pamp = ONE_OVER_SQRT2_Q15;
 
   // This includes complex conjugate for channel estimation
   ((short *)&qpsk[0])[0] = pamp;
@@ -102,10 +154,9 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
       LOG_E(PHY,"Bad PDSCH DMRS config type %d\n", config_type);
 
   if ((p>=1000) && (p<((config_type==0) ? 1008 : 1012))) {
-      if (/*ue->frame_parms.Ncp == NORMAL*/ncp ==0) {
 
         // r_n from 38.211 7.4.1.1
-        for (n=0; n<nb_pdsch_rb*((config_type==0) ? 3:2); n++) {
+        for (n=0; n<nb_rb_pdsch*((config_type==0) ? 3:2); n++) {
         	for (lp =0; lp<length_dmrs; lp++){
         		for (kp=0; kp<2; kp++){
         			w = (wf[p-1000][kp])*(wt[p-1000][lp]);
@@ -115,7 +166,7 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
         			ind_dword = ind>>4;
         			ind_qpsk_symb = ind&0xf;
 
-        			output[k] = qpsk_p[(ue->nr_gold_pdsch[0][Ns][lp][ind_dword]>>(2*ind_qpsk_symb))&3];
+        			output[k] = qpsk_p[(nr_gold_pdsch[0][Ns][lp][ind_dword]>>(2*ind_qpsk_symb))&3];
 
 
 #ifdef DEBUG_DL_DMRS
@@ -128,9 +179,6 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
         		}
         	}
         }
-      } else {
-        LOG_E(PHY,"extended cp not supported for PDSCH DMRS yet\n");
-      }
   } else {
     LOG_E(PHY,"Illegal p %d PDSCH DMRS port\n",p);
   }
@@ -138,19 +186,51 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
   return(0);
 }
 
+int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
+						uint8_t eNB_offset,
+						unsigned int Ns,
+						unsigned int *nr_gold_pdcch,
+						int32_t *output,
+						unsigned short p,
+						unsigned short nb_rb_coreset)
+{
+
+	uint8_t idx=0;
+	uint8_t pdcch_rb_offset =0;
+	//nr_gold_pdcch += ((int)floor(ue->frame_parms.ssb_start_subcarrier/12)+pdcch_rb_offset)*3/32;
+
+	if (p==2000) {
+    	for (int i=0; i<((nb_rb_coreset*6)>>1); i++) {
+    		idx = ((((nr_gold_pdcch[(i<<1)>>5])>>((i<<1)&0x1f))&1)<<1) ^ (((nr_gold_pdcch[((i<<1)+1)>>5])>>(((i<<1)+1)&0x1f))&1);
+    		((int16_t*)output)[i<<1] = nr_rx_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
+    		((int16_t*)output)[(i<<1)+1] = nr_rx_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1) + 1];
+#ifdef DEBUG_PDCCH
+	  printf("i %d idx %d pdcch gold %d b0-b1 %d-%d mod_dmrs %d %d\n", i, idx, nr_gold_pdcch[(i<<1)>>5], (((nr_gold_pdcch[(i<<1)>>5])>>((i<<1)&0x1f))&1),
+	  (((nr_gold_pdcch[((i<<1)+1)>>5])>>(((i<<1)+1)&0x1f))&1), ((int16_t*)output)[i<<1], ((int16_t*)output)[(m<<1)+1],&output[0]);
+#endif
+	    }
+	}
+
+	return(0);
+}
+
 int nr_pbch_dmrs_rx(unsigned int *nr_gold_pbch,
 					int32_t *output	)
 {
-	int m;
+    int m;
+    uint8_t idx=0;
+
+    /// QPSK modulation
+    for (m=0; m<NR_PBCH_DMRS_LENGTH>>1; m++) {
+      idx = ((((nr_gold_pbch[(m<<1)>>5])>>((m<<1)&0x1f))&1)<<1) ^ (((nr_gold_pbch[((m<<1)+1)>>5])>>(((m<<1)+1)&0x1f))&1);
+      ((int16_t*)output)[m<<1] = nr_rx_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
+      ((int16_t*)output)[(m<<1)+1] = nr_rx_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1) + 1];
 
-	/// BPSK modulation
-    for (m=0; m<NR_PBCH_DMRS_LENGTH; m++) {
-      ((int16_t*)output)[m<<1] = nr_mod_table[((1 + ((nr_gold_pbch[m>>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1)];
-      ((int16_t*)output)[(m<<1)+1] = nr_mod_table[((1 + ((nr_gold_pbch[m>>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1) + 1];
 #ifdef DEBUG_PBCH
-	//printf("nr_gold_pbch[m>>5] %x\n",nr_gold_pbch[m>>5]);
-       if (m<6)
-	printf("m %d  output %d %d addr %p\n", m, output[2*m], output[2*m+1],&output[0]);
+       if (m<16)
+        {printf("nr_gold_pbch[(m<<1)>>5] %x\n",nr_gold_pbch[(m<<1)>>5]);
+	printf("m %d  output %d %d addr %p\n", m, ((int16_t*)output)[m<<1], ((int16_t*)output)[(m<<1)+1],&output[0]);
+	}
 #endif
     }
 

openair1/PHY/NR_REFSIG/nr_gold.c

@@ -27,7 +27,7 @@ void nr_init_pbch_dmrs(PHY_VARS_gNB* gNB)
   unsigned int n, x1, x2;
   unsigned char Nid, i_ssb, i_ssb2;
   unsigned char Lmax, l, n_hf, N_hf;
-  nfapi_config_request_t *cfg = &gNB->gNB_config;
+  nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
   NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
 
   Nid = cfg->sch_config.physical_cell_id.value;

openair1/PHY/NR_REFSIG/nr_gold_ue.c

@@ -64,11 +64,54 @@ void nr_gold_pbch(PHY_VARS_NR_UE* ue)
 
 }
 
-void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int nr_gold_pdsch[2][20][2][21],unsigned int Nid_cell, unsigned short *n_idDMRS, unsigned short length_dmrs)
+void nr_gold_pdcch(PHY_VARS_NR_UE* ue,unsigned short n_idDMRS, unsigned short length_dmrs)
 {
 
   unsigned char ns,l;
-  unsigned int n,x1,x2,x2tmp0,x2tmp1, x2tmp2,x2s;
+  unsigned int n,x1,x2,x2tmp0;
+  unsigned int nid;
+
+    if (n_idDMRS)
+      nid = n_idDMRS;
+    else
+      nid = ue->frame_parms.Nid_cell;
+
+    for (ns=0; ns<20; ns++) {
+
+      for (l=0; l<length_dmrs; l++) {
+
+    	x2tmp0 = ((14*ns+l+1)*((nid<<1)+1))<<17;
+        x2 = (x2tmp0+(nid<<1))%(1<<31);  //cinit
+
+        x1 = 1+ (1<<31);
+        x2=x2 ^ ((x2 ^ (x2>>1) ^ (x2>>2) ^ (x2>>3))<<31);
+
+        // skip first 50 double words (1600 bits)
+        for (n=1; n<50; n++) {
+          x1 = (x1>>1) ^ (x1>>4);
+          x1 = x1 ^ (x1<<31) ^ (x1<<28);
+          x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
+          x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
+            //printf("x1 : %x, x2 : %x\n",x1,x2);
+        }
+
+        for (n=0; n<52; n++) {
+          x1 = (x1>>1) ^ (x1>>4);
+          x1 = x1 ^ (x1<<31) ^ (x1<<28);
+          x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
+          x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
+          ue->nr_gold_pdcch[0][ns][l][n] = x1^x2;
+            //printf("n=%d : c %x\n",n,x1^x2);
+        }
+      }
+    }
+}
+
+void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned short *n_idDMRS, unsigned short length_dmrs)
+{
+
+  unsigned char ns,l;
+  unsigned int n,x1,x2,x2tmp0;
   int nscid;
   unsigned int nid;
 
@@ -79,14 +122,14 @@ void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int nr_gold_p
     if (n_idDMRS)
       nid = n_idDMRS[nscid];
     else
-      nid = Nid_cell;
+      nid = ue->frame_parms.Nid_cell;
 
     for (ns=0; ns<20; ns++) {
 
       for (l=0; l<length_dmrs; l++) {
 
     	x2tmp0 = ((14*ns+(lbar+l)+1)*((nid<<1)+1))<<17;
-        x2 = (x2tmp0+(nid<<1))%(1<<31);  //cinit
+        x2 = (x2tmp0+(nid<<1)+nscid)%(1<<31);  //cinit
 
         x1 = 1+ (1<<31);
         x2=x2 ^ ((x2 ^ (x2>>1) ^ (x2>>2) ^ (x2>>3))<<31);
@@ -105,7 +148,7 @@ void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int nr_gold_p
           x1 = x1 ^ (x1<<31) ^ (x1<<28);
           x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
           x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
-          nr_gold_pdsch[nscid][ns][l][n] = x1^x2;
+          ue->nr_gold_pdsch[nscid][ns][l][n] = x1^x2;
             //printf("n=%d : c %x\n",n,x1^x2);
         }
 

openair1/PHY/NR_REFSIG/nr_mod_table.h

 #define NR_MOD_TABLE_SIZE_SHORT 14
 #define NR_MOD_TABLE_BPSK_OFFSET 1
 #define NR_MOD_TABLE_QPSK_OFFSET 3
-short nr_mod_table[MOD_TABLE_SIZE_SHORT] = {0,0,23170,23170,-23170,-23170,23170,23170,23170,-23170,-23170,23170,-23170,-23170};
+short nr_mod_table[NR_MOD_TABLE_SIZE_SHORT] = {0,0,23170,23170,-23170,-23170,23170,23170,23170,-23170,-23170,23170,-23170,-23170};

openair1/PHY/NR_REFSIG/pss_nr.h

@@ -49,7 +49,7 @@
 
 //#define CIC_DECIMATOR                          /* it allows enabling decimation based on CIC filter. By default, decimation is based on a FIF filter */
 
-#define TEST_SYNCHRO_TIMING_PSS        (1)     /* enable time profiling */
+#define TEST_SYNCHRO_TIMING_PSS        (1)       /* enable time profiling */
 
 //#define DBG_PSS_NR
 

openair1/PHY/NR_REFSIG/refsig_defs_ue.h

@@ -31,21 +31,34 @@
  */
 int nr_pbch_dmrs_rx(unsigned int *nr_gold_pbch,	int32_t *output	);
 
-/*int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
-						unsigned int ncp,
+/*!\brief This function generates the NR Gold sequence (38-211, Sec 5.2.1) for the PDCCH DMRS.
+@param PHY_VARS_NR_UE* ue structure provides configuration, frame parameters and the pointers to the 32 bits sequence storage tables
+ */
+int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
+						uint8_t eNB_offset,
+						unsigned int Ns,
+						unsigned int *nr_gold_pdcch,
+						int32_t *output,
+						unsigned short p,
+						unsigned short nb_rb_corset);
+
+int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
+						uint8_t eNB_offset,
 						unsigned int Ns,
 						unsigned int nr_gold_pdsch[2][20][2][21],
 						int32_t *output,
 						unsigned short p,
 						int length_dmrs,
-						unsigned short nb_pdsch_rb);*/
+						unsigned short nb_rb_pdsch);
 
 void nr_gold_pbch(PHY_VARS_NR_UE* ue);
 
+void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
+					unsigned short n_idDMRS,
+					unsigned short length_dmrs);
+
 void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
 					unsigned short lbar,
-					unsigned int nr_gold_pdsch[2][20][2][21],
-					unsigned int Nid_cell,
 					unsigned short *n_idDMRS,
 					unsigned short length_dmrs);
 

openair1/PHY/NR_REFSIG/ss_pbch_nr.h

@@ -51,10 +51,16 @@
 #define  PSS_SC_START_NR              (52)     /* see from TS 38.211 table 7.4.3.1-1: Resources within an SS/PBCH block for PSS... */
 
 /* define ofdm symbol offset in the SS/PBCH block of NR synchronisation */
-#define  PSS_SYMBOL_NB                (0)     /* symbol numbers for each element */
-#define  PBCH_SYMBOL_NB               (1)
-#define  SSS_SYMBOL_NB                (2)
-#define  PBCH_LAST_SYMBOL_NB          (3)
+#ifdef NR_UNIT_TEST
+#define OFFSET_SS_PBCH                (0)
+#else
+#define OFFSET_SS_PBCH                (4)
+#endif
+
+#define  PSS_SYMBOL_NB                ((0) + OFFSET_SS_PBCH)   /* symbol numbers for each element */
+#define  PBCH_SYMBOL_NB               ((1) + OFFSET_SS_PBCH)
+#define  SSS_SYMBOL_NB                ((2) + OFFSET_SS_PBCH)
+#define  PBCH_LAST_SYMBOL_NB          ((3) + OFFSET_SS_PBCH)
 
 /* SS/PBCH parameters */
 #define  N_RB_SS_PBCH_BLOCK           (20)

openair1/PHY/NR_REFSIG/sss_nr.h

@@ -32,6 +32,7 @@
 #ifndef SSS_NR_H
 #define SSS_NR_H
 
+#include "limits.h"
 #include "PHY/defs_nr_UE.h"
 #include "PHY/types.h"
 
@@ -46,7 +47,6 @@
 
 /************** DEFINE ********************************************/
 
-#define  INT_MIN	   (-2147483647 - 1)
 #define  SAMPLES_IQ                   (sizeof(int16_t)*2)
 #define  NUMBER_SSS_SEQUENCE          (336)
 #define  INVALID_SSS_SEQUENCE         (NUMBER_SSS_SEQUENCE)

openair1/PHY/NR_TRANSPORT/nr_dci.c

@@ -130,7 +130,7 @@ uint8_t nr_generate_dci_top(NR_DCI_ALLOC_t dci_alloc,
                             int32_t** txdataF,
                             int16_t amp,
                             NR_DL_FRAME_PARMS* frame_parms,
-                            nfapi_config_request_t* config)
+                            nfapi_nr_config_request_t* config)
 {
   return 0;
 }

openair1/PHY/NR_TRANSPORT/nr_dci.h

@@ -18,50 +18,13 @@
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
  */
+
 #ifndef __PHY_NR_TRANSPORT_DCI__H
 #define __PHY_NR_TRANSPORT_DCI__H
 
 #include "defs_gNB.h"
 
-
-typedef enum {
-  nr_dci_format_0_0=0,
-  nr_dci_format_0_1,
-  nr_dci_format_2_0,
-  nr_dci_format_2_1,
-  nr_dci_format_2_2,
-  nr_dci_format_2_3,
-  nr_dci_format_1_0,
-  nr_dci_format_1_1,
-} nr_dci_format_e;
-
-typedef enum {
-  nr_rnti_type_SI_RNTI=0,
-  nr_rnti_type_RA_RNTI,
-  nr_rnti_type_C_RNTI,
-  nr_rnti_type_TC_RNTI,
-  nr_rnti_type_CS_RNTI,
-  nr_rnti_type_P_RNTI
-} nr_rnti_type_e;
-
-
-typedef struct {
-  /// Length of DCI in bits
-  uint8_t size;
-  /// Aggregation level
-  uint8_t L;
-  /// Position of first CCE of the dci
-  int firstCCE;
-  /// flag to indicate that this is a RA response
-  boolean_t ra_flag;
-  /// rnti
-  nr_rnti_type_e rnti;
-  /// Format
-  DCI_format_t format;
-  /// DCI pdu
-  uint8_t dci_pdu[8];
-} NR_DCI_ALLOC_t;
-
+typedef unsigned __int128 uint128_t;
 
 uint8_t nr_get_dci_size(nr_dci_format_e format,
                         nr_rnti_type_e rnti,
@@ -72,6 +35,6 @@ uint8_t nr_generate_dci_top(NR_DCI_ALLOC_t dci_alloc,
                             int32_t** txdataF,
                             int16_t amp,
                             NR_DL_FRAME_PARMS* frame_parms,
-                            nfapi_config_request_t* config)
+                            nfapi_nr_config_request_t* config)
 
 #endif //__PHY_NR_TRANSPORT_DCI__H

openair2/LAYER2/NR_MAC_UE/vars.c → openair1/PHY/NR_TRANSPORT/nr_mcs.c

@@ -19,16 +19,41 @@
  *      contact@openairinterface.org
  */
 
-/*! \file vars.h
-* \brief mac vars
-* \author  Navid Nikaein and Raymond Knopp
-* \date 2010 - 2014
-* \version 1.0
-* \email navid.nikaein@eurecom.fr
-* @ingroup _mac
-
+/*! \file PHY/NR_TRANSPORT/nr_mcs.c
+* \brief Some support routines for NR MCS computations
+* \author
+* \date 2018
+* \version 0.1
+* \company Eurecom
+* \email:
+* \note
+* \warning
 */
 
-UE_MAC_INST_t UE_mac_inst;	//[NB_MODULE_MAX];
+#include "PHY/NR_TRANSPORT/nr_transport_common_proto.h"
+
+//get_Qm under PHY/LTE_TRANSPORT/lte_mcs.c is the same for NR.
+
+uint8_t get_nr_Qm(uint8_t I_MCS)
+{
+  if (I_MCS < 5)
+    return(2);
+  else if (I_MCS < 11)
+    return(4);
+  else if (I_MCS < 20)
+    return(6);
+  else
+    return(8);
+}
 
+uint8_t get_nr_Qm_ul(uint8_t I_MCS) {
 
+  if (I_MCS < 2)
+	  return(2);  //This should be 1 if UE has reported to support pi/2 BPSK, and 2 otherwise.
+  else if (I_MCS < 10)
+    return(2);
+  else if (I_MCS < 17)
+    return(4);
+  else
+    return(6);
+}

openair1/PHY/NR_TRANSPORT/nr_pbch.c

@@ -45,22 +45,25 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
                           int32_t **txdataF,
                           int16_t amp,
                           uint8_t ssb_start_symbol,
-                          uint8_t nushift,
-                          nfapi_config_request_t* config,
+                          nfapi_nr_config_request_t* config,
                           NR_DL_FRAME_PARMS *frame_parms)
 {
   int k,l;
   int16_t a;
-  int16_t mod_dmrs[2 * NR_PBCH_DMRS_LENGTH];
+  int16_t mod_dmrs[NR_PBCH_DMRS_LENGTH<<1];
+  uint8_t idx=0;
+  uint8_t nushift = config->sch_config.physical_cell_id.value &3;
 
   LOG_I(PHY, "PBCH DMRS mapping started at symbol %d shift %d\n", ssb_start_symbol+1, nushift);
 
-  /// BPSK modulation
+  /// QPSK modulation
   for (int m=0; m<NR_PBCH_DMRS_LENGTH; m++) {
-    mod_dmrs[m<<1] = nr_mod_table[((NR_MOD_TABLE_BPSK_OFFSET + ((gold_pbch_dmrs[m>>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1)];
-    mod_dmrs[(m<<1)+1] = nr_mod_table[((NR_MOD_TABLE_BPSK_OFFSET + ((gold_pbch_dmrs[m>>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1) + 1];
+    idx = ((((gold_pbch_dmrs[(m<<1)>>5])>>((m<<1)&0x1f))&1)<<1) ^ (((gold_pbch_dmrs[((m<<1)+1)>>5])>>(((m<<1)+1)&0x1f))&1);
+    mod_dmrs[m<<1] = nr_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
+    mod_dmrs[(m<<1)+1] = nr_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1) + 1];
 #ifdef DEBUG_PBCH_DMRS
-  printf("m %d  mod_dmrs %d %d\n", m, mod_dmrs[2*m], mod_dmrs[2*m+1]);
+  printf("m %d idx %d gold seq %d b0-b1 %d-%d mod_dmrs %d %d\n", m, idx, gold_pbch_dmrs[(m<<1)>>5], (((gold_pbch_dmrs[(m<<1)>>5])>>((m<<1)&0x1f))&1),
+  (((gold_pbch_dmrs[((m<<1)+1)>>5])>>(((m<<1)+1)&0x1f))&1), mod_dmrs[(m<<1)], mod_dmrs[(m<<1)+1]);
 #endif
   }
 
@@ -128,81 +131,185 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
   return 0;
 }
 
-void nr_pbch_scrambling(uint32_t Nid,
+void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
+                        uint32_t Nid,
                         uint8_t nushift,
-                        uint8_t *pbch_a,
-                        uint32_t length)
+                        uint16_t M,
+                        uint16_t length,
+                        uint8_t bitwise)
 {
-  uint8_t reset;
+  uint8_t reset, offset;
   uint32_t x1, x2, s=0;
+  uint8_t *pbch_e = pbch->pbch_e;
+  uint32_t *pbch_a_prime = (uint32_t*)pbch->pbch_a_prime;
+  uint32_t *pbch_a_interleaved = (uint32_t*)pbch->pbch_a_interleaved;
+  uint32_t unscrambling_mask = 0x100006D;
 
   reset = 1;
   // x1 is set in lte_gold_generic
   x2 = Nid;
 
+  // The Gold sequence is shifted by nushift* M, so we skip (nushift*M /32) double words
+  for (int i=0; i<(uint16_t)ceil((nushift*M)/32); i++) {
+    s = lte_gold_generic(&x1, &x2, reset);
+    reset = 0;
+  }
+  // Scrambling is now done with offset (nushift*M)%32
+  offset = (nushift*M)&0x1f;
+#ifdef DEBUG_PBCH_ENCODING
+  printf("Scrambling params: nushift %d M %d length %d bitwise %d offset %d\n", nushift, M, length, bitwise, offset);
+#endif
+
   for (int i=0; i<length; i++) {
-    if ((i&0x1f)==0) {
+    if (((i+offset)&0x1f)==0) {
       s = lte_gold_generic(&x1, &x2, reset);
       reset = 0;
     }
-    pbch_a[i] = (pbch_a[i]&1) ^ ((s>>(i&0x1f))&1);
+#ifdef DEBUG_PBCH_ENCODING
+  printf("s: %04x\t", s);
+#endif
+    if (bitwise) {
+      (*pbch_a_prime) ^= ((unscrambling_mask>>i)&1)? (((*pbch_a_interleaved)>>i)&1)<<i : ((((*pbch_a_interleaved)>>i)&1) ^ ((s>>((i+offset)&0x1f))&1))<<i;      
+    }
+
+    else
+      pbch_e[i] = (pbch_e[i]&1) ^ ((s>>((i+offset)&0x1f))&1);
   }
 }
 
+// This portion of code is temporarily kept until the optimized version is validated
+uint8_t nr_pbch_payload_interleaving_pattern[32] = {16, 23, 18, 17, 8, 30, 10, 6, 24, 7, 0, 5, 3, 2, 1, 4,
+                                                9, 11, 12, 13, 14, 15, 19, 20, 21, 22, 25, 26, 27, 28, 29, 31};
+
+uint8_t nr_pbch_payload_interleaver(uint8_t i) {
+  uint8_t j_sfn=6, j_hrf=10, j_ssb=11, j_other=14;
+
+  if (24<=i && i<=27) //Sfn bits
+    return nr_pbch_payload_interleaving_pattern[j_sfn + i -24];
+  else if (i==28) // Hrf bit
+    return nr_pbch_payload_interleaving_pattern[j_hrf];
+  else if (29<=i) // Ssb bits
+    return nr_pbch_payload_interleaving_pattern[j_ssb + (i-29)];
+  else
+    return nr_pbch_payload_interleaving_pattern[(j_other + i)&0x1f];
+}
+
+/*This pattern takes into account the adjustments for the field specific counters j_sfn, j_hrf, j_ssb and j_other*/
+//uint8_t nr_pbch_payload_interleaving_pattern[32] = {1,4,9,11,12,13,14,15,19,20,21,22,25,26,27,28,
+//                                                    29,31,16,23,18,17,8,30,10,6,24,7,0,5,3,2};
 
 int nr_generate_pbch(NR_gNB_PBCH *pbch,
                      uint8_t *pbch_pdu,
                      int32_t **txdataF,
                      int16_t amp,
                      uint8_t ssb_start_symbol,
-                     uint8_t nushift,
                      uint8_t n_hf,
+                     uint8_t Lmax,
+                     uint8_t ssb_index,
                      int sfn,
-                     int frame_mod8,
-                     nfapi_config_request_t* config,
+                     nfapi_nr_config_request_t* config,
                      NR_DL_FRAME_PARMS *frame_parms)
 {
 
   int k,l,m;
   int16_t a;
-  int16_t mod_pbch_e[NR_POLAR_PBCH_E<<1];
-  uint8_t sfn_4lsb, idx=0;
+  int16_t mod_pbch_e[NR_POLAR_PBCH_E];
+  uint8_t idx=0;
+  uint16_t M;
+  uint8_t nushift;
+  uint8_t *xbyte = pbch->pbch_a;
+  memset((void*) xbyte, 0, 1);
+  uint8_t pbch_a_b[32];
 
   LOG_I(PHY, "PBCH generation started\n");
 
   ///Payload generation
     // Fix byte endian
-  if (!frame_mod8)
-    for (int i=0; i<NR_PBCH_PDU_BITS; i++)
-      pbch->pbch_a[NR_PBCH_PDU_BITS-i-1] = pbch_pdu[i];
+  if (!(sfn&7))
+    for (int i=0; i<(NR_PBCH_PDU_BITS>>3); i++)
+      pbch->pbch_a[(NR_POLAR_PBCH_PAYLOAD_BITS>>3)-i-1] = pbch_pdu[i];
+#ifdef DEBUG_PBCH_ENCODING
+  printf("Byte endian fix:\n");
+  for (int i=0; i<4; i++)
+    printf("pbch_a[%d]: 0x%02x\n", i, pbch->pbch_a[i]);
+#endif
 
-    // Extra bits generation
-  sfn_4lsb = sfn&3;
+    // Extra byte generation
   for (int i=0; i<4; i++)
-    pbch->pbch_a[NR_PBCH_PDU_BITS+i] = (sfn_4lsb>>i)&1; // 4 lsb of sfn
+    (*xbyte) ^= ((sfn>>i)&1)<<i; // 4 lsb of sfn
 
-  pbch->pbch_a[NR_PBCH_PDU_BITS+4] = n_hf; // half frame index bit
+  (*xbyte) ^= n_hf<<4; // half frame index bit
 
-  pbch->pbch_a[NR_PBCH_PDU_BITS+5] = (config->sch_config.ssb_subcarrier_offset.value>>5)&1; //MSB of k0 -- Note the case Lssb=64 is not supported (FR2)
+  if (Lmax == 64)
+    for (int i=0; i<3; i++)
+      (*xbyte) ^= ((ssb_index>>(3+i))&1)<<(5+i); // resp. 4th, 5th and 6th bits of ssb_index
+  else
+    (*xbyte) ^= ((config->sch_config.ssb_subcarrier_offset.value>>5)&1)<<5; //MSB of k_SSB
 #ifdef DEBUG_PBCH_ENCODING
-  
+  printf("Extra byte:\n");
+  for (int i=0; i<4; i++)
+    printf("pbch_a[%d]: 0x%02x\n", i, pbch->pbch_a[i]);
+#endif
+
+    // Payload interleaving
+  uint32_t in=0, out=0;
+  for (int i=0; i<NR_POLAR_PBCH_PAYLOAD_BITS>>3; i++)
+    in |= (uint32_t)(pbch->pbch_a[i]<<((3-i)<<3));
+
+  for (int i=0; i<32; i++) {
+    out |= ((in>>i)&1)<<(nr_pbch_payload_interleaver(i));//nr_pbch_payload_interleaving_pattern[i]
+#ifdef DEBUG_PBCH_ENCODING
+  printf("i %d in 0x%08x out 0x%08x ilv %d (in>>i)&1) %d\n", i, in, out, nr_pbch_payload_interleaver(i), (in>>i)&1);
+#endif
+  }
+
+  for (int i=0; i<NR_POLAR_PBCH_PAYLOAD_BITS>>3; i++)
+    pbch->pbch_a_interleaved[i] = (uint8_t)((out>>(i<<3))&0xff);
+
+#ifdef DEBUG_PBCH_ENCODING
+  printf("Interleaving:\n");
+  for (int i=0; i<4; i++)
+    printf("pbch_a_interleaved[%d]: 0x%02x\n", i, pbch->pbch_a_interleaved[i]);
 #endif
 
     // Scrambling
-  nr_pbch_scrambling((uint32_t)config->sch_config.physical_cell_id.value, nushift, pbch->pbch_a, NR_POLAR_PBCH_PAYLOAD_BITS);
+  M = (Lmax == 64)? (NR_POLAR_PBCH_PAYLOAD_BITS - 6) : (NR_POLAR_PBCH_PAYLOAD_BITS - 3);
+  nushift = (((sfn>>2)&1)<<1) ^ ((sfn>>1)&1);
+  nr_pbch_scrambling(pbch, (uint32_t)config->sch_config.physical_cell_id.value, nushift, M, NR_POLAR_PBCH_PAYLOAD_BITS, 1);
 #ifdef DEBUG_PBCH_ENCODING
-  
+  printf("Payload scrambling:\n");
+  for (int i=0; i<4; i++)
+    printf("pbch_a_prime[%d]: 0x%02x\n", i, pbch->pbch_a_prime[i]);
 #endif
 
+for (int m=0;m<32;m++){
+pbch_a_b[m] = ((pbch->pbch_a_prime[m/8]>>(m&7))&01);
+//printf("pbch_a_b[%d] %d\n", m, pbch_a_b[m] );
+}
+
   /// CRC, coding and rate matching
-  polar_encoder (pbch->pbch_a, pbch->pbch_e, &frame_parms->pbch_polar_params);
+  polar_encoder (pbch->pbch_a_prime, pbch->pbch_e, &frame_parms->pbch_polar_params);
+#ifdef DEBUG_PBCH_ENCODING
+  printf("Channel coding:\n");
+  for (int i=0; i<NR_POLAR_PBCH_E>>3; i++)
+    printf("pbch_e[%d]: 0x%02x\t", i, pbch->pbch_e[i]);
+  printf("\n");
+#endif
+
+  /// Scrambling
+  M =  NR_POLAR_PBCH_E;
+  nushift = (Lmax==4)? ssb_index&3 : ssb_index&7;
+  nr_pbch_scrambling(pbch, (uint32_t)config->sch_config.physical_cell_id.value, nushift, M, NR_POLAR_PBCH_E, 0);
 #ifdef DEBUG_PBCH_ENCODING
-  
+  printf("Scrambling:\n");
+  for (int i=0; i<NR_POLAR_PBCH_E>>3; i++)
+    printf("pbch_e[%d]: 0x%02x\t", i, pbch->pbch_e[i]);
+  printf("\n");
 #endif
 
   /// QPSK modulation
   for (int i=0; i<NR_POLAR_PBCH_E>>1; i++){
-    idx = (pbch->pbch_e[i<<1]&1) ^ ((pbch->pbch_e[(i<<1)+1]&1)<<1);
+    idx = ((pbch->pbch_e[i<<1]&1)<<1) ^ (pbch->pbch_e[(i<<1)+1]&1);
     mod_pbch_e[i<<1] = nr_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
     mod_pbch_e[(i<<1)+1] = nr_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1)+1];
 
@@ -212,6 +319,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
   }
 
   /// Resource mapping
+  nushift = config->sch_config.physical_cell_id.value &3;
   a = (config->rf_config.tx_antenna_ports.value == 1) ? amp : (amp*ONE_OVER_SQRT2_Q15)>>15;
 
   for (int aa = 0; aa < config->rf_config.tx_antenna_ports.value; aa++)

openair1/PHY/NR_TRANSPORT/nr_pss.c

@@ -28,7 +28,7 @@ int nr_generate_pss(  int16_t *d_pss,
                       int32_t **txdataF,
                       int16_t amp,
                       uint8_t ssb_start_symbol,
-                      nfapi_config_request_t* config,
+                      nfapi_nr_config_request_t* config,
                       NR_DL_FRAME_PARMS *frame_parms)
 {
   int i,k,l,m;

openair1/PHY/NR_TRANSPORT/nr_sss.c

@@ -27,7 +27,7 @@ int nr_generate_sss(  int16_t *d_sss,
                       int32_t **txdataF,
                       int16_t amp,
                       uint8_t ssb_start_symbol,
-                      nfapi_config_request_t* config,
+                      nfapi_nr_config_request_t* config,
                       NR_DL_FRAME_PARMS *frame_parms)
 {
   int i,k,l;

openair1/PHY/NR_TRANSPORT/nr_transport.h

@@ -36,7 +36,7 @@ int nr_generate_pss(  int16_t *d_pss,
                       int32_t **txdataF,
                       int16_t amp,
                       uint8_t ssb_start_symbol,
-                      nfapi_config_request_t* config,
+                      nfapi_nr_config_request_t* config,
                       NR_DL_FRAME_PARMS *frame_parms);
 
 /*!
@@ -49,7 +49,7 @@ int nr_generate_sss(  int16_t *d_sss,
                       int32_t **txdataF,
                       int16_t amp,
                       uint8_t ssb_start_symbol,
-                      nfapi_config_request_t* config,
+                      nfapi_nr_config_request_t* config,
                       NR_DL_FRAME_PARMS *frame_parms);
 
 /*!
@@ -62,8 +62,7 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
                           int32_t **txdataF,
                           int16_t amp,
                           uint8_t ssb_start_symbol,
-                          uint8_t nushift,
-                          nfapi_config_request_t* config,
+                          nfapi_nr_config_request_t* config,
                           NR_DL_FRAME_PARMS *frame_parms);
 
 /*!
@@ -71,10 +70,12 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
 \brief PBCH scrambling function
 @param
  */
-void nr_pbch_scrambling(uint32_t Nid,
+void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
+                        uint32_t Nid,
                         uint8_t nushift,
-                        uint8_t *pbch_a,
-                        uint32_t length);
+                        uint16_t M,
+                        uint16_t length,
+                        uint8_t bitwise);
 
 /*!
 \fn int nr_generate_pbch
@@ -87,11 +88,19 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
                      int32_t **txdataF,
                      int16_t amp,
                      uint8_t ssb_start_symbol,
-                     uint8_t nushift,
                      uint8_t n_hf,
+                     uint8_t Lmax,
+                     uint8_t ssb_index,
                      int sfn,
-                     int frame_mod8,
-                     nfapi_config_request_t* config,
+                     nfapi_nr_config_request_t* config,
                      NR_DL_FRAME_PARMS *frame_parms);
 
+/*!
+\fn int nr_generate_pbch
+\brief PBCH interleaving function
+@param bit index i of the input payload
+@returns the bit index of the output
+ */
+uint8_t nr_pbch_payload_interleaver(uint8_t i);
+
 #endif /*__NR_TRANSPORT__H__*/

openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h

+/*
+ * 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/NR_TRANSPORT/nr_mcs.c
+* \brief Some support routines for NR MCS computations
+* \author
+* \date 2018
+* \version 0.1
+* \company Eurecom
+* \email:
+* \note
+* \warning
+*/
+
+#ifndef __NR_TRANSPORT_COMMON_PROTO__H__
+#define __NR_TRANSPORT_COMMON_PROTO__H__
+
+// Functions below implement minor procedures from 38-214
+
+/** \brief Computes Q based on I_MCS PDSCH and when 'MCS-Table-PDSCH' is set to "256QAM". Implements Table 5.1.3.1-2 from 38.214.
+    @param I_MCS */
+uint8_t get_nr_Qm(uint8_t I_MCS);
+
+/** \brief Computes Q based on I_MCS PUSCH. Implements Table 6.1.4.1-1 from 38.214.
+    @param I_MCS */
+uint8_t get_nr_Qm_ul(uint8_t I_MCS);
+
+#endif

openair1/PHY/NR_UE_ESTIMATION/filt16a_32.h

@@ -84,3 +84,28 @@ short filt16a_2l1[16] = {
 
 short filt16a_2r1[16] = {
 -4096,0,4096,8192,12288,16384,0,0,0,0,0,0,0,0,0,0};
+
+/*filter8*/
+short filt8_l0[8] = {
+16384,8192,0,0,0,0,0,0};
+
+short filt8_mr0[8] = {
+0,8192,16384,8192,0,-8192,0,0};
+
+short filt8_r0[8] = {
+0,8192,16384,24576,0,0,0,0};
+
+short filt8_m0[8] = {
+0,8192,16384,8192,0,0,0,0};
+
+short filt8_l1[8] = {
+24576,16384,0,0,0,0,0,0};
+
+short filt8_ml1[8] = {
+-8192,0,8192,16384,8192,0,0,0};
+
+short filt8_r1[8] = {
+0,0,8192,16384,0,0,0,0};
+
+short filt8_m1[8] = {
+0,0,8192,16384,8192,0,0,0};

openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h

@@ -19,12 +19,12 @@
  *      contact@openairinterface.org
  */
 
-#ifndef __LTE_ESTIMATION_DEFS__H__
-#define __LTE_ESTIMATION_DEFS__H__
+#ifndef __NR_ESTIMATION_DEFS__H__
+#define __NR_ESTIMATION_DEFS__H__
 
 
 #include "PHY/defs_nr_UE.h"
-#include "PHY/defs_gNB.h"
+//#include "PHY/defs_gNB.h"
 /** @addtogroup _PHY_PARAMETER_ESTIMATION_BLOCKS_
  * @{
  */
@@ -42,13 +42,15 @@
 \param l symbol within slot
 \param symbol symbol within frame
 */
-int nr_dl_channel_estimation(PHY_VARS_NR_UE *ue,
+int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
                               uint8_t eNB_id,
                               uint8_t eNB_offset,
                               unsigned char Ns,
                               unsigned char p,
                               unsigned char l,
-                              unsigned char symbol);
+                              unsigned char symbol,
+							  unsigned short coreset_start_subcarrier,
+							  unsigned short nb_rb_coreset);
 
 int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
                               uint8_t eNB_id,
@@ -57,4 +59,14 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
                               unsigned char p,
                               unsigned char l,
                               unsigned char symbol);
+
+int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
+                              uint8_t eNB_id,
+                              uint8_t eNB_offset,
+                              unsigned char Ns,
+                              unsigned char p,
+                              unsigned char l,
+                              unsigned char symbol,
+							  unsigned short bwp_start_subcarrier,
+							  unsigned short nb_rb_pdsch);
 #endif

openair1/PHY/NR_UE_TRANSPORT/dmrs_nr.c

@@ -30,7 +30,6 @@
 *
 ************************************************************************/
 
-//#include "PHY/LTE_REFSIG/defs.h"
 #include "PHY/NR_REFSIG/ss_pbch_nr.h"
 #include "PHY/NR_REFSIG/dmrs_nr.h"
 

openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h

@@ -1352,24 +1352,6 @@ int dump_dci(NR_DL_FRAME_PARMS *frame_parms, DCI_ALLOC_t *dci);
 
 int dump_ue_stats(PHY_VARS_NR_UE *phy_vars_ue, UE_nr_rxtx_proc_t *proc, char* buffer, int length, runmode_t mode, int input_level_dBm);
 
-
-
-void generate_pcfich_reg_mapping(NR_DL_FRAME_PARMS *frame_parms);
-
-
-void pcfich_unscrambling(NR_DL_FRAME_PARMS *frame_parms,
-                         uint8_t subframe,
-                         int16_t *d);
-
-
-uint8_t rx_pcfich(NR_DL_FRAME_PARMS *frame_parms,
-                  uint8_t subframe,
-                  NR_UE_PDCCH *lte_ue_pdcch_vars,
-                  MIMO_mode_t mimo_mode);
-
-void generate_phich_reg_mapping(NR_DL_FRAME_PARMS *frame_parms);
-
-
 void init_transport_channels(uint8_t);
 
 void generate_RIV_tables(void);
@@ -1381,7 +1363,7 @@ void generate_RIV_tables(void);
   parameters are know, the routine calls some basic initialization routines (cell-specific reference signals, etc.)
   @param phy_vars_ue Pointer to UE variables
 */
-int initial_sync(PHY_VARS_NR_UE *phy_vars_ue, runmode_t mode);
+int nr_initial_sync(PHY_VARS_NR_UE *phy_vars_ue, runmode_t mode);
 
 
 /*!

openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h

@@ -31,7 +31,9 @@
 */
 #ifndef __NR_TRANSPORT_UE__H__
 #define __NR_TRANSPORT_UE__H__
-#include "PHY/defs_nr_UE.h"
+#include <limits.h>
+#include "PHY/impl_defs_top.h"
+//#include "PHY/defs_nr_UE.h"
 //#include "../LTE_TRANSPORT/dci.h"
 //#include "../LTE_TRANSPORT/mdci.h"
 //#include "../LTE_TRANSPORT/uci_common.h"
@@ -48,7 +50,31 @@
  * @{
  */
 
-#define SHRT_MAX   32767
+//#if defined(UPGRADE_RAT_NR)
+#if 1
+typedef struct {
+  /// HARQ process id
+  uint8_t harq_id;
+  /// ACK bits (after decoding) 0:NACK / 1:ACK / 2:DTX
+  uint8_t ack;
+  /// send status (for PUCCH)
+  uint8_t send_harq_status;
+  /// nCCE (for PUCCH)
+  uint8_t nCCE;
+  /// DAI value detected from DCI1/1a/1b/1d/2/2a/2b/2c. 0xff indicates not touched
+  uint8_t vDAI_DL;
+  /// DAI value detected from DCI0/4. 0xff indicates not touched
+  uint8_t vDAI_UL;
+  /// allow to define pucch parameters TS 38.213 9.2.3 UE procedure for reporting HARQ-ACK
+  uint8_t  pucch_resource_indicator;
+  /// slot on which feedback ack should be send to network
+  uint16_t slot_for_feedback_ack;
+  /// index of a first CCE for the PDCCH reception
+  uint8_t  n_CCE;
+  /// number of CCEs in a control resource set of a PDCCH reception conveying DCI format 1_0
+  uint8_t  N_CCE;
+} NR_UE_HARQ_STATUS_t;
+#endif
 
 typedef struct {
   /// Indicator of first transmission
@@ -128,9 +154,15 @@ typedef struct {
   /// Current Number of Symbols
   uint8_t Nsymb_pusch;
   /// SRS active flag
-  uint8_t srs_active;
-  /// Pointers to 8 HARQ processes for the ULSCH
-  NR_UL_UE_HARQ_t *harq_processes[8];
+  uint8_t srs_active; 
+//#if defined(UPGRADE_RAT_NR)
+#if 1
+  // Pointers to HARQ processes for the ULSCH
+  NR_UL_UE_HARQ_t *harq_processes[NR_MAX_ULSCH_HARQ_PROCESSES];
+  int harq_process_id[NR_MAX_SLOTS_PAR_FRAME];
+  // UL number of harq processes
+  uint8_t number_harq_processes_for_pusch;
+#endif 
   /// Pointer to CQI data (+1 for 8 bits crc)
   uint8_t o[1+MAX_CQI_BYTES];
   /// Length of CQI data (bits)
@@ -197,9 +229,6 @@ typedef struct {
   uint8_t Mlimit;
 } NR_UE_ULSCH_t;
 
-
-
-
 typedef struct {
   /// Indicator of first transmission
   uint8_t first_tx;
@@ -253,6 +282,12 @@ typedef struct {
   uint32_t G;
   /// Current Number of RBs
   uint16_t nb_rb;
+  /// Starting RB number
+  uint16_t start_rb;
+  /// Number of Symbols
+  uint16_t nb_symbols;
+  /// Starting Symbol number
+  uint16_t start_symbol;
   /// Current subband PMI allocation
   uint16_t pmi_alloc;
   /// Current RB allocation (even slots)
@@ -269,24 +304,10 @@ typedef struct {
   uint32_t errors[8];
   /// codeword this transport block is mapped to
   uint8_t codeword;
+  /// HARQ-ACKs
+  NR_UE_HARQ_STATUS_t harq_ack;
 } NR_DL_UE_HARQ_t;
 
-
-typedef struct {
-  /// HARQ process id
-  uint8_t harq_id;
-  /// ACK bits (after decoding) 0:NACK / 1:ACK / 2:DTX
-  uint8_t ack;
-  /// send status (for PUCCH)
-  uint8_t send_harq_status;
-  /// nCCE (for PUCCH)
-  uint8_t nCCE;
-  /// DAI value detected from DCI1/1a/1b/1d/2/2a/2b/2c. 0xff indicates not touched
-  uint8_t vDAI_DL;
-  /// DAI value detected from DCI0/4. 0xff indicates not touched
-  uint8_t vDAI_UL;
-} nr_harq_status_t;
-
 typedef struct {
   /// RNTI
   uint16_t rnti;
@@ -310,10 +331,17 @@ typedef struct {
   uint32_t cqi_alloc2;
   /// saved subband PMI allocation from last PUSCH/PUCCH report
   uint16_t pmi_alloc;
-  /// HARQ-ACKs
-  nr_harq_status_t harq_ack[10];
-  /// Pointers to up to 8 HARQ processes
-  NR_DL_UE_HARQ_t *harq_processes[8];
+//#if defined(UPGRADE_RAT_NR)
+#if 1
+  /// Pointers to up to HARQ processes
+  NR_DL_UE_HARQ_t *harq_processes[NR_MAX_DLSCH_HARQ_PROCESSES];
+  // DL number of harq processes
+  uint8_t number_harq_processes_for_pdsch;
+  /* higher layer parameter for reception of two transport blocks TS 38.213 9.1.3.1 Type-2 HARQ-ACK codebook dtermination */
+  uint8_t Number_MCS_HARQ_DL_DCI;
+  /* spatial bundling of PUCCH */
+  uint8_t HARQ_ACK_spatial_bundling_PUCCH;
+#endif
   /// Maximum number of HARQ processes(for definition see 36-212 V8.6 2009-03, p.17
   uint8_t Mdlharq;
   /// MIMO transmission mode indicator for this sub-frame (for definition see 36-212 V8.6 2009-03, p.17)
@@ -363,6 +391,13 @@ typedef struct {
   dci_space_t search_space;
   /// DCI pdu
   uint8_t dci_pdu[8];
+//#if defined(UPGRADE_RAT_NR)
+#if 1
+  /// harq information
+  uint8_t harq_pid_pusch;
+  /// delay between current slot and slot to transmit
+  uint8_t number_slots_rx_to_tx;
+#endif
 } NR_DCI_ALLOC_t;
 
 

openair1/PHY/NR_UE_TRANSPORT/pss_nr.c

@@ -369,7 +369,7 @@ void init_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue)
      assert(0);
     }
 
-    size = LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*sizeof(int)*frame_parms_ue->samples_per_subframe;
+    size = NR_NUMBER_OF_SUBFRAMES_PER_FRAME*sizeof(int)*frame_parms_ue->samples_per_subframe;
     q = malloc16(size);
     if (q != NULL) {
       pss_corr_ue[i] = q;
@@ -578,7 +578,7 @@ void restore_frame_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue, int rate_ch
 void decimation_synchro_nr(PHY_VARS_NR_UE *PHY_vars_UE, int rate_change, int **rxdata)
 {
   NR_DL_FRAME_PARMS *frame_parms = &(PHY_vars_UE->frame_parms);
-  int samples_for_frame = LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti;
+  int samples_for_frame = NR_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti;
 
 #if TEST_SYNCHRO_TIMING_PSS
 
@@ -631,7 +631,7 @@ int pss_synchro_nr(PHY_VARS_NR_UE *PHY_vars_UE, int rate_change)
 
 #ifdef DBG_PSS_NR
 
-  int samples_for_frame = frame_parms->samples_per_subframe*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME;
+  int samples_for_frame = frame_parms->samples_per_subframe*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
 
   write_output("rxdata0_rand.m","rxd0_rand", &PHY_vars_UE->common_vars.rxdata[0][0], samples_for_frame, 1, 1);
 
@@ -669,24 +669,21 @@ int pss_synchro_nr(PHY_VARS_NR_UE *PHY_vars_UE, int rate_change)
 
 #endif
 
-#if 1
-
   synchro_position = pss_search_time_nr(rxdata,
                                         frame_parms,
                                         (int *)&PHY_vars_UE->common_vars.eNb_id);
 
-#else
-
-  synchro_position = lte_sync_time(rxdata,
-                                          frame_parms,
-                                          (int *)&PHY_vars_UE->common_vars.eNb_id);
-#endif
-
 #if TEST_SYNCHRO_TIMING_PSS
 
   stop_meas(&generic_time[TIME_PSS]);
 
-  printf("PSS execution duration %5.2f \n", generic_time[TIME_PSS].p_time/(cpuf*1000.0));
+  int duration_ms = generic_time[TIME_PSS].p_time/(cpuf*1000.0);
+
+  #ifndef NR_UNIT_TEST
+
+    printf("PSS execution duration %4d microseconds \n", duration_ms);
+
+  #endif
 
 #endif
 
@@ -775,7 +772,7 @@ int pss_search_time_nr(int **rxdata, ///rx data in time domain
   int result;
   int synchro_out;
   unsigned int tmp[NUMBER_PSS_SEQUENCE];
-  unsigned int length = (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->ttis_per_subframe*frame_parms->samples_per_tti);  /* 1 frame for now, it should be 2 TODO_NR */
+  unsigned int length = (NR_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->ttis_per_subframe*frame_parms->samples_per_tti);  /* 1 frame for now, it should be 2 TODO_NR */
 
   for (int i = 0; i < NUMBER_PSS_SEQUENCE; i++) {
 	  tmp[i] = 0;
@@ -855,7 +852,9 @@ int pss_search_time_nr(int **rxdata, ///rx data in time domain
   }
 //#endif
 
-#ifdef DEBUG_PHY
+#ifdef DBG_PSS_NR
+
+  static debug_cnt = 0;
 
   if (debug_cnt == 0) {
     write_output("pss_corr_ue0.m","pss_corr_ue0",pss_corr_ue[0],length,1,2);

openair1/PHY/defs_NR.h

@@ -114,11 +114,11 @@ typedef struct PHY_VARS_gNB_s {
   int                  (*te)(struct PHY_VARS_gNB_s *,uint8_t *,uint8_t,LTE_eNB_DLSCH_t *,int,uint8_t,time_stats_t *,time_stats_t *,time_stats_t *);
   int                  (*start_if)(struct RU_t_s *ru,struct PHY_VARS_gNB_s *eNB);
   uint8_t              local_flag;
-  nfapi_config_request_t  gNB_config;
+  nfapi_nr_config_request_t  gNB_config;
   NR_DL_FRAME_PARMS   frame_parms;
   PHY_MEASUREMENTS_gNB measurements;
-  IF_Module_t          *if_inst;
-  UL_IND_t             UL_INFO;
+  NR_IF_Module_t          *if_inst;
+  NR_UL_IND_t             UL_INFO;
   pthread_mutex_t      UL_INFO_mutex;
   /// NFAPI RX ULSCH information
   nfapi_rx_indication_pdu_t  rx_pdu_list[NFAPI_RX_IND_MAX_PDU];