PDCCH DMRS modulation

ci-scripts/Jenkinsfile-gitlab

+// Comments
+
+pipeline {
+    agent {
+        label 'bellatrix'
+    }
+    options {
+        disableConcurrentBuilds()
+        timestamps()
+        gitLabConnection('OAI GitLab')
+        gitlabBuilds(builds: ["Build eNb-USRP", "Build gNb-usrp", "Build nr-UE-usrp", "Build phy-sim", "Analysis with cppcheck"])
+    }
+
+    stages {
+        stage ("Verify Guidelines") {
+            steps {
+                echo "Git URL         is ${GIT_URL}"
+                echo "GitLab Act      is ${env.gitlabActionType}"
+                script {
+                    if ("MERGE".equals(env.gitlabActionType)) {
+                        // GitLab-Jenkins plugin integration is lacking to perform the merge by itself
+                        // Doing it manually --> it may have merge conflicts
+                        sh "./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
+                        sh "zip -r -qq localZip.zip ."
+
+                        // Running astyle options on the list of modified files by the merge request
+                        // For the moment, there is no fail criteria. Just a notification of number of files that do not follow
+                        sh "./ci-scripts/checkCodingFormattingRules.sh --src-branch ${env.gitlabSourceBranch} --target-branch ${env.gitlabTargetBranch}"
+                        def res=readFile('./oai_rules_result.txt').trim();
+                        if ("0".equals(res)) {
+                            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): All Changed files in Merge Request follow OAI Formatting Rules"
+                            addGitLabMRComment comment: message
+                        } else {
+                            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Some Changed files in Merge Request DO NOT follow OAI Formatting Rules"
+                            addGitLabMRComment comment: message
+                        }
+                    } else {
+                        echo "Git Branch      is ${GIT_BRANCH}"
+                        echo "Git Commit      is ${GIT_COMMIT}"
+
+                        sh "zip -r -qq localZip.zip ."
+                        // Running astyle options on all C/H files in the repository
+                        // For the moment, there is no fail criteria. Just a notification of number of files that do not follow
+                        sh "./ci-scripts/checkCodingFormattingRules.sh"
+                    }
+                }
+            }
+            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") {
+            parallel {
+                stage ("Analysis with cppcheck") {
+                    steps {
+                        gitlabCommitStatus(name: "Analysis with cppcheck") {
+                            sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant cppcheck --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
+                        }
+                    }
+                }
+                stage ("Build eNb-USRP") {
+                    steps {
+                        gitlabCommitStatus(name: "Build eNb-USRP") {
+                            sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant enb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
+                        }
+                    }
+                }
+                stage ("Build 5G gNB-USRP") {
+                    steps {
+                        gitlabCommitStatus(name: "Build gNb-usrp") {
+                            sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant gnb-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
+                        }
+                    }
+                }
+                stage ("Build 5G NR-UE-USRP") {
+                    steps {
+                        gitlabCommitStatus(name: "Build nr-UE-usrp") {
+                            sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant nu-ue-usrp --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
+                        }
+                    }
+                }
+                stage ("Build physical simulators") {
+                    steps {
+                        gitlabCommitStatus(name: "Build phy-sim") {
+                            sh "./ci-scripts/buildOnVM.sh --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
+                        }
+                    }
+                }
+            }
+            post {
+                always {
+                    script {
+                        dir ('archives') {
+                            sh "zip -r -qq vm_build_logs.zip enb_usrp phy_sim cppcheck gnb_usrp nrue_usrp"
+                        }
+                        if(fileExists('archives/vm_build_logs.zip')) {
+                            archiveArtifacts artifacts: 'archives/vm_build_logs.zip'
+                        }
+                        if ("MERGE".equals(env.gitlabActionType)) {
+                            sh "./ci-scripts/reportBuildLocally.sh --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger merge-request --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
+                        } else {
+                            sh "./ci-scripts/reportBuildLocally.sh --git-url ${GIT_URL} --job-name ${JOB_NAME} --build-id ${BUILD_ID} --trigger push --branch ${GIT_BRANCH} --commit ${GIT_COMMIT}"
+                        }
+                        if(fileExists('build_results.html')) {
+                            archiveArtifacts artifacts: 'build_results.html'
+                        }
+                    }
+                }
+            }
+        }
+
+        stage ("Destroy all Virtual Machines") {
+            steps {
+                sh "./ci-scripts/destroyAllRunningVM.sh --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+            }
+        }
+    }
+    post {
+        always {
+            script {
+                // Stage destroy may not be run if error in previous stage
+                sh "./ci-scripts/destroyAllRunningVM.sh --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+            }
+        }
+        success {
+            script {
+                def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
+                if ("MERGE".equals(env.gitlabActionType)) {
+                    echo "This is a MERGE event"
+                    addGitLabMRComment comment: message
+                    def message2 = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ") -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
+                    slackSend channel: 'ci-enb', color: 'good', message: message2
+                } else {
+                    slackSend channel: 'ci-enb', color: 'good', message: message
+                }
+            }
+        }
+        failure {
+            script {
+                def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ")"
+                if ("MERGE".equals(env.gitlabActionType)) {
+                    echo "This is a MERGE event"
+                    addGitLabMRComment comment: message
+                    def message2 = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ") -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
+                    slackSend channel: 'ci-enb', color: 'danger', message: message2
+                } else {
+                    slackSend channel: 'ci-enb', color: 'danger', message: message
+                }
+            }
+        }
+    }
+}

ci-scripts/astyle-options.txt

+# OAI is using a style that is similar to the Google style
+--style=google
+# long options can be written without the preceding '--'
+# Convert tabs to spaces
+convert-tabs
+# Indentation is 2 spaces
+indent=spaces=2
+# Indent 'switch' blocks so that the 'case X:' statements are indented in the switch block. 
+indent-switches
+# Indent C++ comments beginning in column one.
+indent-col1-comments
+# Pad empty lines around header blocks
+break-blocks
+delete-empty-lines
+# Attach a pointer or reference operator (*, &, or ^) to the variable name (right)
+align-pointer=name
+# The code line length is 200 characters/columns 
+max-code-length=200
+break-after-logical
+lineend=linux

ci-scripts/buildLocally.sh

+#!/bin/bash
+
+function usage {
+    echo "OAI Local Build Check script"
+    echo "   Original Author: Raphael Defosseux"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo "    buildLocally.sh [OPTIONS]"
+    echo ""
+    echo "Options:"
+    echo "--------"
+    echo "    --workspace #### OR -ws ####"
+    echo "    Specify the workspace"
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+if [ $# -ne 2 ] && [ $# -ne 1 ]
+then
+    echo "Syntax Error: not the correct number of arguments"
+    echo ""
+    usage
+    exit 1
+fi
+
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    shift
+    usage
+    exit 0
+    ;;
+    -ws|--workspace)
+    JENKINS_WKSP="$2"
+    shift
+    shift
+    ;;
+    *)
+    echo "Syntax Error: unknown option: $key"
+    echo ""
+    usage
+    exit 1
+esac
+done
+
+cd $JENKINS_WKSP
+STATUS=0
+
+############################################################
+# Creating a tmp folder to store results and artifacts
+############################################################
+if [ ! -d $JENKINS_WKSP/archives ]
+then
+    mkdir $JENKINS_WKSP/archives
+fi
+
+source oaienv
+cd $JENKINS_WKSP/cmake_targets
+
+############################################################
+# Building eNb with USRP option
+############################################################
+ARCHIVES_LOC=$JENKINS_WKSP/archives/enb_usrp
+if [ ! -d $ARCHIVES_LOC ]
+then
+    mkdir $ARCHIVES_LOC
+fi
+./build_oai --eNB -w USRP -c
+
+# Generated log files:
+if [ -f $JENKINS_WKSP/cmake_targets/log/lte-softmodem.Rel14.txt ]
+then
+    LOCAL_STAT=`egrep -c "Built target lte-softmodem" $JENKINS_WKSP/cmake_targets/log/lte-softmodem.Rel14.txt`
+    if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
+    cp $JENKINS_WKSP/cmake_targets/log/lte-softmodem.Rel14.txt $ARCHIVES_LOC
+else
+    STATUS=-1
+fi
+if [ -f $JENKINS_WKSP/cmake_targets/log/params_libconfig.Rel14.txt ]
+then
+    LOCAL_STAT=`egrep -c "Built target params_libconfig" $JENKINS_WKSP/cmake_targets/log/params_libconfig.Rel14.txt`
+    if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
+    cp $JENKINS_WKSP/cmake_targets/log/params_libconfig.Rel14.txt $ARCHIVES_LOC
+else
+    STATUS=-1
+fi
+if [ -f $JENKINS_WKSP/cmake_targets/log/coding.Rel14.txt ]
+then
+    LOCAL_STAT=`egrep -c "Built target coding" $JENKINS_WKSP/cmake_targets/log/coding.Rel14.txt`
+    if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
+    cp $JENKINS_WKSP/cmake_targets/log/coding.Rel14.txt $ARCHIVES_LOC
+else
+    STATUS=-1
+fi
+if [ -f $JENKINS_WKSP/cmake_targets/log/oai_usrpdevif.Rel14.txt ]
+then
+    LOCAL_STAT=`egrep -c "Built target oai_usrpdevif" $JENKINS_WKSP/cmake_targets/log/oai_usrpdevif.Rel14.txt`
+    if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
+    cp $JENKINS_WKSP/cmake_targets/log/oai_usrpdevif.Rel14.txt $ARCHIVES_LOC
+else
+    STATUS=-1
+fi
+
+############################################################
+# Building basic simulator
+############################################################
+ARCHIVES_LOC=$JENKINS_WKSP/archives/basic_sim
+if [ ! -d $ARCHIVES_LOC ]
+then
+    mkdir $ARCHIVES_LOC
+fi
+cd $JENKINS_WKSP/cmake_targets
+./build_oai --basic-simulator -c
+
+# Generated log files:
+if [ -f $JENKINS_WKSP/cmake_targets/log/basic_simulator_enb.txt ]
+then
+    LOCAL_STAT=`egrep -c "Built target lte-softmodem" $JENKINS_WKSP/cmake_targets/log/basic_simulator_enb.txt`
+    if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
+    cp $JENKINS_WKSP/cmake_targets/log/basic_simulator_enb.txt $ARCHIVES_LOC
+else
+    STATUS=-1
+fi
+if [ -f $JENKINS_WKSP/cmake_targets/log/basic_simulator_ue.txt ]
+then
+    LOCAL_STAT=`egrep -c "Built target lte-uesoftmodem" $JENKINS_WKSP/cmake_targets/log/basic_simulator_ue.txt`
+    if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
+    cp $JENKINS_WKSP/cmake_targets/log/basic_simulator_ue.txt $ARCHIVES_LOC
+else
+    STATUS=-1
+fi
+if [ -f $JENKINS_WKSP/cmake_targets/log/conf2uedata.Rel14.txt ]
+then
+    LOCAL_STAT=`egrep -c "Built target conf2uedata" $JENKINS_WKSP/cmake_targets/log/conf2uedata.Rel14.txt`
+    if [ $LOCAL_STAT -eq 0 ]; then STATUS=-1; fi
+    cp $JENKINS_WKSP/cmake_targets/log/conf2uedata.Rel14.txt $ARCHIVES_LOC
+else
+    STATUS=-1
+fi
+
+############################################################
+# Creating a zip for Jenkins archiving
+############################################################
+cd $JENKINS_WKSP/archives/
+zip -r local_build_logs.zip basic_sim enb_usrp
+
+exit $STATUS

ci-scripts/checkCodingFormattingRules.sh

+#!/bin/bash
+
+function usage {
+    echo "OAI Coding / Formatting Guideline Check script"
+    echo "   Original Author: Raphael Defosseux"
+    echo ""
+    echo "   Requirement: astyle shall be installed"
+    echo ""
+    echo "   By default (no options) the complete repository will be checked"
+    echo "   In case of merge request, provided source and target branch,"
+    echo "   the script will check only the modified files"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo "    checkCodingFormattingRules.sh [OPTIONS]"
+    echo ""
+    echo "Options:"
+    echo "--------"
+    echo "    --src-branch #### OR -sb ####"
+    echo "    Specify the source branch of the merge request."
+    echo ""
+    echo "    --target-branch #### OR -tb ####"
+    echo "    Specify the target branch of the merge request (usually develop)."
+    echo ""
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+if [ $# -ne 4 ] && [ $# -ne 1 ] && [ $# -ne 0 ]
+then
+    echo "Syntax Error: not the correct number of arguments"
+    echo ""
+    usage
+    exit 1
+fi
+
+if [ $# -eq 0 ]
+then
+    echo " ---- Checking the whole repository ----"
+    echo ""
+    NB_FILES_TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt --recursive *.c *.h | grep -c Formatted `
+    echo "Nb Files that do NOT follow OAI rules: $NB_FILES_TO_FORMAT"
+    echo $NB_FILES_TO_FORMAT > ./oai_rules_result.txt
+    exit 0
+fi
+
+checker=0
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    shift
+    usage
+    exit 0
+    ;;
+    -sb|--src-branch)
+    SOURCE_BRANCH="$2"
+    let "checker|=0x1"
+    shift
+    shift
+    ;;
+    -tb|--target-branch)
+    TARGET_BRANCH="$2"
+    let "checker|=0x2"
+    shift
+    shift
+    ;;
+    *)
+    echo "Syntax Error: unknown option: $key"
+    echo ""
+    usage
+    exit 1
+esac
+
+done
+
+
+if [ $checker -ne 3 ]
+then
+    echo "Source Branch is    : $SOURCE_BRANCH"
+    echo "Target Branch is    : $TARGET_BRANCH"
+    echo ""
+    echo "Syntax Error: missing option"
+    echo ""
+    usage
+    exit 1
+fi
+
+# Merge request scenario
+
+MERGE_COMMMIT=`git log -n1 | grep commit | sed -e "s@commit @@"`
+TARGET_INIT_COMMIT=`cat .git/refs/remotes/origin/$TARGET_BRANCH`
+
+echo " ---- Checking the modified files by the merge request ----"
+echo ""
+echo "Source Branch is    : $SOURCE_BRANCH"
+echo "Target Branch is    : $TARGET_BRANCH"
+echo "Merged Commit is    : $MERGE_COMMMIT"
+echo "Target Init   is    : $TARGET_INIT_COMMIT"
+
+# Retrieve the list of modified files since the latest develop commit
+MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | egrep "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq`
+NB_TO_FORMAT=0
+for FULLFILE in $MODIFIED_FILES
+do
+    echo $FULLFILE
+    filename=$(basename -- "$FULLFILE")
+    EXT="${filename##*.}"
+    if [ $EXT = "c" ] || [ $EXT = "h" ] || [ $EXT = "cpp" ] || [ $EXT = "hpp" ]
+    then
+        TO_FORMAT=`astyle --dry-run --options=ci-scripts/astyle-options.txt $FULLFILE | grep -c Formatted `
+        NB_TO_FORMAT=$((NB_TO_FORMAT + TO_FORMAT))
+    fi
+done
+echo "Nb Files that do NOT follow OAI rules: $NB_TO_FORMAT"
+echo $NB_TO_FORMAT > ./oai_rules_result.txt
+
+exit 0

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/destroyAllRunningVM.sh

+#!/bin/bash
+
+function usage {
+    echo "OAI VM Destroy script"
+    echo "   Original Author: Raphael Defosseux"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo "    destroyAllRunningVM.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 "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+if [ $# -gt 4 ]
+then
+    echo "Syntax Error: not the correct number of arguments"
+    echo ""
+    usage
+    exit 1
+fi
+
+VM_TEMPLATE=ci-
+JOB_NAME=XX
+BUILD_ID=XX
+
+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
+    ;;
+    *)
+    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
+
+LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE`
+
+for CI_VM in $LIST_CI_VM
+do
+    VM_IP_ADDR=`uvt-kvm ip $CI_VM`
+    echo "VM to destroy: $CI_VM -- IP $VM_IP_ADDR"
+    uvt-kvm destroy $CI_VM
+    ssh-keygen -R $VM_IP_ADDR
+done
+
+exit 0
+

ci-scripts/doGitLabMerge.sh

+#!/bin/bash
+
+function usage {
+    echo "OAI GitLab merge request applying script"
+    echo "   Original Author: Raphael Defosseux"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo ""
+    echo "    doGitLabMerge.sh [OPTIONS] [MANDATORY_OPTIONS]"
+    echo ""
+    echo "Mandatory Options:"
+    echo "------------------"
+    echo ""
+    echo "    --src-branch #### OR -sb ####"
+    echo "    Specify the source branch of the merge request."
+    echo ""
+    echo "    --src-commit #### OR -sc ####"
+    echo "    Specify the source commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "    --target-branch #### OR -tb ####"
+    echo "    Specify the target branch of the merge request (usually develop)."
+    echo ""
+    echo "    --target-commit #### OR -tc ####"
+    echo "    Specify the target commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "Options:"
+    echo "--------"
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+if [ $# -ne 8 ] && [ $# -ne 1 ]
+then
+    echo "Syntax Error: not the correct number of arguments"
+    echo ""
+    usage
+    exit 1
+fi
+
+checker=0
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    shift
+    usage
+    exit 0
+    ;;
+    -sb|--src-branch)
+    SOURCE_BRANCH="$2"
+    let "checker|=0x1"
+    shift
+    shift
+    ;;
+    -sc|--src-commit)
+    SOURCE_COMMIT_ID="$2"
+    let "checker|=0x2"
+    shift
+    shift
+    ;;
+    -tb|--target-branch)
+    TARGET_BRANCH="$2"
+    let "checker|=0x4"
+    shift
+    shift
+    ;;
+    -tc|--target-commit)
+    TARGET_COMMIT_ID="$2"
+    let "checker|=0x8"
+    shift
+    shift
+    ;;
+    *)
+    echo "Syntax Error: unknown option: $key"
+    echo ""
+    usage
+    exit 1
+esac
+
+done
+
+echo "Source Branch is    : $SOURCE_BRANCH"
+echo "Source Commit ID is : $SOURCE_COMMIT_ID"
+echo "Target Branch is    : $TARGET_BRANCH"
+echo "Target Commit ID is : $TARGET_COMMIT_ID"
+
+if [ $checker -ne 15 ]
+then
+    echo ""
+    echo "Syntax Error: missing option"
+    echo ""
+    usage
+    exit 1
+fi
+
+git config user.email "jenkins@openairinterface.org"
+git config user.name "OAI Jenkins"
+
+git checkout -f $SOURCE_COMMIT_ID
+
+git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"
+
+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/template-host.xml

+<domain type='kvm'>
+  <os>
+    <type>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode='host-passthrough'>
+  </cpu>
+  <devices>
+    <interface type='network'>
+      <source network='default'/>
+      <model type='virtio'/>
+    </interface>
+    <serial type='pty'>
+      <source path='/dev/pts/3'/>
+      <target port='0'/>
+    </serial>
+    <graphics type='vnc' autoport='yes' listen='127.0.0.1'>
+      <listen type='address' address='127.0.0.1'/>
+    </graphics>
+    <video/>
+  </devices>
+</domain>

cmake_targets/CMakeLists.txt

@@ -1276,6 +1276,8 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/nr_pbch.c
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/
   ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/dci_nr.c
+  ${OPENAIR1_DIR}/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/ul_ref_seq_nr.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_dmrs_rx.c
   ${OPENAIR1_DIR}/PHY/NR_REFSIG/nr_gold_ue.c
@@ -1293,6 +1295,9 @@ set(PHY_SRC_UE
   ${OPENAIR1_DIR}/PHY/TOOLS/time_meas.c
   ${OPENAIR1_DIR}/PHY/TOOLS/lut.c
   ${OPENAIR1_DIR}/PHY/INIT/nr_init_ue.c
+  ${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_ue.c
+  #${OPENAIR1_DIR}/SCHED_NR_UE/phy_procedures_nr_common_ue.c
+  ${PHY_POLARSRC}
   )
 
 
@@ -1315,12 +1320,14 @@ add_library(PHY_RU ${PHY_SRC_RU})
 #Layer 2 library
 #####################
 set(MAC_DIR ${OPENAIR2_DIR}/LAYER2/MAC)
+set(NR_UE_MAC_DIR ${OPENAIR2_DIR}/LAYER2/NR_MAC_UE)
 set(PHY_INTERFACE_DIR ${OPENAIR2_DIR}/PHY_INTERFACE)
 set(RLC_DIR ${OPENAIR2_DIR}/LAYER2/RLC)
 set(RLC_UM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/UM_v9.3.0)
 set(RLC_AM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/AM_v9.3.0)
 set(RLC_TM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/TM_v9.3.0)
 set(RRC_DIR ${OPENAIR2_DIR}/RRC/LTE)
+set(NR_UE_RRC_DIR ${OPENAIR2_DIR}/RRC/NR_UE)
 set(PDCP_DIR  ${OPENAIR2_DIR}/LAYER2/PDCP_v10.1.0)
 set(L2_SRC
   ${OPENAIR2_DIR}/LAYER2/openair2_proc.c
@@ -1407,6 +1414,9 @@ set(L2_SRC_UE
   ${RRC_DIR}/rrc_common.c
   ${RRC_DIR}/L2_interface_common.c
   ${RRC_DIR}/L2_interface_ue.c
+  ${NR_UE_RRC_DIR}/L2_interface_ue.c
+  ${NR_UE_RRC_DIR}/main_ue.c
+  ${NR_UE_RRC_DIR}/rrc_UE.c
   )
 
 set (MAC_SRC
@@ -1438,6 +1448,10 @@ set (MAC_SRC_UE
   ${MAC_DIR}/l1_helpers.c
   ${MAC_DIR}/rar_tools_ue.c
   ${MAC_DIR}/config_ue.c
+  ${NR_UE_MAC_DIR}/config_ue.c
+  ${NR_UE_MAC_DIR}/mac_vars.c
+  ${NR_UE_MAC_DIR}/main_ue_nr.c
+  ${NR_UE_MAC_DIR}/nr_ue_procedures.c
  )
 
 set (ENB_APP_SRC

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};
 
@@ -841,17 +842,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 );
         }
       }
     }
@@ -955,6 +956,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

@@ -165,18 +165,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);

openair1/PHY/NR_REFSIG/nr_dmrs_rx.c

@@ -49,7 +49,9 @@ 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};
+//short nr_mod_table[14] = {0,0,-23170,-23170,23170,23170,-23170,-23170,-23170,23170,23170,-23170,23170,23170};
+  short nr_mod_table[14] = {0,0,23170,-23170,-23170,23170,23170,-23170,23170,23170,-23170,-23170,-23170,23170};
+//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];
 
 
@@ -149,8 +151,8 @@ int nr_pbch_dmrs_rx(unsigned int *nr_gold_pbch,
       ((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("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_TRANSPORT/nr_dci.c

@@ -130,7 +130,7 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
   return size;
 }
 
-uint8_t nr_generate_dci_top(NR_DCI_ALLOC_t dci_alloc,
+uint8_t nr_generate_dci_top(NR_gNB_DCI_ALLOC_t dci_alloc,
                             uint32_t *gold_pdcch_dmrs,
                             int32_t** txdataF,
                             int16_t amp,
@@ -138,14 +138,17 @@ uint8_t nr_generate_dci_top(NR_DCI_ALLOC_t dci_alloc,
                             nfapi_config_request_t* config)
 {
 
-  uint16_t mod_dmrs[NR_MAX_PDCCH_DMRS_LENGTH<<2];
-
-  /// DMRS BPSK modulation
-  for (int m=0; m<NR_MAX_PDCCH_DMRS_LENGTH; m++) {
-    mod_dmrs[m<<1] = nr_mod_table[((NR_MOD_TABLE_BPSK_OFFSET + ((gold_pdcch_dmrs[m>>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1)];
-    mod_dmrs[(m<<1)+1] = nr_mod_table[((NR_MOD_TABLE_BPSK_OFFSET + ((gold_pdcch_dmrs[m>>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1) + 1];
-#ifdef DEBUG_PBCH_DMRS
-  printf("m %d  mod_dmrs %d %d\n", m, mod_dmrs[2*m], mod_dmrs[2*m+1]);
+  uint16_t mod_dmrs[NR_MAX_PDCCH_DMRS_LENGTH<<1];
+  uint8_t idx=0;
+
+  /// DMRS QPSK modulation
+  for (int m=0; m<NR_MAX_PDCCH_DMRS_LENGTH>>1; m++) {
+    idx = ((((gold_pdcch_dmrs[(m<<1)>>5])>>((m<<1)&0x1f))&1)<<1) ^ (((gold_pdcch_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_PDCCH_DMRS
+  printf("m %d idx %d gold seq %d b0-b1 %d-%d mod_dmrs %d %d\n", m, idx, gold_pdcch_dmrs[(m<<1)>>5], (((gold_pdcch_dmrs[(m<<1)>>5])>>((m<<1)&0x1f))&1),
+  (((gold_pdcch_dmrs[((m<<1)+1)>>5])>>(((m<<1)+1)&0x1f))&1), mod_dmrs[(m<<1)], mod_dmrs[(m<<1)+1]);
 #endif
   }
 

openair1/PHY/NR_TRANSPORT/nr_dci.h

@@ -98,7 +98,7 @@ typedef struct {
   DCI_format_t format;
   /// DCI pdu
   uint8_t dci_pdu[8];
-} NR_DCI_ALLOC_t;
+} NR_gNB_DCI_ALLOC_t;
 
 
 uint8_t nr_get_dci_size(nr_dci_format_e format,
@@ -106,7 +106,7 @@ uint8_t nr_get_dci_size(nr_dci_format_e format,
                         NR_BWP_PARMS* bwp,
                         nfapi_config_request_t* config);
 
-uint8_t nr_generate_dci_top(NR_DCI_ALLOC_t dci_alloc,
+uint8_t nr_generate_dci_top(NR_gNB_DCI_ALLOC_t dci_alloc,
                             uint32_t *gold_pdcch_dmrs,
                             int32_t** txdataF,
                             int16_t amp,

openair2/RRC/NR_UE/rrc_types.h → openair1/PHY/NR_TRANSPORT/nr_mcs.c

@@ -19,53 +19,41 @@
  *      contact@openairinterface.org
  */
 
-/*! \file rrc_types.h
-* \brief rrc types and subtypes
-* \author Navid Nikaein and Raymond Knopp
-* \date 2011 - 2014
-* \version 1.0
+/*! \file PHY/NR_TRANSPORT/nr_mcs.c
+* \brief Some support routines for NR MCS computations
+* \author
+* \date 2018
+* \version 0.1
 * \company Eurecom
-* \email: navid.nikaein@eurecom.fr, raymond.knopp@eurecom.fr
+* \email:
+* \note
+* \warning
 */
 
-#ifndef NR_RRC_TYPES_H_
-#define NR_RRC_TYPES_H_
-
-typedef enum nr_rrc_state_e {
-  //RRC_STATE_INACTIVE=0,
-  //RRC_STATE_IDLE,
-  //RRC_STATE_CONNECTED,
-
-  //RRC_STATE_FIRST = RRC_STATE_INACTIVE,
-  //RRC_STATE_LAST = RRC_STATE_CONNECTED,
-	RRC_STATE_IDLE 	= 0,
-	RRC_STATE_INACTIVE,
-	RRC_STATE_CONNECTED,
-
-	RRC_STATE_FIRST = RRC_STATE_IDLE,
-	RRC_STATE_LAST	= RRC_STATE_CONNECTED
-
-} nr_rrc_state_t;
-
-typedef enum nr_rrc_sub_state_e {
-  //RRC_SUB_STATE_INACTIVE=0,
-
-  //RRC_SUB_STATE_IDLE_SEARCHING,
-  //RRC_SUB_STATE_IDLE_RECEIVING_SIB,
-  //RRC_SUB_STATE_IDLE_SIB_COMPLETE,
-  //RRC_SUB_STATE_IDLE_CONNECTING,
-  //RRC_SUB_STATE_IDLE,
-
-  //RRC_SUB_STATE_CONNECTED,
-
-  //RRC_SUB_STATE_INACTIVE_FIRST = RRC_SUB_STATE_INACTIVE,
-  //RRC_SUB_STATE_INACTIVE_LAST = RRC_SUB_STATE_INACTIVE,
-
-  //RRC_SUB_STATE_IDLE_FIRST = RRC_SUB_STATE_IDLE_SEARCHING,
-  //RRC_SUB_STATE_IDLE_LAST = RRC_SUB_STATE_IDLE,
-
-  //RRC_SUB_STATE_CONNECTED_FIRST = RRC_SUB_STATE_CONNECTED,
-  //RRC_SUB_STATE_CONNECTED_LAST = RRC_SUB_STATE_CONNECTED,
-} nr_rrc_sub_state_t;
-
-#endif /* RRC_TYPES_H_ */
+#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

@@ -51,16 +51,19 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
 {
   int k,l;
   int16_t a;
-  int16_t mod_dmrs[NR_PBCH_DMRS_LENGTH<<2];
+  int16_t mod_dmrs[NR_PBCH_DMRS_LENGTH<<1];
+  uint8_t idx=0;
 
   LOG_I(PHY, "PBCH DMRS mapping started at symbol %d shift %d\n", ssb_start_symbol+1, nushift);
 
-  /// BPSK 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];
+  /// QPSK modulation
+  for (int m=0; m<NR_PBCH_DMRS_LENGTH>>1; m++) {
+    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
   }
 
@@ -133,19 +136,27 @@ void nr_pbch_scrambling(uint32_t Nid,
                         uint8_t *pbch_a,
                         uint32_t length)
 {
-  uint8_t reset;
+  uint8_t reset, offset;
   uint32_t x1, x2, s=0;
+  uint8_t M = length - 3; // case Lmax = 4--> 29
 
   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)/5); i++) {
+    s = lte_gold_generic(&x1, &x2, reset);
+    reset = 0;
+  }
+  offset = (nushift*M)&0x1f;
+
   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);
+    pbch_a[i] = (pbch_a[i]&1) ^ ((s>>((i+offset)&0x1f))&1);
   }
 }
 
@@ -202,7 +213,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
 
   /// 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];
 

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/nr_dl_channel_estimation.c

@@ -27,7 +27,7 @@
 #include "PHY/defs_nr_UE.h"
 #include "filt16a_32.h"
 #include "T.h"
-#define DEBUG_CH
+//#define DEBUG_CH
 
 int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
                               uint8_t eNB_id,
@@ -41,20 +41,19 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
   unsigned char aarx;
   unsigned short k;
   unsigned int pilot_cnt;
-  int16_t ch[2],*pil,*rxF,*dl_ch,*fl,*fm,*f2l,*fr,f1,*f2r,*fl_dc,*fm_dc,*fr_dc;
+  int16_t ch[2],*pil,*rxF,*dl_ch,*fl,*fm,*fr;
   int ch_offset,symbol_offset;
 
-  uint16_t Nid_cell = (eNB_offset == 0) ? ue->frame_parms.Nid_cell : ue->measurements.adj_cell_id[eNB_offset-1];
+  //uint16_t Nid_cell = (eNB_offset == 0) ? ue->frame_parms.Nid_cell : ue->measurements.adj_cell_id[eNB_offset-1];
 
-  uint8_t nushift;
-  uint8_t previous_thread_id = ue->current_thread_id[Ns>>1]==0 ? (RX_NB_TH-1):(ue->current_thread_id[Ns>>1]-1);
-  int **dl_ch_estimates         =ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset];
+  uint8_t nushift, Lmax, ssb_index=0, n_hf=0;
+  int **dl_ch_estimates  =ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].dl_ch_estimates[eNB_offset];
   int **rxdataF=ue->common_vars.common_vars_rx_data_per_thread[ue->current_thread_id[Ns>>1]].rxdataF;
 
-
-  // recompute nushift with eNB_offset corresponding to adjacent eNB on which to perform channel estimation
-  nushift =  Nid_cell%4;
-
+  Lmax = 8; //to be updated
+  nushift =  (Lmax < 8)? ssb_index&3 : ssb_index&7;
+  ue->frame_parms.nushift = nushift;
+ 
   if (ue->high_speed_flag == 0) // use second channel estimate position for temporary storage
     ch_offset     = ue->frame_parms.ofdm_symbol_size ;
   else
@@ -74,48 +73,24 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
         fl = filt16a_l0;
         fm = filt16a_m0;
         fr = filt16a_r0;
-        fl_dc = filt16a_l0;
-        fm_dc = filt16a_m0;
-        fr_dc = filt16a_r0;
-        f1 = filt16a_1;
-        f2l = filt16a_2l0;
-        f2r = filt16a_2r0;
         break;
 
   case 1:
         fl = filt16a_l1;
         fm = filt16a_m1;
         fr = filt16a_r1;
-        fl_dc = filt16a_l1;
-        fm_dc = filt16a_m1;
-        fr_dc = filt16a_r1;
-        f1 = filt16a_1;
-        f2l = filt16a_2l1;
-        f2r = filt16a_2r1;
         break;
 
   case 2:
         fl = filt16a_l2;
         fm = filt16a_m2;
         fr = filt16a_r2;
-        fl_dc = filt16a_l2;
-        fm_dc = filt16a_m2;
-        fr_dc = filt16a_r2;
-        f1 = filt16a_1;
-        f2l = filt16a_2l0;
-        f2r = filt16a_2r0;
         break;
 
   case 3:
         fl = filt16a_l3;
         fm = filt16a_m3;
         fr = filt16a_r3;
-        fl_dc = filt16a_l3;
-        fm_dc = filt16a_m3;
-        fr_dc = filt16a_r3;
-        f1 = filt16a_1;
-        f2l = filt16a_2l1;
-        f2r = filt16a_2r1;
         break;
 
   default:
@@ -124,11 +99,8 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
     break;
   }
 
-
-
   // generate pilot
-  nr_pbch_dmrs_rx(ue->nr_gold_pbch,
-					  &pilot[p][0]);
+  nr_pbch_dmrs_rx(ue->nr_gold_pbch[n_hf][ssb_index], &pilot[p][0]);
 
   for (aarx=0; aarx<ue->frame_parms.nb_antennas_rx; aarx++) {
 
@@ -154,7 +126,7 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
       ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 #ifdef DEBUG_CH
       printf("ch 0 %d\n",((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1]));
-      printf("pilot 0 : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
+      printf("pilot 0 : rxF - > (%d,%d) addr %p  ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],&rxF[0],ch[0],ch[1],pil[0],pil[1]);
 #endif
       multadd_real_vector_complex_scalar(fl,
                                          ch,
@@ -162,8 +134,8 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
                                          16);
       pil+=2;
       rxF+=8;
-      for (int i= 0; i<8; i++)
-      printf("dl_ch addr %p %d\n", dl_ch+i, *(dl_ch+i));
+      //for (int i= 0; i<8; i++)
+      //printf("dl_ch addr %p %d\n", dl_ch+i, *(dl_ch+i));
 
       ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
       ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
@@ -174,19 +146,15 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
                                          ch,
                                          dl_ch,
                                          16);
-      //printf("after dl_ch %d %d\n", dl_ch, *(dl_ch));
-      //for (int i= 0; i<16; i++)
-      //      printf("dl_ch %d %d\n", dl_ch+i, *(dl_ch+i));
-
       pil+=2;
       rxF+=8;
 
       ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
       ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 
-      #ifdef DEBUG_CH
-            printf("pilot 2 : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
-      #endif
+#ifdef DEBUG_CH
+      printf("pilot 2 : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
+#endif
 
       multadd_real_vector_complex_scalar(fr,
                                          ch,
@@ -204,7 +172,7 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
         ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
         ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 #ifdef DEBUG_CH
-	//printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
+	printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
 #endif
         multadd_real_vector_complex_scalar(fl,
                                            ch,
@@ -220,7 +188,7 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
         ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
         ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 #ifdef DEBUG_CH
-	//printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
+	printf("pilot %d : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",pilot_cnt+1,rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
 #endif
         multadd_real_vector_complex_scalar(fm,
                                            ch,
@@ -232,9 +200,9 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
         ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
         ch[1] = (int16_t)(((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15);
 
-        #ifdef DEBUG_CH
-	// printf("pilot 1 : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
-        #endif
+#ifdef DEBUG_CH
+	printf("pilot 1 : rxF - > (%d,%d) ch -> (%d,%d), pil -> (%d,%d) \n",rxF[0],rxF[1],ch[0],ch[1],pil[0],pil[1]);
+#endif
 
         multadd_real_vector_complex_scalar(fr,
                                            ch,
@@ -249,8 +217,6 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
 
     }
 
-    printf("finish dl_ch addr %p\n", dl_ch);
-
   }
 
   return(0);

openair1/PHY/NR_UE_TRANSPORT/dci_nr.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/LTE_TRANSPORT/dci_nr.h
+* \brief typedefs for NR DCI structures from 38-212.
+* \author R. Knopp, A. Mico Pereperez
+* \date 2018
+* \version 0.1
+* \company Eurecom
+* \email: knopp@eurecom.fr
+* \note
+* \warning
+*/
+#ifndef USER_MODE
+#include "PHY/types.h"
+#else
+#include <stdint.h>
+#endif
+
+
+
+#define MAX_DCI_SIZE_BITS 45
+
+
+#define NR_PDCCH_DCI_H
+#ifdef NR_PDCCH_DCI_H
+struct NR_DCI_INFO_EXTRACTED {
+  uint8_t carrier_ind                     ; // 0  CARRIER_IND: 0 or 3 bits, as defined in Subclause x.x of [5, TS38.213]
+  uint8_t sul_ind_0_1                     ; // 1  SUL_IND_0_1:
+  uint8_t identifier_dci_formats          ; // 2  IDENTIFIER_DCI_FORMATS:
+  uint8_t slot_format_ind                 ; // 3  SLOT_FORMAT_IND: size of DCI format 2_0 is configurable by higher layers up to 128 bits, according to Subclause 11.1.1 of [5, TS 38.213]
+  uint8_t pre_emption_ind                 ; // 4  PRE_EMPTION_IND: size of DCI format 2_1 is configurable by higher layers up to 126 bits, according to Subclause 11.2 of [5, TS 38.213]. Each pre-emption indication is 14 bits
+  uint8_t tpc_cmd_number                  ; // 5  TPC_CMD_NUMBER: The parameter xxx provided by higher layers determines the index to the TPC command number for an UL of a cell. Each TPC command number is 2 bits
+  uint8_t block_number                    ; // 6  BLOCK_NUMBER: starting position of a block is determined by the parameter startingBitOfFormat2_3
+  uint8_t bandwidth_part_ind              ; // 7  BANDWIDTH_PART_IND:
+  uint16_t freq_dom_resource_assignment_UL; // 8  FREQ_DOM_RESOURCE_ASSIGNMENT_UL: PUSCH hopping with resource allocation type 1 not considered
+                                            // (NOTE 1) If DCI format 0_0 is monitored in common search space
+                                            // and if the number of information bits in the DCI format 0_0 prior to padding
+                                            // is larger than the payload size of the DCI format 1_0 monitored in common search space
+                                            // the bitwidth of the frequency domain resource allocation field in the DCI format 0_0
+                                            // is reduced such that the size of DCI format 0_0 equals to the size of the DCI format 1_0
+  uint16_t freq_dom_resource_assignment_DL; // 9  FREQ_DOM_RESOURCE_ASSIGNMENT_DL:
+  uint8_t time_dom_resource_assignment    ; // 10 TIME_DOM_RESOURCE_ASSIGNMENT: 0, 1, 2, 3, or 4 bits as defined in Subclause 6.1.2.1 of [6, TS 38.214]. The bitwidth for this field is determined as log2(I) bits,
+                                            // where I the number of entries in the higher layer parameter pusch-AllocationList
+  uint8_t vrb_to_prb_mapping              ; // 11 VRB_TO_PRB_MAPPING: 0 bit if only resource allocation type 0
+  uint8_t prb_bundling_size_ind           ; // 12 PRB_BUNDLING_SIZE_IND:0 bit if the higher layer parameter PRB_bundling is not configured or is set to 'static', or 1 bit if the higher layer parameter PRB_bundling is set to 'dynamic' according to Subclause 5.1.2.3 of [6, TS 38.214]
+  uint8_t rate_matching_ind               ; // 13 RATE_MATCHING_IND: 0, 1, or 2 bits according to higher layer parameter rate-match-PDSCH-resource-set
+  uint8_t zp_csi_rs_trigger               ; // 14 ZP_CSI_RS_TRIGGER:
+  uint8_t freq_hopping_flag               ; // 15 FREQ_HOPPING_FLAG: 0 bit if only resource allocation type 0
+  uint8_t tb1_mcs                         ; // 16 TB1_MCS:
+  uint8_t tb1_ndi                         ; // 17 TB1_NDI:
+  uint8_t tb1_rv                          ; // 18 TB1_RV:
+  uint8_t tb2_mcs                         ; // 19 TB2_MCS:
+  uint8_t tb2_ndi                         ; // 20 TB2_NDI:
+  uint8_t tb2_rv                          ; // 21 TB2_RV:
+  uint8_t mcs                             ; // 22 MCS:
+  uint8_t ndi                             ; // 23 NDI:
+  uint8_t rv                              ; // 24 RV:
+  uint8_t harq_process_number             ; // 25 HARQ_PROCESS_NUMBER:
+  uint8_t dai                             ; // 26 DAI: For format1_1: 4 if more than one serving cell are configured in the DL and the higher layer parameter HARQ-ACK-codebook=dynamic, where the 2 MSB bits are the counter DAI and the 2 LSB bits are the total DAI
+                                            // 2 if one serving cell is configured in the DL and the higher layer parameter HARQ-ACK-codebook=dynamic, where the 2 bits are the counter DAI
+                                            // 0 otherwise
+  uint8_t first_dai                       ; // 27 FIRST_DAI: (1 or 2 bits) 1 bit for semi-static HARQ-ACK
+  uint8_t second_dai                      ; // 28 SECOND_DAI: (0 or 2 bits) 2 bits for dynamic HARQ-ACK codebook with two HARQ-ACK sub-codebooks
+  uint8_t tpc_pusch                       ; // 29 TPC_PUSCH:
+  uint8_t tpc_pucch                       ; // 30 TPC_PUCCH:
+  uint8_t pucch_resource_ind              ; // 31 PUCCH_RESOURCE_IND:
+  uint8_t pdsch_to_harq_feedback_time_ind ; // 32 PDSCH_TO_HARQ_FEEDBACK_TIME_IND:
+  uint8_t short_message_ind               ; // 33 SHORT_MESSAGE_IND: 1 bit if crc scrambled with P-RNTI
+  uint8_t srs_resource_ind                ; // 34 SRS_RESOURCE_IND:
+  uint8_t precod_nbr_layers               ; // 35 PRECOD_NBR_LAYERS:
+  uint8_t antenna_ports                   ; // 36 ANTENNA_PORTS:
+  uint8_t tci                             ; // 37 TCI: 0 bit if higher layer parameter tci-PresentInDCI is not enabled; otherwise 3 bits
+  uint8_t srs_request                     ; // 38 SRS_REQUEST:
+  uint8_t tpc_cmd_number_format2_3        ; // 39 TPC_CMD_NUMBER_FORMAT2_3:
+  uint8_t csi_request                     ; // 40 CSI_REQUEST:
+  uint8_t cbgti                           ; // 41 CBGTI: 0, 2, 4, 6, or 8 bits determined by higher layer parameter maxCodeBlockGroupsPerTransportBlock for the PDSCH
+  uint8_t cbgfi                           ; // 42 CBGFI: 0 or 1 bit determined by higher layer parameter codeBlockGroupFlushIndicator
+  uint8_t ptrs_dmrs                       ; // 43 PTRS_DMRS:
+  uint8_t beta_offset_ind                 ; // 44 BETA_OFFSET_IND:
+  uint8_t dmrs_seq_ini                    ; // 45 DMRS_SEQ_INI: 1 bit if the cell has two ULs and the number of bits for DCI format 1_0 before padding
+                                            // is larger than the number of bits for DCI format 0_0 before padding; 0 bit otherwise
+  uint8_t sul_ind_0_0                     ; // 46 SUL_IND_0_0:
+  uint16_t padding                        ; // 47 PADDING: (Note 2) If DCI format 0_0 is monitored in common search space
+                                            // and if the number of information bits in the DCI format 0_0 prior to padding
+                                            // is less than the payload size of the DCI format 1_0 monitored in common search space
+                                            // zeros shall be appended to the DCI format 0_0
+                                            // until the payload size equals that of the DCI format 1_0
+
+};
+typedef struct NR_DCI_INFO_EXTRACTED NR_DCI_INFO_EXTRACTED_t;
+#endif
+

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c

@@ -52,7 +52,7 @@ void set_default_frame_parms_single(nfapi_config_request_t *config, NR_DL_FRAME_
 
 //#define DEBUG_INITIAL_SYNCH
 
-int pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
+int nr_pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
 {
 
   uint8_t l,pbch_decoded,frame_mod4,pbch_tx_ant,dummy;
@@ -95,6 +95,8 @@ int pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
 
   pbch_decoded = 0;
 
+  printf("pbch_detection nid_cell %d\n",frame_parms->Nid_cell);
+  
   //for (frame_mod4=0; frame_mod4<4; frame_mod4++) {
     pbch_tx_ant = nr_rx_pbch(ue,
 						  &ue->proc.proc_rxtx[0],
@@ -105,11 +107,8 @@ int pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
                           ue->high_speed_flag,
                           frame_mod4);
 
-    if ((pbch_tx_ant>0) && (pbch_tx_ant<=2)) {
-      pbch_decoded = 1;
+    pbch_decoded = 0; //to be updated
 //      break;
-    }
-
   //}
 
 
@@ -127,43 +126,6 @@ int pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
     //    ue->pbch_vars[0]->decoded_output[0] = ue->pbch_vars[0]->decoded_output[2];
     //    ue->pbch_vars[0]->decoded_output[2] = dummy;
 
-    // now check for Bandwidth of Cell
-    dummy = (ue->pbch_vars[0]->decoded_output[2]>>5)&7;
-
-    switch (dummy) {
-
-    case 0 :
-      frame_parms->N_RB_DL = 6;
-      break;
-
-    case 1 :
-      frame_parms->N_RB_DL = 15;
-      break;
-
-    case 2 :
-      frame_parms->N_RB_DL = 25;
-      break;
-
-    case 3 :
-      frame_parms->N_RB_DL = 50;
-      break;
-
-    case 4 :
-      frame_parms->N_RB_DL = 75;
-      break;
-
-    case 5:
-      frame_parms->N_RB_DL = 100;
-      break;
-
-    default:
-      LOG_E(PHY,"[UE%d] Initial sync: PBCH decoding: Unknown N_RB_DL\n",ue->Mod_id);
-      return -1;
-      break;
-    }
-
-
-
     for(int i=0; i<RX_NB_TH;i++)
     {
         ue->proc.proc_rxtx[i].frame_rx =   (((ue->pbch_vars[0]->decoded_output[2]&3)<<6) + (ue->pbch_vars[0]->decoded_output[1]>>2))<<2;
@@ -176,14 +138,11 @@ int pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
         ue->proc.proc_rxtx[i].frame_tx = ue->proc.proc_rxtx[0].frame_rx;
     }
 #ifdef DEBUG_INITIAL_SYNCH
-    LOG_I(PHY,"[UE%d] Initial sync: pbch decoded sucessfully mode1_flag %d, tx_ant %d, frame %d, N_RB_DL %d, phich_duration %d, phich_resource %s!\n",
+    LOG_I(PHY,"[UE%d] Initial sync: pbch decoded sucessfully mode1_flag %d, tx_ant %d, frame %d\n",
           ue->Mod_id,
           frame_parms->mode1_flag,
           pbch_tx_ant,
-          ue->proc.proc_rxtx[0].frame_rx,
-          frame_parms->N_RB_DL,
-          frame_parms->phich_config_common.phich_duration,
-          phich_resource);  //frame_parms->phich_config_common.phich_resource);
+          ue->proc.proc_rxtx[0].frame_rx,);
 #endif
     return(0);
   } else {
@@ -192,7 +151,6 @@ int pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
 
 }
 
-char phich_string[13][4] = {"","1/6","","1/2","","","one","","","","","","two"};
 char duplex_string[2][4] = {"FDD","TDD"};
 char prefix_string[2][9] = {"NORMAL","EXTENDED"};
 
@@ -260,11 +218,12 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
 
     rx_sss_nr(ue,&metric_fdd_ncp,&phase_fdd_ncp);
 
-    set_default_frame_parms_single(config,&ue->frame_parms);
+    //set_default_frame_parms_single(config,&ue->frame_parms);
     nr_init_frame_parms_ue(config,&ue->frame_parms);
 
     nr_gold_pbch(ue);
-    ret = pbch_detection(ue,mode);
+    ret = nr_pbch_detection(ue,mode);
+    ret = -1;  //to be deleted
     //   write_output("rxdata2.m","rxd2",ue->common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1);
 
 #ifdef DEBUG_INITIAL_SYNCH
@@ -322,10 +281,6 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
       }
 #endif
 
-      generate_pcfich_reg_mapping(frame_parms);
-      generate_phich_reg_mapping(frame_parms);
-
-
       ue->pbch_vars[0]->pdu_errors_conseq=0;
 
     }

openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h

@@ -328,8 +328,43 @@ typedef struct {
   int8_t               g_pucch;
 } NR_UE_DLSCH_t;
 
+typedef enum {format0_0,
+              format0_1,
+              format1_0,
+              format1_1,
+              format2_0,
+              format2_1,
+              format2_2,
+              format2_3
+             } NR_DCI_format_t;
 
 
+typedef enum {nr_pucch_format0=0,
+              nr_pucch_format1,
+              nr_pucch_format2,
+              nr_pucch_format3,
+              nr_pucch_format4
+             } NR_PUCCH_FMT_t;
+
+typedef struct {
+  /// Length of DCI in bits
+  uint8_t dci_length;
+  /// 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
+  rnti_t rnti;
+  /// Format
+  NR_DCI_format_t format;
+  /// search space
+  dci_space_t search_space;
+  /// DCI pdu
+  uint8_t dci_pdu[8];
+} NR_DCI_ALLOC_t;
+
 
 /**@}*/
 #endif

openair1/PHY/phy_vars_nr_ue.h

@@ -44,6 +44,7 @@ int16_t *primary_synch2_time;
 //PHY_VARS *PHY_vars;
 #ifndef OCP_FRAMEWORK
 PHY_VARS_NR_UE ***PHY_vars_UE_g;
+PHY_VARS_eNB ***PHY_vars_eNB_g;
 LTE_DL_FRAME_PARMS *lte_frame_parms_g;
 #else
 PHY_VARS_NR_UE * PHY_vars_UE_g[MAX_UE][MAX_NUM_CCs]={NULL};

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -183,7 +183,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
       //write_output("txdataF.m","txdataF",gNB->common_vars.txdataF[aa],fp->samples_per_frame_wCP, 1, 1);
 
     //temporary DCI generation test
-    NR_DCI_ALLOC_t dci_alloc;
+    NR_gNB_DCI_ALLOC_t dci_alloc;
     nr_generate_dci_top(dci_alloc, gNB->nr_gold_pdcch_dmrs[0][0],gNB->common_vars.txdataF, 512, fp, cfg);
   }
 }

openair2/LAYER2/NR_MAC_UE/config_ue.c

@@ -29,98 +29,101 @@
  * @ingroup _mac
 
  */
+#include "defs.h"
+#include "proto.h"
 
 int
 nr_rrc_mac_config_req_ue(
-    module_id_t Mod_idP,
-	int CC_idP,
-	uint8_t eNB_index,
-    MAC_CellGroupConfig_t *mac_cell_group_config,
-    PhysicalCellGroupConfig_t *phy_cell_group_config,
-    SpCellConfig_t *spcell_config){
+    module_id_t                     module_id,
+	int                             CC_idP,
+	uint8_t                         gNB_index,
+    NR_MIB_t                        *mibP,
+    NR_MAC_CellGroupConfig_t        *mac_cell_group_configP,
+    NR_PhysicalCellGroupConfig_t    *phy_cell_group_configP,
+    NR_SpCellConfig_t               *spcell_configP ){
 
-    NR_UE_MAC_INST *mac = get_mac_inst(Mod_idP);
+    NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
 
-    ServingCellConfig_t *serving_cell_config = spcell_config->spCellConfigDedicated;
+//    NR_ServingCellConfig_t *serving_cell_config = spcell_configP->spCellConfigDedicated;
 //  TODO do something FAPI-like P5 L1/L2 config interface in config_si, config_mib, etc.
 
-    if(mac_cell_group_config != (MAC_CellGroupConfig_t *)0){
-        if(mac_cell_group_config->drx_Config != (drx_Config_t *)0 ){
-            mac->drx_Config = mac_cell_group_config->drx_Config;
+    if(mibP != NULL){
+        ;
+    }
+
+    if(mac_cell_group_configP != NULL){
+        if(mac_cell_group_configP->drx_Config != NULL ){
+            mac->drx_Config = mac_cell_group_configP->drx_Config;
         }
 
-        if(mac_cell_group_config->SchedulingRequestConfig != (SchedulingRequestConfig_t *)0 ){
-            mac->SchedulingRequestConfig = mac_cell_group_config->SchedulingRequestConfig;
+        if(mac_cell_group_configP->schedulingRequestConfig != NULL ){
+            mac->schedulingRequestConfig = mac_cell_group_configP->schedulingRequestConfig;
         }
 
-        if(mac_cell_group_config->BSR_Config != (BSR_Config_t *)0 ){
-            mac->BSR_Config = mac_cell_group_config->BSR_Config;
+        if(mac_cell_group_configP->bsr_Config != NULL ){
+            mac->bsr_Config = mac_cell_group_configP->bsr_Config;
         }
 
-        if(mac_cell_group_config->TAG_Config != (TAG_Config_t *)0 ){
-            mac->TAG_Config = mac_cell_group_config->TAG_Config;
+        if(mac_cell_group_configP->tag_Config != NULL ){
+            mac->tag_Config = mac_cell_group_configP->tag_Config;
         }
 
-        if(mac_cell_group_config->phr_Config != (phr_Config_t *)0 ){
-            mac->phr_Config = mac_cell_group_config->phr_Config;
+        if(mac_cell_group_configP->phr_Config != NULL ){
+            mac->phr_Config = mac_cell_group_configP->phr_Config;
         }
 
-        if(mac_cell_group_config->cs_RNTI != (cs_RNTI_t *)0 ){
-            mac->cs_RNTI = mac_cell_group_config->cs_RNTI;
+        if(mac_cell_group_configP->cs_RNTI != NULL ){
+            mac->cs_RNTI = mac_cell_group_configP->cs_RNTI;
         }
     }
     
-    if(phy_cell_group_config != (PhysicalCellGroupConfig_t *)0){
-        config_phy(phy_cell_group_config, NULL);
+    if(phy_cell_group_configP != NULL ){
+        //config_phy(phy_cell_group_config, NULL);
     }
 
-    if(serving_cell_config_config != (SpCellConfig_t *)0){
-        config_phy(NULL, spcell_config);
+//  TODO check
+#if 0
+    if(serving_cell_config_configP != NULL ){
+        //config_phy(NULL, spcell_config);
         mac->servCellIndex = spcell_config->servCellIndex;
     }
 
 
-    if(serving_cell_config != (spCellConfigDedicated_t *)0){
-        if(serving_cell_config->tdd_UL_DL_ConfigurationDedicated != (TDD_UL_DL_ConfigDedicated_t *)0){
+    if(serving_cell_config != NULL ){
+        if(serving_cell_config->tdd_UL_DL_ConfigurationDedicated != NULL ){
             mac->tdd_UL_DL_ConfigurationDedicated = serving_cell_config->tdd_UL_DL_ConfigurationDedicated;
         }
         
-        if(spcell_config->initialDownlinkBWP != (BWP_DownlinkDedicated_t *)0){
+        if(spcell_config->initialDownlinkBWP != NULL ){
             mac->init_DL_BWP = spcell_config->initialDownlinkBWP;
         }
         
         //  storage list of DL BWP config. TODO should be modify to maintain(add/release) a list inside MAC instance, this implementation just use for one-shot RRC configuration setting.
-        if(spcell_config->downlinkBWP_ToAddModList != (struct ServingCellConfig__downlinkBWP_ToAddModList *)0){
+        if(spcell_config->downlinkBWP_ToAddModList != NULL ){
             mac->BWP_Downlink_list = spcell_config->downlinkBWP_ToAddModList->list;
             mac->BWP_Downlink_count = spcell_config->downlinkBWP_ToAddModList->count;
         }
         
-        if(spcell_config->bwp_InactivityTimer != (long *)0){
+        if(spcell_config->bwp_InactivityTimer != NULL ){
             mac->bwp_InactivityTimer = spcell_config->bwp_InactivityTimer;
         } 
 
-        if(spcell_config->defaultDownlinkBWP_Id != (BWP_Id_t *)0){
+        if(spcell_config->defaultDownlinkBWP_Id != NULL ){
             mac->defaultDownlinkBWP_Id = spcell_config->defaultDownlinkBWP_Id;
         }
 
-        if(spcell_config->pdsch_ServingCellConfig != (PDSCH_ServingCellConfig_t *)0){
+        if(spcell_config->pdsch_ServingCellConfig != NULL ){
             mac->pdsch_ServingCellConfig = spcell_config->pdsch_ServingCellConfig;
         }
 
-        if(spcell_config->csi_MeasConfig != (CSI_MeasConfig_t *)0){
+        if(spcell_config->csi_MeasConfig != NULL ){
             mac->csi_MeasConfig = spcell_config->csi_MeasConfig;
         }
 
         spcell_config->tag_Id = spcell_config.tag_Id;
     }
-
+#endif
     //scell config not yet
 
-
-
-
-
-
-
-    return (0);
-}
+    return 0;
+}
\ No newline at end of file

openair2/LAYER2/NR_MAC_UE/defs.h

@@ -34,8 +34,8 @@
 
 /*@}*/
 
-#ifndef __LAYER2_MAC_DEFS_H__
-#define __LAYER2_MAC_DEFS_H__
+#ifndef __LAYER2_NR_MAC_DEFS_H__
+#define __LAYER2_NR_MAC_DEFS_H__
 
 
 
@@ -43,66 +43,37 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "PHY/defs.h"
-#include "PHY/LTE_TRANSPORT/defs.h"
-#include "COMMON/platform_constants.h"
-#include "BCCH-BCH-Message.h"
-#include "RadioResourceConfigCommon.h"
-#include "RadioResourceConfigDedicated.h"
-#include "MeasGapConfig.h"
-#include "SchedulingInfoList.h"
-#include "TDD-Config.h"
-#include "RACH-ConfigCommon.h"
-#include "MeasObjectToAddModList.h"
-#include "MobilityControlInfo.h"
-#if defined(Rel10) || defined(Rel14)
-#include "MBSFN-AreaInfoList-r9.h"
-#include "MBSFN-SubframeConfigList.h"
-#include "PMCH-InfoList-r9.h"
-#include "SCellToAddMod-r10.h"
-#endif
-#ifdef Rel14
-#include "SystemInformationBlockType1-v1310-IEs.h"
-#endif
+#include "platform_types.h"
 
-#include "nfapi_interface.h"
-#include "PHY_INTERFACE/IF_Module.h"
+#include "NR_DRX-Config.h"
+#include "NR_SchedulingRequestConfig.h"
+#include "NR_BSR-Config.h"
+#include "NR_TAG-Config.h"
+#include "NR_PHR-Config.h"
+#include "NR_RNTI-Value.h"
 
+#include "NR_MIB.h"
+#include "NR_MAC-CellGroupConfig.h"
+#include "NR_PhysicalCellGroupConfig.h"
+#include "NR_SpCellConfig.h"
+
+#include "NR_ServingCellConfig.h"
+
+#define NB_NR_UE_MAC_INST 1
 
 /*!\brief Top level UE MAC structure */
 typedef struct {
     
     ////  MAC config
-    drx_Config_t *drx_config;
-    SchedulingRequestConfig_t *SchedulingRequestConfig;
-    BSR_Config_t *BSR_Config;
-    TAG_Config_t *TAG_Config;
-    phr_Config_t *phr_Config;
-    cs_RNTI_t *cs_RNTI;
-    ServCellIndex_t *servCellIndex;
+    NR_DRX_Config_t    *drx_Config;    /* OPTIONAL */
+    NR_SchedulingRequestConfig_t   *schedulingRequestConfig;   /* OPTIONAL */
+    NR_BSR_Config_t    *bsr_Config;    /* OPTIONAL */
+    NR_TAG_Config_t    *tag_Config;    /* OPTIONAL */
+    NR_PHR_Config_t    *phr_Config;    /* OPTIONAL */
+    
+    NR_RNTI_Value_t *cs_RNTI;   /* OPTIONAL */
 
-    ////  Serving cell config
-    TDD_UL_DL_ConfigDedicated_t *tdd_UL_DL_ConfigurationDedicated;
-    //  init DL BWP
-    BWP_DownlinkDedicated_t *init_DL_BWP;
-    //  DL BWP list, not default one
-    BWP_Downlink_t **BWP_Downlink_list;
-    int BWP_Downlink_count;
-    //BWP_Id_t *firstActiveDownlinkBWP_Id;
-    long *bwp_InactivityTimer;
-    BWP_Id_t *defaultDownlinkBWP_Id;
-    //struct UplinkConfig *uplinkConfig;
-    //struct UplinkConfig *supplementaryUplink;
-    PDSCH_ServingCellConfig_t *pdsch_ServingCellConfig;
-    CSI_MeasConfig_t *csi_MeasConfig;
-    //SRS_CarrierSwitching_t *carrierSwitching;
-    //long *sCellDeactivationTimer /* OPTIONAL */;
-    //struct CrossCarrierSchedulingConfig *crossCarrierSchedulingConfig   /* OPTIONAL */;
-    TAG_Id_t tag_Id;
-    //long *ue_BeamLockFunction    /* OPTIONAL */;
-    //long *pathlossReferenceLinking   /* OPTIONAL */;    
+} NR_UE_MAC_INST_t;
 
-} UE_MAC_INST;
-#include "proto.h"
 /*@}*/
 #endif /*__LAYER2_MAC_DEFS_H__ */

openair2/LAYER2/NR_MAC_UE/extern.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 extern.h
+* \brief mac externs
+* \author  Navid Nikaein and Raymond Knopp
+* \date 2010 - 2014
+* \version 1.0
+* \email navid.nikaein@eurecom.fr
+* @ingroup _mac
+
+*/
+
+#ifndef __MAC_EXTERN_H__
+#define __MAC_EXTERN_H__
+
+
+#ifdef USER_MODE
+//#include "stdio.h"
+#endif //USER_MODE
+//#include "PHY/defs.h"
+#include "PHY/defs_nr_UE.h"
+#include "defs.h"
+#include "COMMON/mac_rrc_primitives.h"
+#ifdef PHY_EMUL
+//#include "SIMULATION/simulation_defs.h"
+#endif //PHY_EMUL
+//#include "PHY_INTERFACE/defs.h"
+//#include "RRC/LITE/defs.h"
+
+extern const uint32_t BSR_TABLE[BSR_TABLE_SIZE];
+//extern uint32_t EBSR_Level[63];
+extern const uint32_t Extended_BSR_TABLE[BSR_TABLE_SIZE];
+//extern uint32_t Extended_BSR_TABLE[63];  ----currently not used 
+
+extern const uint8_t cqi2fmt0_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
+
+extern const uint8_t cqi2fmt1x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
+
+extern const uint8_t cqi2fmt2x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
+
+extern UE_MAC_INST *UE_mac_inst;
+extern eNB_MAC_INST *eNB_mac_inst;
+extern eNB_RRC_INST *eNB_rrc_inst;
+extern UE_RRC_INST *UE_rrc_inst;
+extern UE_MAC_INST *ue_mac_inst;
+extern MAC_RLC_XFACE *Mac_rlc_xface;
+extern uint8_t Is_rrc_registered;
+
+extern eNB_ULSCH_INFO eNB_ulsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX]; // eNBxUE = 8x8
+extern eNB_DLSCH_INFO eNB_dlsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX]; // eNBxUE = 8x8
+
+
+
+//#ifndef USER_MODE
+//extern MAC_xface *mac_xface;
+extern RRC_XFACE *Rrc_xface;
+
+extern uint8_t Is_rrc_registered;
+
+#ifndef PHY_EMUL
+#ifndef PHYSIM
+#define NB_INST 1
+#else
+extern unsigned char NB_INST;
+#endif
+extern unsigned char NB_eNB_INST;
+extern unsigned char NB_UE_INST;
+extern unsigned char NB_RN_INST;
+extern unsigned short NODE_ID[1];
+extern void* bigphys_malloc(int);
+#else
+extern EMULATION_VARS *Emul_vars;
+#endif //PHY_EMUL
+
+
+extern int cqi_to_mcs[16];
+
+extern uint32_t RRC_CONNECTION_FLAG;
+
+extern uint8_t rb_table[33];
+
+extern DCI0_5MHz_TDD_1_6_t       UL_alloc_pdu;
+
+extern DCI1A_5MHz_TDD_1_6_t      RA_alloc_pdu;
+extern DCI1A_5MHz_TDD_1_6_t      DLSCH_alloc_pdu1A;
+extern DCI1A_5MHz_TDD_1_6_t      BCCH_alloc_pdu;
+
+extern DCI1A_5MHz_TDD_1_6_t      CCCH_alloc_pdu;
+extern DCI1_5MHz_TDD_t           DLSCH_alloc_pdu;
+
+extern DCI0_5MHz_FDD_t       UL_alloc_pdu_fdd;
+
+extern DCI1A_5MHz_FDD_t      DLSCH_alloc_pdu1A_fdd;
+extern DCI1A_5MHz_FDD_t      RA_alloc_pdu_fdd;
+extern DCI1A_5MHz_FDD_t      BCCH_alloc_pdu_fdd;
+
+extern DCI1A_5MHz_FDD_t      CCCH_alloc_pdu_fdd;
+extern DCI1_5MHz_FDD_t       DLSCH_alloc_pdu_fdd;
+
+extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu1;
+extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu2;
+extern DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu1E;
+
+#endif //DEF_H
+
+

openair2/LAYER2/NR_MAC_UE/mac.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 LAYER2/MAC/defs.h
+* \brief MAC data structures, constant, and function prototype
+* \author Navid Nikaein and Raymond Knopp
+* \date 2011
+* \version 0.5
+* \email navid.nikaein@eurecom.fr
+
+*/
+/** @defgroup _oai2  openair2 Reference Implementation
+ * @ingroup _ref_implementation_
+ * @{
+ */
+
+/*@}*/
+
+#ifndef __LAYER2_MAC_DEFS_H__
+#define __LAYER2_MAC_DEFS_H__
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "COMMON/platform_constants.h"
+#include "BCCH-BCH-Message.h"
+#include "RadioResourceConfigCommon.h"
+#include "RadioResourceConfigCommonSIB.h"
+#include "RadioResourceConfigDedicated.h"
+#include "MeasGapConfig.h"
+#include "SchedulingInfoList.h"
+#include "TDD-Config.h"
+#include "RACH-ConfigCommon.h"
+#include "MeasObjectToAddModList.h"
+#include "MobilityControlInfo.h"
+#if defined(Rel10) || defined(Rel14)
+#include "MBSFN-AreaInfoList-r9.h"
+#include "MBSFN-SubframeConfigList.h"
+#include "PMCH-InfoList-r9.h"
+#include "SCellToAddMod-r10.h"
+#endif
+#ifdef Rel14
+#include "SystemInformationBlockType1-v1310-IEs.h"
+#endif
+
+#include "nfapi_interface.h"
+#include "PHY_INTERFACE/IF_Module.h"
+
+#include "PHY/TOOLS/time_meas.h"
+
+#include "PHY/defs_common.h" // for PRACH_RESOURCES_t
+
+#include "targets/ARCH/COMMON/common_lib.h"
+
+//solve implicit declaration
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
+
+/** @defgroup _mac  MAC
+ * @ingroup _oai2
+ * @{
+ */
+
+/*!\brief Values of BCCH logical channel (fake)*/
+#define NR_BCCH_DL_SCH 3			// SI
+
+/*!\brief Values of PCCH logical channel (fake) */
+#define NR_BCCH_BCH 5			// MIB
+/*@}*/
+#endif /*__LAYER2_MAC_DEFS_H__ */

openair2/LAYER2/NR_MAC_UE/vars.c → openair2/LAYER2/NR_MAC_UE/mac_vars.c

@@ -29,6 +29,8 @@
 
 */
 
-UE_MAC_INST_t UE_mac_inst;	//[NB_MODULE_MAX];
+#include "defs.h"
+
+NR_UE_MAC_INST_t UE_mac_inst;	//[NB_MODULE_MAX];
 
 

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -31,17 +31,15 @@
 
 #include "defs.h"
 #include "proto.h"
-#include "extern.h"
-#include "assertions.h"
 
 static NR_UE_MAC_INST_t *nr_ue_mac_inst; 
 
 int
 nr_l2_init_ue(void)
 {
-    LOG_I(MAC, "[MAIN] MAC_INIT_GLOBAL_PARAM IN...\n");
+    //LOG_I(MAC, "[MAIN] MAC_INIT_GLOBAL_PARAM IN...\n");
 
-    LOG_I(MAC, "[MAIN] init UE MAC functions \n");
+    //LOG_I(MAC, "[MAIN] init UE MAC functions \n");
     
     //init mac here
     nr_ue_mac_inst = (NR_UE_MAC_INST_t *)malloc(sizeof(NR_UE_MAC_INST_t)*NB_NR_UE_MAC_INST);
@@ -50,6 +48,6 @@ nr_l2_init_ue(void)
     return (1);
 }
 
-NR_UE_MAC_INST_t *get_mac_inst(Module_id_t Mod_idP){
+NR_UE_MAC_INST_t *get_mac_inst(module_id_t Mod_idP){
     return &nr_ue_mac_inst[(int)Mod_idP];
 }

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

+/*
+ * 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 ue_procedures.c
+ * \brief procedures related to UE
+ * \author  Navid Nikaein and Raymond Knopp
+ * \date 2010 - 2014
+ * \version 1
+ * \email: navid.nikaein@eurecom.fr
+ * @ingroup _mac
+
+ */
+#include "proto.h"
+#include "RRC/NR_UE/rrc_proto.h"
+
+void
+nr_ue_decode_mib(
+	module_id_t module_id,
+	int 		CC_id,
+	uint8_t 	gNB_index,
+	uint8_t 	extra_bits,
+	uint32_t 	ssb_index,
+	uint32_t 	*frameP,
+	void 		*pduP,
+	uint16_t 	pdu_len){
+
+    nr_mac_rrc_data_ind_ue( module_id, CC_id, gNB_index, frameP,
+		     NR_BCCH_BCH, (uint8_t *) pduP, pdu_len );
+    
+    //	frame calculation
+}

openair2/RRC/NR_UE/main_ue.c

 
 
 #include "defs.h"
-#include "proto.h"
-#include "extern.h"
-#include "assertions.h"
-
-
-
-
+#include "rrc_proto.h"
 
 int nr_l3_init_ue(void){
     LOG_I(RRC, "[MAIN] NR UE MAC initialization...\n");

openair2/RRC/NR_UE/vars.h → openair2/RRC/NR_UE/rrc_vars.h

@@ -32,10 +32,8 @@
 #ifndef __OPENAIR_NR_RRC_VARS_H__
 #define __OPENAIR_NR_RRC_VARS_H__
 
-#include "defs.h"
-#include "LAYER2/RLC/rlc.h"
-#include "COMMON/mac_rrc_primitives.h"
-#include "LAYER2/MAC/defs.h"
+#include "rrc_defs.h"
 
 NR_UE_RRC_INST_t *NR_UE_rrc_inst;
+
 #endif