Remove basic simulator

The basic simulator can be replaced with the RF simulator. Use option --rfsim.

Remove basic simulator
The basic simulator can be replaced with the RF simulator. Use option --rfsim.
57cfd7bc · Robert Schmidt · 5be18253 · 57cfd7bc · 57cfd7bc · 57cfd7bc
Commit 57cfd7bc authored Mar 17, 2022 by Robert Schmidt
50 changed files
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -159,16 +159,6 @@ pipeline {
            }
        }
-        stage ("Start VM -- basic-sim") {
-            steps {
-              lock (vmResource) {
-                timeout (time: 5, unit: 'MINUTES') {
-                    sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --daemon"
-                }
-              }
-            }
-        }
        stage ("Start VM -- gnb-usrp") {
            steps {
              lock (vmResource) {
@@ -211,15 +201,6 @@ pipeline {
        stage ("Variant Builds") {
            parallel {
-                stage ("Build basic simulator") {
-                    steps {
-                        gitlabCommitStatus(name: "Build basic-sim") {
-                            timeout (time: 45, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
-                            }
-                        }
-                    }
-                }
                stage ("Build 5G gNB-USRP") {
                    steps {
                        gitlabCommitStatus(name: "Build gNB-USRP") {
@@ -270,9 +251,9 @@ pipeline {
                    script {
                        dir ('archives') {
                            if (fileExists('red_hat')) {
-                                sh "zip -r -qq vm_build_logs.zip basic_sim enb_eth ue_eth gnb_usrp nr_ue_usrp red_hat"
+                                sh "zip -r -qq vm_build_logs.zip enb_eth ue_eth gnb_usrp nr_ue_usrp red_hat"
                            } else {
-                                sh "zip -r -qq vm_build_logs.zip basic_sim enb_eth ue_eth gnb_usrp nr_ue_usrp"
+                                sh "zip -r -qq vm_build_logs.zip enb_eth ue_eth gnb_usrp nr_ue_usrp"
                            }
                        }
                        if(fileExists('archives/vm_build_logs.zip')) {
@@ -324,26 +305,6 @@ pipeline {
                              }
                            }
                        }
-                        stage ("Test basic simulator") {
-                            when {
-                                expression {doMandatoryTests}
-                            }
-                            steps {
-                              lock (vmResource) {
-                                script {
-                                    timeout (time: 30, unit: 'MINUTES') {
-                                        try {
-                                            gitlabCommitStatus(name: "Test basic-sim") {
-                                                sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
-                                            }
-                                        } catch (Exception e) {
-                                          currentBuild.result = 'FAILURE'
-                                        }
-                                    }
-                                }
-                              }
-                            }
-                        }
                        stage ("Test L1 simulator") {
                            when {
                                expression {doMandatoryTests}
@@ -581,7 +542,7 @@ pipeline {
                    script {
                      if (doMandatoryTests) {
                        dir ('archives') {
-                            sh "if [ -d basic_sim/test ] || [ -d rf_sim/test ] || [ -d l2_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
+                            sh "if [ -d rf_sim/test ] || [ -d l2_sim/test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
                        }
                        if(fileExists('archives/vm_tests_logs.zip')) {
                            archiveArtifacts artifacts: 'archives/vm_tests_logs.zip'

--- a/ci-scripts/doc/vm_based_simulator_build.md
+++ b/ci-scripts/doc/vm_based_simulator_build.md
@@ -52,7 +52,6 @@ Options:
 --------
 # OpenAirInterface Build Variants
    --variant enb-usrp        OR -v1     ( build and test  )
-    --variant basic-sim       OR -v2     ( build and test  )
    --variant phy-sim         OR -v3     ( build and test  )
    --variant cppcheck        OR -v4     ( build and test  )
    --variant gnb-usrp        OR -v5     ( build and test  )

--- a/ci-scripts/doc/vm_based_simulator_create.md
+++ b/ci-scripts/doc/vm_based_simulator_create.md
@@ -45,7 +45,6 @@ Mandatory Options:
 # OpenAirInterface Build Variants
    --variant enb-usrp        OR -v1     ( build and test  )
-    --variant basic-sim       OR -v2     ( build and test  )
    --variant phy-sim         OR -v3     ( build and test  )
    --variant cppcheck        OR -v4     ( build and test  )
    --variant gnb-usrp        OR -v5     ( build and test  )

--- a/ci-scripts/doc/vm_based_simulator_main_scripts.md
+++ b/ci-scripts/doc/vm_based_simulator_main_scripts.md
@@ -109,12 +109,6 @@ You can get the list of variant specific variables specifying the variant argume
               NB_PATTERN_FILES=9               BUILD_OPTIONS=""             
               LOG_PATTERN=.Rel15.txt     
-    --variant basic-sim       OR -v2     ( build and test  )
-               VM_NAME=ci-basic-sim             ARCHIVES_LOC=basic_sim      
-               VM_MEMORY=8192                   VM_CPU=4              
-               NB_PATTERN_FILES=13              BUILD_OPTIONS="--eNB --UE"   
-               LOG_PATTERN=.Rel15.txt     
    --variant phy-sim         OR -v3     ( build and test  )
               VM_NAME=ci-phy-sim               ARCHIVES_LOC=phy_sim        
               VM_MEMORY=2048                   VM_CPU=4              

--- a/ci-scripts/doc/vm_based_simulator_test.md
+++ b/ci-scripts/doc/vm_based_simulator_test.md
@@ -18,16 +18,14 @@
 2.  [Detailed Description](#2-detailed-description)
 3.  [Typical Usage](#3-typical-usage)
    1.  [Testing the physical simulators](#31-testing-the-physicals-simulators)
-    2.  [Testing the basic simulator](#32-testing-the-basic-simulator)
+    2.  [Testing the RF simulator](#33-testing-the-rf-simulator)
-    3.  [Testing the RF simulator](#33-testing-the-rf-simulator)
+    3.  [Testing the L2-nFAPI simulator](#33-testing-the-l2-nfapi-simulator)
-    4.  [Testing the L2-nFAPI simulator](#33-testing-the-l2-nfapi-simulator)
 # 1. Introduction #
-Currently 2 build variants can be directly tested:
+Currently 1 build variant can be directly tested:
 *  Physical Simulators
-*  Basic Simulator
 In addition, 2 build variants are used:
@@ -73,7 +71,6 @@ Options:
 # OpenAirInterface Build Variants
    --variant enb-usrp        OR -v1     ( build and test  )
-    --variant basic-sim       OR -v2     ( build and test  )
    --variant phy-sim         OR -v3     ( build and test  )
    --variant cppcheck        OR -v4     ( build and test  )
    --variant gnb-usrp        OR -v5     ( build and test  )
@@ -143,64 +140,7 @@ $ ./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-dev
 Note that the VM instance is destroyed. You do that when you are sure your test is passing.
-## 3.2. Testing the basic simulator ##
+## 3.2. Test the RF simulator ##
-```bash
-$ ./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-develop --variant basic-sim --job-name RAN-CI-develop --build-id 48
-15:11:13  ############################################################
-15:11:13  OAI CI VM script
-15:11:13  ############################################################
-15:11:13  VM_NAME             = RAN-CI-develop-b48-basic-sim
-15:11:13  VM_CMD_FILE         = RAN-CI-develop-b48-basic-sim_cmds.txt
-15:11:13  JENKINS_WKSP        = /var/jenkins/workspace/RAN-CI-develop
-15:11:13  ARCHIVES_LOC        = /var/jenkins/workspace/RAN-CI-develop/archives/basic_sim/test
-15:11:13  ############################################################
-15:11:13  Waiting for VM to be started
-15:11:13  ############################################################
-15:11:14  Warning: Permanently added '192.168.122.29' (ECDSA) to the list of known hosts.
-15:11:15  RAN-CI-develop-b48-basic-sim has for IP addr = 192.168.122.29
-15:11:15  ############################################################
-15:11:15  Test EPC on VM (RAN-CI-develop-b48-epc) will be using ltebox
-15:11:15  ############################################################
-15:11:15  EPC_VM_CMD_FILE     = RAN-CI-develop-b48-epc_cmds.txt
-15:11:15  ############################################################
-15:11:15  Creating test EPC VM (RAN-CI-develop-b48-epc) on Ubuntu Cloud Image base
-15:11:15  ############################################################
-15:11:18  Waiting for VM to be started
-15:13:25  Warning: Permanently added '192.168.122.156' (ECDSA) to the list of known hosts.
-15:13:25  RAN-CI-develop-b48-epc has for IP addr = 192.168.122.156
-15:13:25  Warning: Permanently added '192.168.122.156' (ECDSA) to the list of known hosts.
-15:13:25  ls: cannot access '/opt/ltebox/tools/start_ltebox': No such file or directory
-15:13:25  ############################################################
-15:13:25  Copying ltebox archives into EPC VM (RAN-CI-develop-b48-epc)
-15:13:25  ############################################################
-15:13:25  ############################################################
-15:13:25  Install EPC on EPC VM (RAN-CI-develop-b48-epc)
-15:13:25  ############################################################
-....
-15:24:39  ############################################################
-15:24:39  Terminate EPC
-15:24:39  ############################################################
-15:24:39  cd /opt/ltebox/tools
-15:24:39  sudo ./stop_ltebox
-15:24:40  sudo daemon --name=simulated_hss --stop
-15:24:40  sudo killall --signal SIGKILL hss_sim
-15:24:40  ############################################################
-15:24:40  Destroying VMs
-15:24:40  ############################################################
-15:24:41  # Host 192.168.122.29 found: line 18
-15:24:41  /home/eurecom/.ssh/known_hosts updated.
-15:24:41  Original contents retained as /home/eurecom/.ssh/known_hosts.old
-15:24:43  # Host 192.168.122.60 found: line 20
-15:24:43  /home/eurecom/.ssh/known_hosts updated.
-15:24:43  Original contents retained as /home/eurecom/.ssh/known_hosts.old
-15:24:43  ############################################################
-15:24:43  Checking run status
-15:24:43  ############################################################
-15:24:43  STATUS seems OK
-```
-## 3.3. Test the RF simulator ##
 ```bash
 ./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-develop --variant rf-sim --job-name RAN-CI-develop --build-id 48 --keep-vm-alive
@@ -209,7 +149,7 @@ $ ./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-dev
 15:24:45  STATUS seems OK
 ```
-## 3.4. Testing the L2-nFAPI simulator
+## 3.3. Testing the L2-nFAPI simulator
 ```bash
 ./ci-scripts/oai-ci-vm-tool test --workspace /var/jenkins/workspace/RAN-CI-develop --variant l2-sim --job-name RAN-CI-develop --build-id 48

--- a/ci-scripts/oai-ci-vm-tool
+++ b/ci-scripts/oai-ci-vm-tool
@@ -175,13 +175,6 @@ function variant__v1__enb_usrp {
    VM_MEMORY=3072
 }
-function variant__v2__basic_sim {
-    NB_PATTERN_FILES=11
-    BUILD_OPTIONS="--eNB --UE"
-    VM_MEMORY=8192
-    RUN_OPTIONS="complex"
-}
 function variant__v3__phy_sim {
    NB_PATTERN_FILES=11
    BUILD_OPTIONS="--phy_simulators"

--- a/ci-scripts/reportBuildLocally.sh
+++ b/ci-scripts/reportBuildLocally.sh
@@ -574,7 +574,6 @@ function report_build {
    summary_table_row "OAI ETHERNET transport - Release 15" ./archives/enb_eth/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./enb_eth_row3.html
    summary_table_row "Parameters Lib Config - Release 15" ./archives/enb_eth/params_libconfig.Rel15.txt "Built target params_libconfig" ./enb_eth_row4.html
    summary_table_row "RF Simulator - Release 15" ./archives/enb_eth/rfsimulator.Rel15.txt "Built target rfsimulator" ./enb_eth_row5.html
-    summary_table_row "TCP OAI Bridge - Release 15" ./archives/enb_eth/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./enb_eth_row6.html
    summary_table_row "OAI USRP device if - Release 15" ./archives/enb_eth/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./enb_eth_row7.html
    summary_table_footer
@@ -584,7 +583,6 @@ function report_build {
    summary_table_row "OAI ETHERNET transport - Release 15" ./archives/ue_eth/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./ue_eth_row3.html
    summary_table_row "Parameters Lib Config - Release 15" ./archives/ue_eth/params_libconfig.Rel15.txt "Built target params_libconfig" ./ue_eth_row4.html
    summary_table_row "RF Simulator - Release 15" ./archives/ue_eth/rfsimulator.Rel15.txt "Built target rfsimulator" ./ue_eth_row5.html
-    summary_table_row "TCP OAI Bridge - Release 15" ./archives/ue_eth/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./ue_eth_row6.html
    summary_table_row "Conf 2 UE Data - Release 15" ./archives/ue_eth/conf2uedata.Rel15.txt "Built target conf2uedata" ./ue_eth_row7.html
    summary_table_row "NVRAM - Release 15" ./archives/ue_eth/nvram.Rel15.txt "Built target nvram" ./ue_eth_row8.html
    summary_table_row "UE IP - Release 15" ./archives/ue_eth/ue_ip.Rel15.txt "Built target ue_ip" ./ue_eth_row9.html
@@ -592,20 +590,6 @@ function report_build {
    summary_table_row "OAI USRP device if - Release 15" ./archives/ue_eth/oai_usrpdevif.Rel15.txt "Built target oai_usrpdevif" ./ue_eth_row9b.html
    summary_table_footer
-    summary_table_header "OAI Build: 4G LTE basic simulator option" ./archives/basic_sim
-    summary_table_row "LTE SoftModem - Release 15" ./archives/basic_sim/lte-softmodem.Rel15.txt "Built target lte-softmodem" ./basic_sim_row1.html
-    summary_table_row "LTE UE SoftModem - Release 15" ./archives/basic_sim/lte-uesoftmodem.Rel15.txt "Built target lte-uesoftmodem" ./basic_sim_row2.htm
-    summary_table_row "Coding - Release 15" ./archives/basic_sim/coding.Rel15.txt "Built target coding" ./basic_sim_row3.html
-    summary_table_row "Conf 2 UE data - Release 15" ./archives/basic_sim/conf2uedata.Rel15.txt "Built target conf2uedata" ./basic_sim_row4.html
-    summary_table_row "OAI ETHERNET transport - Release 15" ./archives/basic_sim/oai_eth_transpro.Rel15.txt "Built target oai_eth_transpro" ./basic_sim_row5.html
-    summary_table_row "Parameters Lib Config - Release 15" ./archives/basic_sim/params_libconfig.Rel15.txt "Built target params_libconfig" ./basic_sim_row7.html
-    summary_table_row "RF Simulator - Release 15" ./archives/basic_sim/rfsimulator.Rel15.txt "Built target rfsimulator" ./basic_sim_row9.html
-    summary_table_row "TCP Bridge - Release 15" ./archives/basic_sim/tcp_bridge_oai.Rel15.txt "Built target tcp_bridge_oai" ./basic_sim_row10.html
-    summary_table_row "UE IP - Release 15" ./archives/basic_sim/ue_ip.Rel15.txt "Built target ue_ip" ./basic_sim_row11.html
-    summary_table_row "USIM - Release 15" ./archives/basic_sim/usim.Rel15.txt "Built target usim" ./basic_sim_row12.html
-    summary_table_row "NVRAM - Release 15" ./archives/basic_sim/nvram.Rel15.txt "Built target nvram" ./basic_sim_row13.html
-    summary_table_footer
    if [ -f archives/gnb_usrp/nr-softmodem.Rel15.txt ]
    then
        summary_table_header "OAI Build: 5G NR gNB -- USRP option" ./archives/gnb_usrp
@@ -658,13 +642,6 @@ function report_build {
            cat $DETAILS_TABLE >> ./build_results.html
        done
    fi
-    if [ -f ./basic_sim_row1.html ] || [ -f ./basic_sim_row2.html ] || [ -f ./basic_sim_row3.html ] || [ -f ./basic_sim_row4.html ] || [ -f ./basic_sim_row5.html ]
-    then
-        for DETAILS_TABLE in `ls ./basic_sim_row*.html`
-        do
-            cat $DETAILS_TABLE >> ./build_results.html
-        done
-    fi
    if [ -f ./gnb_usrp_row1.html ] || [ -f ./gnb_usrp_row2.html ] || [ -f ./gnb_usrp_row3.html ] || [ -f ./gnb_usrp_row4.html ]
    then 
        for DETAILS_TABLE in `ls ./gnb_usrp_row*.html`

--- a/ci-scripts/reportTestLocally.sh
+++ b/ci-scripts/reportTestLocally.sh
@@ -250,156 +250,6 @@ function report_test {
    echo "   </table>" >> ./test_simulator_results.html
    echo "   <h2>Test Summary</h2>" >> ./test_simulator_results.html
-    ARCHIVES_LOC=archives/basic_sim/test
-    if [ -d $ARCHIVES_LOC ]
-    then
-        echo "   <h3>4G LTE Basic Simulator Check</h3>" >> ./test_simulator_results.html
-        if [ -f $ARCHIVES_LOC/test_final_status.log ]
-        then
-            if [ `grep -c TEST_OK $ARCHIVES_LOC/test_final_status.log` -eq 1 ]
-            then
-                echo "   <div class=\"alert alert-success\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            else
-                echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-                echo "      <strong>TEST was a FAILURE! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-                echo "   </div>" >> ./test_simulator_results.html
-            fi
-        else
-            echo "   <div class=\"alert alert-danger\">" >> ./test_simulator_results.html
-            echo "      <strong>COULD NOT DETERMINE TEST FINAL STATUS! <span class=\"glyphicon glyphicon-ban-circle\"></span></strong>" >> ./test_simulator_results.html
-            echo "   </div>" >> ./test_simulator_results.html
-        fi
-        echo "   <button data-toggle=\"collapse\" data-target=\"#oai-basic-sim-test-details\">More details on Basic Simulator test results</button>" >> ./test_simulator_results.html
-        echo "   <div id=\"oai-basic-sim-test-details\" class=\"collapse\">" >> ./test_simulator_results.html
-        echo "   <table border = \"1\">" >> ./test_simulator_results.html
-        echo "      <tr bgcolor = \"#33CCFF\" >" >> ./test_simulator_results.html
-        echo "        <th>Log File Name</th>" >> ./test_simulator_results.html
-        echo "        <th>Command</th>" >> ./test_simulator_results.html
-        echo "        <th>Status</th>" >> ./test_simulator_results.html
-        echo "        <th>Statistics</th>" >> ./test_simulator_results.html
-        echo "      </tr>" >> ./test_simulator_results.html
-        TRANS_MODES=("fdd" "tdd")
-        BW_CASES=(05 10 20)
-        for TMODE in ${TRANS_MODES[@]}
-        do
-            echo "      <tr bgcolor = \"#8FBC8F\" >" >> ./test_simulator_results.html
-            if [[ $TMODE =~ .*fdd.* ]]
-            then
-                echo "          <td align = \"center\" colspan = 4 >Test in FDD</td>" >> ./test_simulator_results.html
-            else
-                echo "          <td align = \"center\" colspan = 4 >Test in TDD</td>" >> ./test_simulator_results.html
-            fi
-            echo "      </tr>" >> ./test_simulator_results.html
-            for BW in ${BW_CASES[@]}
-            do
-                ENB_LOG=$ARCHIVES_LOC/${TMODE}_${BW}MHz_enb.log
-                UE_LOG=`echo $ENB_LOG | sed -e "s#enb#ue#"`
-                if [ -f $ENB_LOG ] && [ -f $UE_LOG ]
-                then
-                    NAME_ENB=`echo $ENB_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    NAME_UE=`echo $UE_LOG | sed -e "s#$ARCHIVES_LOC/##"`
-                    echo "      <tr>" >> ./test_simulator_results.html
-                    echo "        <td>$NAME_ENB --- $NAME_UE</td>" >> ./test_simulator_results.html
-                    echo "        <td>N/A</td>" >> ./test_simulator_results.html
-                    NB_ENB_GOT_SYNC=`egrep -c "got sync" $ENB_LOG`
-                    NB_UE_GOT_SYNC=`egrep -c "got sync" $UE_LOG`
-                    NB_ENB_SYNCED_WITH_UE=`egrep -c "got UE capabilities for UE" $ENB_LOG`
-                    if [ $NB_ENB_GOT_SYNC -gt 0 ] && [ $NB_UE_GOT_SYNC -eq 2 ] && [ $NB_ENB_SYNCED_WITH_UE -eq 1 ]
-                    then
-                        echo "        <td bgcolor = \"green\" >OK</td>" >> ./test_simulator_results.html
-                    else
-                        echo "        <td bgcolor = \"red\" >KO</td>" >> ./test_simulator_results.html
-                    fi
-                    echo "        <td><pre>" >> ./test_simulator_results.html
-                    if [ $NB_ENB_GOT_SYNC -gt 0 ]
-                    then
-                        echo "<font color = \"blue\">- eNB --> got sync</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- eNB NEVER got sync</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_UE_GOT_SYNC -eq 2 ]
-                    then
-                        echo "<font color = \"blue\">- UE --> got sync</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- UE NEVER got sync</b></font>" >> ./test_simulator_results.html
-                    fi
-                    if [ $NB_ENB_SYNCED_WITH_UE -eq 1 ]
-                    then
-                        echo "<font color = \"blue\">- UE attached to eNB</font>" >> ./test_simulator_results.html
-                    else
-                        echo "<font color = \"red\"><b>- UE NEVER attached to eNB</b></font>" >> ./test_simulator_results.html
-                    fi
-                    NB_SEGFAULT_ENB=`egrep -i -c "Segmentation Fault" $ENB_LOG`
-                    if [ $NB_SEGFAULT_ENB -ne 0 ]
-                    then
-                        echo "<font color = \"red\"><b>- eNB --> Segmentation Fault</b></font>" >> ./test_simulator_results.html
-                    fi
-                    NB_SEGFAULT_UE=`egrep -i -c "Segmentation Fault" $UE_LOG`
-                    if [ $NB_SEGFAULT_UE -ne 0 ]
-                    then
-                        echo "<font color = \"red\"><b>- UE --> Segmentation Fault</b></font>" >> ./test_simulator_results.html
-                    fi
-                    NB_ASSERTION_ENB=`egrep -i -c "Assertion" $ENB_LOG`
-                    if [ $NB_ASSERTION_ENB -ne 0 ]
-                    then
-                        echo "<font color = \"red\"><b>- eNB --> Assertion</b></font>" >> ./test_simulator_results.html
-                        awk 'BEGIN{assertion=10}{if(assertion < 3){print "    " $0; assertion++};if ($0 ~/Assertion/){print "    " $0;assertion=1}}END{}' $ENB_LOG >> ./test_simulator_results.html
-                    fi
-                    NB_ASSERTION_UE=`egrep -i -c "Assertion" $UE_LOG`
-                    if [ $NB_ASSERTION_UE -ne 0 ]
-                    then
-                        echo "<font color = \"red\"><b>- eNB --> Assertion</b></font>" >> ./test_simulator_results.html
-                        awk 'BEGIN{assertion=10}{if(assertion < 3){print "    " $0; assertion++};if ($0 ~/Assertion/){print "    " $0;assertion=1}}END{}' $UE_LOG >> ./test_simulator_results.html
-                    fi
-                    echo "        </pre></td>" >> ./test_simulator_results.html
-                    echo "      </tr>" >> ./test_simulator_results.html
-                fi
-                PING_LOGS=`ls $ARCHIVES_LOC/${TMODE}_${BW}MHz_ping_ue.txt 2> /dev/null`
-                analyzePingFiles
-                IPERF_TESTS=`ls $ARCHIVES_LOC/${TMODE}_${BW}*iperf*client*txt 2> /dev/null`
-                analyzeIperfFiles
-            done
-        done
-        echo "   </table>" >> ./test_simulator_results.html
-        echo "   </div>" >> ./test_simulator_results.html
-    fi
-    if [ -e $JENKINS_WKSP/flexran/flexran_build_complete.txt ]
-    then
-        echo "   <h3>4G LTE Basic Simulator + FlexRan Controller Check</h3>" >> ./test_simulator_results.html
-        echo "   <div class=\"alert alert-success\">" >> ./test_simulator_results.html
-        echo "      <strong>TEST was SUCCESSFUL <span class=\"glyphicon glyphicon-ok-circle\"></span></strong>" >> ./test_simulator_results.html
-        echo "   </div>" >> ./test_simulator_results.html
-        echo "   <button data-toggle=\"collapse\" data-target=\"#oai-flexran-test-details\">More details on Basic Simulator + Fleran Controller test results</button>" >> ./test_simulator_results.html
-        echo "   <div id=\"oai-flexran-test-details\" class=\"collapse\">" >> ./test_simulator_results.html
-        echo "   <table border = \"1\">" >> ./test_simulator_results.html
-        echo "      <tr bgcolor = \"#33CCFF\" >" >> ./test_simulator_results.html
-        echo "        <th>Log File Name</th>" >> ./test_simulator_results.html
-        echo "        <th>JSON Query Response</th>" >> ./test_simulator_results.html
-        echo "      </tr>" >> ./test_simulator_results.html
-        FLEXRAN_QUERIES=`ls $ARCHIVES_LOC/flexran_ctl_query_*log`
-        for QUERY in $FLEXRAN_QUERIES
-        do
-            echo "      <tr>" >> ./test_simulator_results.html
-            NAME=`echo $QUERY | sed -e "s#$ARCHIVES_LOC/##"`
-            echo "        <td>$NAME</td>" >> ./test_simulator_results.html
-            echo "        <td><pre><code>" >> ./test_simulator_results.html
-            egrep -v "LOG_NAME|\-\-\-\-\-" $QUERY >> ./test_simulator_results.html
-            echo "        </code></pre></td>" >> ./test_simulator_results.html
-            echo "      </tr>" >> ./test_simulator_results.html
-        done
-        echo "   </table>" >> ./test_simulator_results.html
-        echo "   </div>" >> ./test_simulator_results.html
-    fi
    ARCHIVES_LOC=archives/rf_sim/test
    if [ -d $ARCHIVES_LOC ]
    then

--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
--- a/ci-scripts/waitBuildOnVM.sh
+++ b/ci-scripts/waitBuildOnVM.sh
@@ -174,13 +174,13 @@ function check_on_vm_build {
    fi
    # If we were building the FlexRan Controller, flag-touch for basic-simulator to continue
-    if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
+    #if [[ "$VM_NAME" == *"-flexran-rtc"* ]]
-    then
+    #then
-        if [[ $STATUS -eq 0 ]]
+    #    if [[ $STATUS -eq 0 ]]
-        then
+    #    then
-            touch $JENKINS_WKSP/flexran/flexran_build_complete.txt
+    #        touch $JENKINS_WKSP/flexran/flexran_build_complete.txt
-        fi
+    #    fi
-    fi
+    #fi
    if [[ "$VM_NAME" == *"-cppcheck"* ]]
    then

--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -755,27 +755,6 @@ add_library(oai_irisdevif MODULE ${HWLIB_IRIS_SOURCE})
 target_include_directories(oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.7/)
 target_link_libraries(oai_irisdevif SoapySDR)
-# TCP bridge libraries
-######################################################################
-# this one is for internal use at Eurecom and is not documented
-set(HWLIB_TCP_BRIDGE_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/tcp_bridge/tcp_bridge.c
-  )
-add_library(tcp_bridge MODULE ${HWLIB_TCP_BRIDGE_SOURCE} )
-#get_target_property(tcp_bridge_cflags tcp_bridge COMPILE_FLAGS)
-#set_target_properties(tcp_bridge PROPERTIES COMPILE_FLAGS "${tcp_bridge_cflags} -fvisibility=hidden")
-set_target_properties(tcp_bridge PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
-# this one is to connect OAI eNB and OAI UE in the basic simulator
-# see targets/ARCH/tcp_bridge/README.tcp_bridge_oai for usage
-set(HWLIB_TCP_BRIDGE_OAI_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/tcp_bridge/tcp_bridge_oai.c
-  )
-add_library(tcp_bridge_oai MODULE ${HWLIB_TCP_BRIDGE_OAI_SOURCE} )
-set_target_properties(tcp_bridge_oai PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
 # Benetel 4G library
 ######################################################################
@@ -3008,8 +2987,7 @@ if (${T_TRACER})
        #all "add_library" definitions
        ITTI RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB F1AP_LIB F1AP
        params_libconfig oai_exmimodevif oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
-        oai_eth_transpro oai_mobipass tcp_bridge tcp_bridge_oai
+        oai_eth_transpro oai_mobipass coding FLPT_MSG FLEXRAN_AGENT HASHTABLE UTIL OMG_SUMO
-        coding FLPT_MSG FLEXRAN_AGENT HASHTABLE UTIL OMG_SUMO
        SECU_OSA SECU_CN SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
        NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
        PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU PHY_MEX

--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -894,11 +894,6 @@ function main() {
          compilations \
              $BUILD_DIR rfsimulator \
              librfsimulator.so $dbin/librfsimulator.so.$REL
-          echo_info "Compiling tcp_bridge_oai"
-          compilations \
-              $BUILD_DIR tcp_bridge_oai \
-              libtcp_bridge_oai.so $dbin/libtcp_bridge_oai.so.$REL
      fi
      #build transport protocol libraries (currently only ETHERNET is available)

--- a/common/utils/T/T.c
+++ b/common/utils/T/T.c
@@ -33,12 +33,6 @@ volatile int _T_freelist_head;
 volatile int *T_freelist_head = &_T_freelist_head;
 T_cache_t *T_cache;
-#if BASIC_SIMULATOR
-  /* global variables used by T_GET_SLOT, see in T.h */
-  volatile uint64_t T_next_id;
-  volatile uint64_t T_active_id;
-#endif
 static void get_message(int s) {
  char t;
  int l;

--- a/common/utils/T/T.h
+++ b/common/utils/T/T.h
@@ -111,39 +111,8 @@ typedef struct {
 extern volatile int *T_freelist_head;
 extern T_cache_t *T_cache;
 extern int *T_active;
-/* When running the basic simulator, we may fill the T cache too fast.
+#define T_GET_SLOT \
- * Let's serialize write accesses to the T cache. For that, we use a
- * 'ticket' mechanism. To acquire a T slot the caller needs to own the
- * current active ticket. We also wait for the slot to be free if
- * it is already in use.
- */
-#if BASIC_SIMULATOR
-#  define T_GET_SLOT \
-  do { \
-    extern volatile uint64_t T_next_id; \
-    extern volatile uint64_t T_active_id; \
-    uint64_t id; \
-    /* get a ticket */ \
-    id = __sync_fetch_and_add(&T_next_id, 1); \
-    /* wait for our turn */ \
-    while (id != __sync_fetch_and_add(&T_active_id, 0)) /* busy wait */; \
-    /* this is our turn, try to acquire the slot until it's free */ \
-    do { \
-      T_LOCAL_busy = __sync_fetch_and_or(&T_cache[T_LOCAL_slot].busy, 0x01); \
-      if (T_LOCAL_busy & 0x01) usleep(100); \
-    } while (T_LOCAL_busy & 0x01); \
-    /* check that there are still some tickets */ \
-    if (__sync_fetch_and_add(&T_active_id, 0) == 0xffffffffffffffff) { \
-      printf("T: reached the end of times, bye...\n"); \
-      abort(); \
-    } \
-    /* free our ticket, which signals the next waiter that it's its turn */ \
-    (void)__sync_fetch_and_add(&T_active_id, 1); \
-  } while (0)
-#else
-#  define T_GET_SLOT \
  T_LOCAL_busy = __sync_fetch_and_or(&T_cache[T_LOCAL_slot].busy, 0x01);
-#endif
 /* used at header of Tn, allocates buffer */
 #define T_LOCAL_DATA \

--- a/common/utils/T/T_defs.h
+++ b/common/utils/T/T_defs.h
@@ -40,20 +40,10 @@
 #define T_MAX_ARGS 16
 /* maximum size of a message - increase if needed */
-#if BASIC_SIMULATOR
+#define T_BUFFER_MAX (1024*64*4)
-   /* let's have 100 RBs functional for the basic simulator */
-#  define T_BUFFER_MAX (1024*64*4)
-#else
-#  define T_BUFFER_MAX (1024*64*4)
-#endif
 /* size of the local cache for messages (must be pow(2,something)) */
-#if BASIC_SIMULATOR
+#define T_CACHE_SIZE (8192)
-   /* we don't need much space for the basic simulator */
-#  define T_CACHE_SIZE 1024
-#else
-#  define T_CACHE_SIZE (8192)
-#endif
 /* maximum number of bytes a message can contain */
 #ifdef T_SEND_TIME

--- a/common/utils/T/local_tracer.c
+++ b/common/utils/T/local_tracer.c
@@ -357,22 +357,6 @@ static void forward(void *_forwarder, char *buf, int size) {
  if (f->tail != NULL) f->tail->next = new;
  f->tail = new;
-#if BASIC_SIMULATOR
-  /* When runnng the basic simulator, the tracer may be too slow.
-   * Let's not take too much memory in the tracee and
-   * wait if there is too much data to send. 200MB is
-   * arbitrary.
-   */
-    while (f->memusage > 200 * 1024 * 1024) {
-      if (pthread_cond_signal(&f->cond)) abort();
-      if (pthread_mutex_unlock(&f->lock)) abort();
-      usleep(1000);
-      if (pthread_mutex_lock(&f->lock)) abort();
-    }
-#endif
  f->memusage += size+4;
  /* warn every 100MB */

--- a/doc/BASIC_SIM.md
+++ b/doc/BASIC_SIM.md
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">Running OAI Basic Simulator</font></b>
-    </td>
-  </tr>
-</table>
-This page is valid on the following branches:
- `master` starting from tag `v1.1.0`
- `develop` starting from tag `2019.w11`
-# 1. Building the basic-simulator.
-After the build simplification, the basic simulator is available directly from the standard build.
-```bash
-$ source oaienv
-$ cd cmake_targets
-$ ./build_oai --eNB --UE
-```
-Both eNB (lte-softmodem) and UE (lte-uesoftmodem) are present on `cmake_targets/ran_build/build` folder.
-More details are available on the [build page](BUILD.md).
-# 2. Running the basic simulator.
-The basic simulator is a oai device replacing the radio heads (for example the USRP device). It allows connecting the oai UE and the oai eNodeB through a network interface carrying the time-domain samples, getting rid of over the air unpredictable perturbations.
-This is the ideal tool to check signal processing algorithms and protocols implementation and having debug sessions without any HW radio equipment.
-The main limitations are:
- A single OAI UE will connect to the OAI eNB
- No channel noise
-## 2.1. Starting eNB
-The basic simulator is able to run with a connected EPC or without any (the so-called "noS1" mode).
-Example 1: running in FDD mode with EPC.
-```bash
-$ source oaienv
-$ cd cmake_targets/ran_build/build
-$ ENODEB=1 sudo -E ./lte-softmodem -O $OPENAIR_HOME/ci-scripts/conf_files/lte-fdd-basic-sim.conf --basicsim
-```
-Edit previously the `ci-scripts/conf_files/lte-fdd-basic-sim.conf` file to modify:
- `N_RB_DL` field to change the Bandwidth (25, 50, 100)
- `CI_MME_IP_ADDR` with the EPC IP address
- `CI_ENB_IP_ADDR` with the container (physical server, virtual machine, ...) on which you are executing the eNB soft-modem
-Example 2: running in TDD mode without any EPC.
-```bash
-$ source oaienv
-$ cd cmake_targets/ran_build/build
-$ ENODEB=1 sudo -E ./lte-softmodem -O $OPENAIR_HOME/ci-scripts/conf_files/lte-tdd-basic-sim.conf --basicsim --noS1
-```
-## 2.2. Starting UE
-Before starting the UE, you may need to edit the SIM parameters to adapt to your eNB configuration and HSS database.
-The <conf> file to use for conf2uedate is `openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf`
-You need to set the correct OPC, USIM_API_K, MSIN (this is the end par of the IMSI), HPLMN (the front part of IMSI) to match values from HSS.
-```bash
-$ source oaienv
-# Edit openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
-$ cd cmake_targets/ran_build/build
-$ ../../nas_sim_tools/build/conf2uedata -c $OPENAIR_HOME/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf -o .
-$ sudo -E ./lte-uesoftmodem -C 2625000000 -r 25 --ue-rxgain 140 --basicsim [--noS1]
-```
-The `-r 25` is to use if in the conf file of the eNB you use N_RB_DL=25. Use 50 if you have N_RB_DL=50 and 100 if you have N_RB_DL=100.
-The `-C 2625000000` is the downlink frequency. Use the same value as `downlink_frequency` in the eNB configuration file.
-The `--noS1` is mandatory if you started the eNB in that mode.
-# 3. Testing the data plane
-# 3.1. In S1 mode
-First we need to retrieve the IP address allocated to the OAI UE.
-On the server that runs the UE:
-```bash
-$ ifconfig oaitun_ue1
-oaitun_ue1 Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00  
-            inet addr:192.172.0.2  P-t-P:192.172.0.2  Mask:255.255.255.0
-...
-```
-`192.172.0.2` is the IP address that has been allocated by the SPGW in the EPC.
-On the server that runs the EPC:
-```bash
-$ ping -c 20 192.172.0.2
-  --- 192.172.0.2 ping statistics ---
-  20 packets transmitted, 20 received, 0% packet loss, time 19020ms
-  rtt min/avg/max/mdev = 13.241/18.999/24.208/2.840 ms
-```
-You can ping the EPC from the UE:
-```bash
-$ ping -I oaitun_ue1 -c 20 192.172.0.1
-  --- 192.172.0.1 ping statistics ---
-...
-  20 packets transmitted, 20 received, 0% packet loss, time 19019ms
-  rtt min/avg/max/mdev = 13.015/18.674/23.738/2.917 ms
-```
-For DL iperf testing:
-On the server that runs the UE.
-```bash
-$  iperf -B 192.172.0.2 -u -s -i 1 -fm -p 5001
-```
-On the server that runs the EPC.
-```bash
-$  iperf -c 192.172.0.2 -u -t 30 -b 10M -i 1 -fm -B 192.172.0.1 -p 5001
-```
-For UL iperf testing:
-On the server that runs the EPC.
-```bash
-$  iperf -B 192.172.0.1 -u -s -i 1 -fm -p 5001
-```
-On the server that runs the UE.
-```bash
-$  iperf -c 192.172.0.1 -u -t 30 -b 2M -i 1 -fm -B 192.172.0.2 -p 5001
-```
-# 3.2. In noS1 mode
-The IP addresses are fixed. But we can still retrieve them programmatically.
-For the UE it is quite the same:
-```bash
-$ ifconfig oaitun_ue1
-oaitun_ue1 Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00  
-            inet addr:10.0.1.2  P-t-P:10.0.1.2  Mask:255.255.255.0
-...
-```
-For the eNB:
-```bash
-$ ifconfig oaitun_enb1
-oaitun_enb1 Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00  
-            inet addr:10.0.1.1  P-t-P:10.0.1.1  Mask:255.255.255.0
-...
-```
-Pinging like this:
-```bash
-$ ping -I oaitun_ue1 -c 20 10.0.1.1
-$ ping -I oaitun_enb1 -c 20 10.0.1.2
-```
-And the same for iperf:
-```bash
-$ iperf -B 10.0.1.2 -u -s -i 1 -fm
-$ iperf -c 10.0.1.2 -u -b 1.00M -t 30 -i 1 -fm -B 10.0.1.1
-```
--- a/doc/RUNMODEM.md
+++ b/doc/RUNMODEM.md
@@ -14,10 +14,6 @@
 After you have [built the softmodem executables](BUILD.md) you can set your default directory  to the build directory `cmake_targets/ran_build/build/` and start testing some use cases. Below, the description of the different oai functionalities should help you choose the oai configuration that suits your need. 
-# Basic Simulator
-See the [dedicated page](BASIC_SIM.md).
 # RF Simulator
 The rf simulator is a oai device replacing the radio heads (for example the USRP device). It allows connecting the oai UE (LTE or 5G) and respectively the oai eNodeB or gNodeB through a network interface carrying the time-domain samples, getting rid of over the air unpredictable perturbations. This is the ideal tool to check signal processing algorithms and protocols implementation.  The rf simulator has some preliminary support for channel modeling.

--- a/docker/Dockerfile.eNB.rhel8.2
+++ b/docker/Dockerfile.eNB.rhel8.2
@@ -62,7 +62,6 @@ COPY --from=enb-build \
 COPY --from=enb-build \
    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
    /oai-ran/cmake_targets/ran_build/build/libcoding.so \

--- a/docker/Dockerfile.eNB.rhel8.2.oc4-4
+++ b/docker/Dockerfile.eNB.rhel8.2.oc4-4
@@ -62,7 +62,6 @@ COPY --from=enb-build /oai-ran/targets/bin/lte-softmodem.Rel15 .
 WORKDIR /usr/local/lib/
 COPY --from=enb-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
-COPY --from=enb-build /oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 .
 COPY --from=enb-build /oai-ran/targets/bin/librfsimulator.so.Rel15 .
 COPY --from=enb-build /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 .
 COPY --from=enb-build /oai-ran/targets/bin/libcoding.so .
@@ -95,7 +94,6 @@ RUN ldconfig
 #debug
 RUN ldd /usr/local/lib/liboai_eth_transpro.so.Rel15
-RUN ldd /usr/local/lib/libtcp_bridge_oai.so.Rel15
 RUN ldd /usr/local/lib/librfsimulator.so.Rel15
 RUN ldd /usr/local/lib/liboai_usrpdevif.so.Rel15
 RUN ldd /usr/local/lib/libcoding.so

--- a/docker/Dockerfile.eNB.ubuntu18
+++ b/docker/Dockerfile.eNB.ubuntu18
@@ -69,7 +69,6 @@ COPY --from=enb-build \
 COPY --from=enb-build \
     /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-     /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
     /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
     /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
     /oai-ran/cmake_targets/ran_build/build/libcoding.so \

--- a/docker/Dockerfile.gNB.rhel8.2
+++ b/docker/Dockerfile.gNB.rhel8.2
@@ -64,7 +64,6 @@ COPY --from=gnb-build \
 COPY --from=gnb-build \
    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
    /oai-ran/cmake_targets/ran_build/build/libcoding.so \

--- a/docker/Dockerfile.gNB.rhel8.2.oc4-4
+++ b/docker/Dockerfile.gNB.rhel8.2.oc4-4
@@ -65,7 +65,6 @@ COPY --from=gnb-build /oai-ran/targets/bin/nr-softmodem.Rel15 .
 WORKDIR /usr/local/lib/
 COPY --from=gnb-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
-COPY --from=gnb-build /oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 .
 COPY --from=gnb-build /oai-ran/targets/bin/librfsimulator.so.Rel15 .
 COPY --from=gnb-build /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 .
 COPY --from=gnb-build /oai-ran/targets/bin/libcoding.so .
@@ -102,7 +101,6 @@ RUN ldconfig
 #debug
 RUN ldd /opt/oai-gnb/bin/nr-softmodem.Rel15
 RUN ldd /usr/local/lib/liboai_eth_transpro.so.Rel15
-RUN ldd /usr/local/lib/libtcp_bridge_oai.so.Rel15
 RUN ldd /usr/local/lib/librfsimulator.so.Rel15
 RUN ldd /usr/local/lib/liboai_usrpdevif.so.Rel15
 RUN ldd /usr/local/lib/libcoding.so

--- a/docker/Dockerfile.gNB.ubuntu18
+++ b/docker/Dockerfile.gNB.ubuntu18
@@ -68,7 +68,6 @@ COPY --from=gnb-build \
 COPY --from=gnb-build \
    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
    /oai-ran/cmake_targets/ran_build/build/libcoding.so \

--- a/docker/Dockerfile.lteRU.rhel8.2
+++ b/docker/Dockerfile.lteRU.rhel8.2
@@ -59,7 +59,6 @@ COPY --from=ru-build \
 COPY --from=ru-build \
    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \

--- a/docker/Dockerfile.lteRU.ubuntu18
+++ b/docker/Dockerfile.lteRU.ubuntu18
@@ -64,7 +64,6 @@ COPY --from=ru-build \
 COPY --from=ru-build \
    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \

--- a/docker/Dockerfile.lteUE.rhel8.2
+++ b/docker/Dockerfile.lteUE.rhel8.2
@@ -66,7 +66,6 @@ COPY --from=lte-ue-build \
 COPY --from=lte-ue-build \
    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
    /oai-ran/cmake_targets/ran_build/build/libcoding.so \

--- a/docker/Dockerfile.lteUE.rhel8.2.oc4-4
+++ b/docker/Dockerfile.lteUE.rhel8.2.oc4-4
@@ -68,7 +68,6 @@ COPY --from=lte-ue-build /oai-ran/targets/bin/.usim.nvram0 .
 WORKDIR /usr/local/lib/
 COPY --from=lte-ue-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
-COPY --from=lte-ue-build /oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 .
 COPY --from=lte-ue-build /oai-ran/targets/bin/librfsimulator.so.Rel15 .
 COPY --from=lte-ue-build /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 .
 COPY --from=lte-ue-build /oai-ran/targets/bin/libcoding.so .
@@ -105,7 +104,6 @@ RUN ldd /opt/oai-lte-ue/bin/conf2uedata
 RUN ldd /opt/oai-lte-ue/bin/nvram
 RUN ldd /opt/oai-lte-ue/bin/usim
 RUN ldd /usr/local/lib/liboai_eth_transpro.so.Rel15
-RUN ldd /usr/local/lib/libtcp_bridge_oai.so.Rel15
 RUN ldd /usr/local/lib/librfsimulator.so.Rel15
 RUN ldd /usr/local/lib/liboai_usrpdevif.so.Rel15
 RUN ldd /usr/local/lib/libcoding.so

--- a/docker/Dockerfile.lteUE.ubuntu18
+++ b/docker/Dockerfile.lteUE.ubuntu18
@@ -73,7 +73,6 @@ COPY --from=lte-ue-build \
 COPY --from=lte-ue-build \
    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
    /oai-ran/cmake_targets/ran_build/build/libcoding.so \

--- a/docker/Dockerfile.nrUE.rhel8.2
+++ b/docker/Dockerfile.nrUE.rhel8.2
@@ -66,7 +66,6 @@ COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf .
 COPY --from=nr-ue-build \
    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
    /oai-ran/cmake_targets/ran_build/build/libcoding.so \

--- a/docker/Dockerfile.nrUE.rhel8.2.oc4-4
+++ b/docker/Dockerfile.nrUE.rhel8.2.oc4-4
@@ -64,7 +64,6 @@ COPY --from=nr-ue-build /oai-ran/targets/bin/nr-uesoftmodem.Rel15 .
 WORKDIR /usr/local/lib/
 COPY --from=nr-ue-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
-COPY --from=nr-ue-build /oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 .
 COPY --from=nr-ue-build /oai-ran/targets/bin/librfsimulator.so.Rel15 .
 COPY --from=nr-ue-build /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 .
 COPY --from=nr-ue-build /oai-ran/targets/bin/libcoding.so .
@@ -100,7 +99,6 @@ COPY --from=nr-ue-build /usr/local/lib64/libuhd.so.4.0.0 /usr/local/lib64
 RUN ldconfig
 RUN ldd /opt/oai-nr-ue/bin/nr-uesoftmodem.Rel15
 RUN ldd /usr/local/lib/liboai_eth_transpro.so.Rel15
-RUN ldd /usr/local/lib/libtcp_bridge_oai.so.Rel15
 RUN ldd /usr/local/lib/librfsimulator.so.Rel15
 RUN ldd /usr/local/lib/liboai_usrpdevif.so.Rel15
 RUN ldd /usr/local/lib/libcoding.so

--- a/docker/Dockerfile.nrUE.ubuntu18
+++ b/docker/Dockerfile.nrUE.ubuntu18
@@ -71,7 +71,6 @@ COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf .
 COPY --from=nr-ue-build \
    /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
-    /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
    /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
    /oai-ran/cmake_targets/ran_build/build/libcoding.so \

--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -373,7 +373,7 @@ void init_openair0(void) {
 static void init_pdcp(int ue_id) {
  uint32_t pdcp_initmask = (!IS_SOFTMODEM_NOS1) ? LINK_ENB_PDCP_TO_GTPV1U_BIT : (LINK_ENB_PDCP_TO_GTPV1U_BIT | PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT);
-  /*if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM || (nfapi_getmode()==NFAPI_UE_STUB_PNF)) {
+  /*if (IS_SOFTMODEM_RFSIM || (nfapi_getmode()==NFAPI_UE_STUB_PNF)) {
    pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
  }*/

--- a/executables/softmodem-common.c
+++ b/executables/softmodem-common.c
@@ -89,7 +89,7 @@ void get_common_options(uint32_t execmask) {
  uint32_t glog_level=0 ;
  uint32_t start_telnetsrv = 0, start_telnetclt = 0;
  uint32_t noS1 = 0, nokrnmod = 1, nonbiot = 0;
-  uint32_t rfsim = 0, basicsim = 0, do_forms = 0;
+  uint32_t rfsim = 0, do_forms = 0;
  char *logmem_filename = NULL;
  paramdef_t cmdline_params[] =CMDLINE_PARAMS_DESC ;
  paramdef_t cmdline_logparams[] =CMDLINE_LOGPARAMS_DESC ;
@@ -141,10 +141,6 @@ void get_common_options(uint32_t execmask) {
    set_softmodem_optmask(SOFTMODEM_RFSIM_BIT);
  }
-  if (basicsim) {
-    set_softmodem_optmask(SOFTMODEM_BASICSIM_BIT);
-  }
  if (do_forms) {
    set_softmodem_optmask(SOFTMODEM_DOSCOPE_BIT);
  }

--- a/executables/softmodem-common.h
+++ b/executables/softmodem-common.h
@@ -93,7 +93,7 @@ extern "C"
 #define CONFIG_HLP_USRP_THREAD   "having extra thead for usrp tx\n"
 #define CONFIG_HLP_NOS1          "Disable s1 interface\n"
-#define CONFIG_HLP_RFSIM         "Run in rf simulator mode (also known as basic simulator)\n"
+#define CONFIG_HLP_RFSIM         "Run in rf simulator mode\n"
 #define CONFIG_HLP_NOKRNMOD      "(noS1 only): Use tun instead of namesh module \n"
 #define CONFIG_HLP_DISABLNBIOT   "disable nb-iot, even if defined in config\n"
 #define CONFIG_HLP_USRP_THREAD   "having extra thead for usrp tx\n"
@@ -154,7 +154,6 @@ extern int usrp_tx_thread;
    {"worker-config",        CONFIG_HLP_WORKER_CMD,   0,              strptr:(char **)&worker_config,     defstrval:NULL,        TYPE_STRING, 0},                     \
    {"noS1",                 CONFIG_HLP_NOS1,         PARAMFLAG_BOOL, uptr:&noS1,                         defintval:0,           TYPE_INT,    0},                     \
    {"rfsim",                CONFIG_HLP_RFSIM,        PARAMFLAG_BOOL, uptr:&rfsim,                        defintval:0,           TYPE_INT,    0},                     \
-    {"basicsim",             CONFIG_HLP_RFSIM,        PARAMFLAG_BOOL, uptr:&basicsim,                     defintval:0,           TYPE_INT,    0},                     \
    {"nokrnmod",             CONFIG_HLP_NOKRNMOD,     PARAMFLAG_BOOL, uptr:&nokrnmod,                     defintval:0,           TYPE_INT,    0},                     \
    {"nbiot-disable",        CONFIG_HLP_DISABLNBIOT,  PARAMFLAG_BOOL, uptr:&nonbiot,                      defuintval:0,          TYPE_INT,    0},                     \
    {"nsa",                  CONFIG_HLP_NSA,          PARAMFLAG_BOOL, iptr:&NSA,                          defintval:0,           TYPE_INT,    0},                     \
@@ -201,7 +200,6 @@ extern int usrp_tx_thread;
 #define SOFTMODEM_NOKRNMOD_BIT        (1<<1)
 #define SOFTMODEM_NONBIOT_BIT         (1<<2)
 #define SOFTMODEM_RFSIM_BIT           (1<<10)
-#define SOFTMODEM_BASICSIM_BIT        (1<<11)
 #define SOFTMODEM_SIML1_BIT           (1<<12)
 #define SOFTMODEM_DOSCOPE_BIT         (1<<15)
 #define SOFTMODEM_RECPLAY_BIT         (1<<16)
@@ -218,7 +216,6 @@ extern int usrp_tx_thread;
 #define IS_SOFTMODEM_NOKRNMOD        ( get_softmodem_optmask() & SOFTMODEM_NOKRNMOD_BIT)
 #define IS_SOFTMODEM_NONBIOT         ( get_softmodem_optmask() & SOFTMODEM_NONBIOT_BIT)
 #define IS_SOFTMODEM_RFSIM           ( get_softmodem_optmask() & SOFTMODEM_RFSIM_BIT)
-#define IS_SOFTMODEM_BASICSIM        ( get_softmodem_optmask() & SOFTMODEM_BASICSIM_BIT)
 #define IS_SOFTMODEM_SIML1           ( get_softmodem_optmask() & SOFTMODEM_SIML1_BIT)
 #define IS_SOFTMODEM_DOSCOPE         ( get_softmodem_optmask() & SOFTMODEM_DOSCOPE_BIT)
 #define IS_SOFTMODEM_IQPLAYER        ( get_softmodem_optmask() & SOFTMODEM_RECPLAY_BIT)

--- a/openair1/PHY/INIT/lte_param_init.c
+++ b/openair1/PHY/INIT/lte_param_init.c
@@ -151,11 +151,5 @@ void lte_param_init(PHY_VARS_eNB **eNBp,
    else if (eNB->frame_parms.N_RB_DL == 25)  ru->N_TA_offset = 624/4;
  } else ru->N_TA_offset=0;
-  if (IS_SOFTMODEM_BASICSIM)
-    /* this is required for the basic simulator in TDD mode
-     * TODO: find a proper cleaner solution
-     */
-    UE->N_TA_offset = 0;
  printf("Done lte_param_init\n");
 }
--- a/openair1/PHY/LTE_TRANSPORT/pss.c
+++ b/openair1/PHY/LTE_TRANSPORT/pss.c
@@ -72,10 +72,6 @@ int generate_pss(int32_t **txdataF,
  a = (frame_parms->nb_antenna_ports_eNB == 1) ? amp: (amp*ONE_OVER_SQRT2_Q15)>>15;
  //printf("[PSS] amp=%d, a=%d\n",amp,a);
-  if (IS_SOFTMODEM_BASICSIM)
-    /* a hack to remove at some point (the UE doesn't synch with 100 RBs) */
-    a = (frame_parms->nb_antenna_ports_eNB == 1) ? 4*amp: (amp*ONE_OVER_SQRT2_Q15)>>15;
  Nsymb = (frame_parms->Ncp==NORMAL)?14:12;
  for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {

--- a/openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
@@ -557,11 +557,6 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode) {
    ue->measurements.rx_power_avg_dB[0] = dB_fixed(ue->measurements.rx_power_avg[0]);
    LOG_I(PHY,"[UE%d] Initial sync : Estimated power: %d dB\n",ue->Mod_id,ue->measurements.rx_power_avg_dB[0] );
-    if (IS_SOFTMODEM_BASICSIM )
-      phy_adjust_gain(ue,ue->measurements.rx_power_avg_dB[0],0);
-  } else {
-    if (IS_SOFTMODEM_BASICSIM )
-      phy_adjust_gain(ue,dB_fixed(ue->measurements.rssi),0);
  }
  return ret;

--- a/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
@@ -81,29 +81,20 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
  int i, prach_len;
  uint16_t first_nonzero_root_idx=0;
-  if ( !(IS_SOFTMODEM_BASICSIM ) ) {
+  prach_start =  (ue->rx_offset+subframe*ue->frame_parms.samples_per_tti-ue->hw_timing_advance-ue->N_TA_offset);
-    prach_start =  (ue->rx_offset+subframe*ue->frame_parms.samples_per_tti-ue->hw_timing_advance-ue->N_TA_offset);
 #ifdef PRACH_DEBUG
-    LOG_I(PHY,"[UE %d] prach_start %d, rx_offset %d, hw_timing_advance %d, N_TA_offset %d\n", ue->Mod_id,
+  LOG_I(PHY,"[UE %d] prach_start %d, rx_offset %d, hw_timing_advance %d, N_TA_offset %d\n", ue->Mod_id,
-          prach_start,
+        prach_start,
-          ue->rx_offset,
+        ue->rx_offset,
-          ue->hw_timing_advance,
+        ue->hw_timing_advance,
-          ue->N_TA_offset);
+        ue->N_TA_offset);
 #endif
-    if (prach_start<0)
+  if (prach_start<0)
-      prach_start+=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
+    prach_start+=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
-    if (prach_start>=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
+  if (prach_start>=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
-      prach_start-=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
+    prach_start-=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
-  } else { //normal case (simulation)
-    prach_start = subframe*ue->frame_parms.samples_per_tti-ue->N_TA_offset;
-    LOG_I(PHY,"[UE %d] prach_start %d, rx_offset %d, hw_timing_advance %d, N_TA_offset %d\n", ue->Mod_id,
-          prach_start,
-          ue->rx_offset,
-          ue->hw_timing_advance,
-          ue->N_TA_offset);
-  }
  // First compute physical root sequence
  if (restricted_set == 0) {
@@ -476,40 +467,32 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
  AssertFatal(prach_fmt<4,
              "prach_fmt4 not fully implemented" );
-  if (!(IS_SOFTMODEM_BASICSIM ) ) {
+  int j;
-    int j;
+  int overflow = prach_start + prach_len - LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*ue->frame_parms.samples_per_tti;
-    int overflow = prach_start + prach_len - LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*ue->frame_parms.samples_per_tti;
+  LOG_I( PHY, "prach_start=%d, overflow=%d\n", prach_start, overflow );
-    LOG_I( PHY, "prach_start=%d, overflow=%d\n", prach_start, overflow );
-    for (i=prach_start,j=0; i<min(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,prach_start+prach_len); i++,j++) {
+  for (i=prach_start,j=0; i<min(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,prach_start+prach_len); i++,j++) {
-      ((int16_t *)ue->common_vars.txdata[0])[2*i] = prach[2*j];
+    ((int16_t *)ue->common_vars.txdata[0])[2*i] = prach[2*j];
-      ((int16_t *)ue->common_vars.txdata[0])[2*i+1] = prach[2*j+1];
+    ((int16_t *)ue->common_vars.txdata[0])[2*i+1] = prach[2*j+1];
-    }
+  }
-    for (i=0; i<overflow; i++,j++) {
+  for (i=0; i<overflow; i++,j++) {
-      ((int16_t *)ue->common_vars.txdata[0])[2*i] = prach[2*j];
+    ((int16_t *)ue->common_vars.txdata[0])[2*i] = prach[2*j];
-      ((int16_t *)ue->common_vars.txdata[0])[2*i+1] = prach[2*j+1];
+    ((int16_t *)ue->common_vars.txdata[0])[2*i+1] = prach[2*j+1];
-    }
+  }
 #if defined(EXMIMO)
-    // handle switch before 1st TX subframe, guarantee that the slot prior to transmission is switch on
+  // handle switch before 1st TX subframe, guarantee that the slot prior to transmission is switch on
-    for (k=prach_start - (ue->frame_parms.samples_per_tti>>1) ; k<prach_start ; k++) {
+  for (k=prach_start - (ue->frame_parms.samples_per_tti>>1) ; k<prach_start ; k++) {
-      if (k<0)
+    if (k<0)
-        ue->common_vars.txdata[0][k+ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
+      ue->common_vars.txdata[0][k+ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
-      else if (k>(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
+    else if (k>(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
-        ue->common_vars.txdata[0][k-ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
+      ue->common_vars.txdata[0][k-ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
-      else
+    else
-        ue->common_vars.txdata[0][k] &= 0xFFFEFFFE;
+      ue->common_vars.txdata[0][k] &= 0xFFFEFFFE;
-    }
-#endif
-  } else { // simulators
-    for (i=0; i<prach_len; i++) {
-      ((int16_t *)(&ue->common_vars.txdata[0][prach_start]))[2*i] = prach[2*i];
-      ((int16_t *)(&ue->common_vars.txdata[0][prach_start]))[2*i+1] = prach[2*i+1];
-    }
  }
+#endif
 #if defined(PRACH_WRITE_OUTPUT_DEBUG)
  LOG_M("prach_txF0.m","prachtxF0",prachF,prach_len-Ncp,1,1);

--- a/openair1/PHY/defs_RU.h
+++ b/openair1/PHY/defs_RU.h
@@ -458,8 +458,6 @@ typedef struct RU_t_s {
  int emulate_rf;
  /// numerology index
  int numerology;
-  /// flag to indicate basicsim operation
-  int basicsim;
  /// flag to indicate the RU is in sync with a master reference
  int in_synch;
  /// timing offset

--- a/openair1/SCHED_UE/phy_procedures_lte_ue.c
+++ b/openair1/SCHED_UE/phy_procedures_lte_ue.c
@@ -1150,20 +1150,14 @@ void ulsch_common_procedures(PHY_VARS_UE *ue,
  nsymb = (frame_parms->Ncp == 0) ? 14 : 12;
-  if (!IS_SOFTMODEM_BASICSIM) {
+  ulsch_start = ue->rx_offset + subframe_tx * frame_parms->samples_per_tti
-    ulsch_start = (ue->rx_offset+subframe_tx*frame_parms->samples_per_tti-
+                - ue->hw_timing_advance - ue->timing_advance - ue->N_TA_offset + 5;
-                   ue->hw_timing_advance-
-                   ue->timing_advance-
+  if(ulsch_start < 0)
-                   ue->N_TA_offset+5);
+    ulsch_start = ulsch_start + (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti);
-    if(ulsch_start < 0)
+  if (ulsch_start > (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti))
-      ulsch_start = ulsch_start + (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti);
+    ulsch_start = ulsch_start % (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti);
-    if (ulsch_start > (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti))
-      ulsch_start = ulsch_start % (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti);
-  } else { //this is the simulators case
-    ulsch_start = (frame_parms->samples_per_tti*subframe_tx)-ue->N_TA_offset; //-ue->timing_advance;
-  }
  if (empty_subframe) {
    overflow = ulsch_start - 9*frame_parms->samples_per_tti;
@@ -1181,8 +1175,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue,
  }
  for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
-    int *Buff = IS_SOFTMODEM_BASICSIM ? &ue->common_vars.txdata[aa][ulsch_start] :dummy_tx_buffer;
+    int *Buff = dummy_tx_buffer;
    if (frame_parms->Ncp == 1) {
      PHY_ofdm_mod(&ue->common_vars.txdataF[aa][subframe_tx*nsymb*frame_parms->ofdm_symbol_size],
                   Buff,
@@ -1202,41 +1195,33 @@ void ulsch_common_procedures(PHY_VARS_UE *ue,
                        &ue->frame_parms);
    }
-    if (IS_SOFTMODEM_BASICSIM) {
+    apply_7_5_kHz(ue,dummy_tx_buffer,0);
-      apply_7_5_kHz(ue,&ue->common_vars.txdata[aa][ulsch_start],0);
+    apply_7_5_kHz(ue,dummy_tx_buffer,1);
-      apply_7_5_kHz(ue,&ue->common_vars.txdata[aa][ulsch_start],1);
-    } else {
-      apply_7_5_kHz(ue,dummy_tx_buffer,0);
-      apply_7_5_kHz(ue,dummy_tx_buffer,1);
-    }
-    if (!(IS_SOFTMODEM_BASICSIM) ) {
+    overflow = ulsch_start - 9*frame_parms->samples_per_tti;
-      overflow = ulsch_start - 9*frame_parms->samples_per_tti;
-      for (k=ulsch_start,l=0; k<cmin(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,ulsch_start+frame_parms->samples_per_tti); k++,l++) {
+    for (k=ulsch_start,l=0; k<cmin(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,ulsch_start+frame_parms->samples_per_tti); k++,l++) {
-        ((short *)ue->common_vars.txdata[aa])[2*k] = ((short *)dummy_tx_buffer)[2*l];
+      ((short *)ue->common_vars.txdata[aa])[2*k] = ((short *)dummy_tx_buffer)[2*l];
-        ((short *)ue->common_vars.txdata[aa])[2*k+1] = ((short *)dummy_tx_buffer)[2*l+1];
+      ((short *)ue->common_vars.txdata[aa])[2*k+1] = ((short *)dummy_tx_buffer)[2*l+1];
-      }
+    }
-      for (k=0; k<overflow; k++,l++) {
+    for (k=0; k<overflow; k++,l++) {
-        ((short *)ue->common_vars.txdata[aa])[2*k] = ((short *)dummy_tx_buffer)[2*l];
+      ((short *)ue->common_vars.txdata[aa])[2*k] = ((short *)dummy_tx_buffer)[2*l];
-        ((short *)ue->common_vars.txdata[aa])[2*k+1] = ((short *)dummy_tx_buffer)[2*l+1];
+      ((short *)ue->common_vars.txdata[aa])[2*k+1] = ((short *)dummy_tx_buffer)[2*l+1];
-      }
+    }
 #if defined(EXMIMO)
-      // handle switch before 1st TX subframe, guarantee that the slot prior to transmission is switch on
+    // handle switch before 1st TX subframe, guarantee that the slot prior to transmission is switch on
-      for (k=ulsch_start - (frame_parms->samples_per_tti>>1) ; k<ulsch_start ; k++) {
+    for (k=ulsch_start - (frame_parms->samples_per_tti>>1) ; k<ulsch_start ; k++) {
-        if (k<0)
+      if (k<0)
-          ue->common_vars.txdata[aa][k+frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
+        ue->common_vars.txdata[aa][k+frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
-        else if (k>(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
+      else if (k>(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
-          ue->common_vars.txdata[aa][k-frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
+        ue->common_vars.txdata[aa][k-frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
-        else
+      else
-          ue->common_vars.txdata[aa][k] &= 0xFFFEFFFE;
+        ue->common_vars.txdata[aa][k] &= 0xFFFEFFFE;
-      }
-#endif
    }
+#endif
    /*
    only for debug
@@ -1314,14 +1299,7 @@ void ue_prach_procedures(PHY_VARS_UE *ue,
          ue->prach_resources[eNB_id]->ra_RNTI);
    ue->tx_total_RE[subframe_tx] = 96;
-    if (IS_SOFTMODEM_BASICSIM) {
+    ue->prach_vars[eNB_id]->amp = AMP;
-      ue->prach_vars[eNB_id]->amp = get_tx_amp(ue->tx_power_dBm[subframe_tx],
-                                    ue->tx_power_max_dBm,
-                                    ue->frame_parms.N_RB_UL,
-                                    6);
-    } else {
-      ue->prach_vars[eNB_id]->amp = AMP;
-    }
    if ((mode == calib_prach_tx) && (((proc->frame_tx&0xfffe)%100)==0))
      LOG_D(PHY,"[UE  %d][RAPROC] Frame %d, Subframe %d : PRACH TX power %d dBm, amp %d\n",
@@ -1688,14 +1666,10 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,
      ue->tx_total_RE[subframe_tx] = nb_rb*12;
-      if (IS_SOFTMODEM_BASICSIM) {
+      tx_amp = get_tx_amp(ue->tx_power_dBm[subframe_tx],
-        tx_amp = AMP;
+                          ue->tx_power_max_dBm,
-      } else {
+                          ue->frame_parms.N_RB_UL,
-        tx_amp = get_tx_amp(ue->tx_power_dBm[subframe_tx],
+                          nb_rb);
-                            ue->tx_power_max_dBm,
-                            ue->frame_parms.N_RB_UL,
-                            nb_rb);
-      }
      T(T_UE_PHY_PUSCH_TX_POWER, T_INT(eNB_id), T_INT(frame_tx%1024), T_INT(subframe_tx),T_INT(ue->tx_power_dBm[subframe_tx]),
        T_INT(tx_amp),T_INT(ue->ulsch[eNB_id]->f_pusch),T_INT(get_PL(Mod_id,0,eNB_id)),T_INT(nb_rb));
@@ -1765,17 +1739,13 @@ void ue_srs_procedures(PHY_VARS_UE *ue,
      Po_SRS = ue->tx_power_max_dBm;
    }
-    if (IS_SOFTMODEM_BASICSIM) {
+    if (ue->mac_enabled==1) {
-      tx_amp = AMP;
+      tx_amp = get_tx_amp(Po_SRS,
+                          ue->tx_power_max_dBm,
+                          ue->frame_parms.N_RB_UL,
+                          nb_rb_srs);
    } else {
-      if (ue->mac_enabled==1) {
+      tx_amp = AMP;
-        tx_amp = get_tx_amp(Po_SRS,
-                            ue->tx_power_max_dBm,
-                            ue->frame_parms.N_RB_UL,
-                            nb_rb_srs);
-      } else {
-        tx_amp = AMP;
-      }
    }
    LOG_D(PHY,"SRS PROC; TX_MAX_POWER %d, Po_SRS %d, NB_RB_UL %d, NB_RB_SRS %d TX_AMPL %d\n",ue->tx_power_max_dBm,
@@ -2008,14 +1978,10 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,
      ue->tx_power_dBm[subframe_tx] = Po_PUCCH;
      ue->tx_total_RE[subframe_tx] = 12;
-      if (IS_SOFTMODEM_BASICSIM) {
+      tx_amp = get_tx_amp(Po_PUCCH,
-        tx_amp = AMP;
+                          ue->tx_power_max_dBm,
-      } else {
+                          ue->frame_parms.N_RB_UL,
-        tx_amp = get_tx_amp(Po_PUCCH,
+                          1);
-                            ue->tx_power_max_dBm,
-                            ue->frame_parms.N_RB_UL,
-                            1);
-      }
      T(T_UE_PHY_PUCCH_TX_POWER, T_INT(eNB_id), T_INT(frame_tx%1024), T_INT(subframe_tx),T_INT(ue->tx_power_dBm[subframe_tx]),
        T_INT(tx_amp),T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->g_pucch),T_INT(get_PL(ue->Mod_id,ue->CC_id,eNB_id)));
@@ -2089,14 +2055,10 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,
      ue->tx_power_dBm[subframe_tx] = Po_PUCCH;
      ue->tx_total_RE[subframe_tx] = 12;
-      if (IS_SOFTMODEM_BASICSIM) {
+      tx_amp =  get_tx_amp(Po_PUCCH,
-        tx_amp = AMP;
+                           ue->tx_power_max_dBm,
-      } else {
+                           ue->frame_parms.N_RB_UL,
-        tx_amp =  get_tx_amp(Po_PUCCH,
+                           1);
-                             ue->tx_power_max_dBm,
-                             ue->frame_parms.N_RB_UL,
-                             1);
-      }
      T(T_UE_PHY_PUCCH_TX_POWER, T_INT(eNB_id), T_INT(frame_tx%1024), T_INT(subframe_tx),T_INT(ue->tx_power_dBm[subframe_tx]),
        T_INT(tx_amp),T_INT(ue->dlsch[ue->current_thread_id[proc->subframe_rx]][eNB_id][0]->g_pucch),T_INT(get_PL(ue->Mod_id,ue->CC_id,eNB_id)));
@@ -2344,9 +2306,6 @@ void ue_measurement_procedures(uint16_t l,    // symbol index of each slot [0..6
    // AGC
    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL, VCD_FUNCTION_IN);
-    if (IS_SOFTMODEM_BASICSIM)
-      phy_adjust_gain (ue,dB_fixed(ue->measurements.rssi),0);
    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL, VCD_FUNCTION_OUT);
    eNB_id = 0;

--- a/targets/ARCH/COMMON/common_lib.c
+++ b/targets/ARCH/COMMON/common_lib.c
@@ -116,9 +116,6 @@ int load_lib(openair0_device *device,
  	  deflibname=OAI_IQPLAYER_LIBNAME;
  	  shlib_fdesc[0].fname="device_init";
  	  set_softmodem_optmask(SOFTMODEM_RECPLAY_BIT);  // softmodem has to know we use the iqplayer to workaround randomized algorithms
-  } else  if ( IS_SOFTMODEM_BASICSIM ) {
-	  deflibname=OAI_BASICSIM_LIBNAME;
-	  shlib_fdesc[0].fname="device_init";
  } else if (IS_SOFTMODEM_RFSIM && flag == RAU_LOCAL_RADIO_HEAD) {
 	  deflibname=OAI_RFSIM_LIBNAME;
 	  shlib_fdesc[0].fname="device_init";

--- a/targets/ARCH/COMMON/common_lib.h
+++ b/targets/ARCH/COMMON/common_lib.h
@@ -46,8 +46,6 @@
 #define OAI_THIRDPARTY_TP_LIBNAME        "thirdparty_transpro"
 /* name of shared library implementing the rf simulator */
 #define OAI_RFSIM_LIBNAME     "rfsimulator"
-/* name of shared library implementing the basic simulator */
-#define OAI_BASICSIM_LIBNAME  "tcp_bridge_oai"
 /* name of shared library implementing the iq player */
 #define OAI_IQPLAYER_LIBNAME  "oai_iqplayer"

--- a/targets/ARCH/tcp_bridge/README
+++ b/targets/ARCH/tcp_bridge/README
-This is sort of a "TCP driver" to ease debugging. This is mostly internal
-to EURECOM. You probably don't want to use it.
-Same license as the rest.
--- a/targets/ARCH/tcp_bridge/README.tcp_bridge_oai
+++ b/targets/ARCH/tcp_bridge/README.tcp_bridge_oai
-The driver tcp_bridge_oai.c is to be used with the basic simulator.
-To build the basic simulator:
-    cd [openair top directory]
-    . oaienv
-    cd cmake_targets
-    ./build_oai -I -w USRP
-    ./build_oai --basic-simulator
-    cd ../common/utils/T/tracer
-    make
-To use it, you need to run the eNB and the UE.
-The eNB requires the T tracer.
-Open two terminals.
-In one terminal, run:
-    cd [openair top directory]
-    cd common/utils/T/tracer
-    ./enb -d ../T_messages.txt
-In the other terminal, run:
-    cd [openair top directory]
-    cd cmake_targets/basic_simulator/enb
-    export ENODEB=1
-    sudo -E ./lte-softmodem -O [configuration file] --T_stdout 0
-[configuration file] is just a regular configuration file.
-The eNB needs an EPC.
-To run the UE, open a terminal and run:
-    cd [openair top directory]
-    cd cmake_targets/basic_simulator/ue
-    sudo ./lte-uesoftmodem -C 2680000000 -r 25 --ue-rxgain 140
-Adapt the value of -r, it has to match the value N_RB_DL in the configuration
-file of the eNB. (Same for -C which should match the value downlink_frequency
-in the configuration file.)
-The UE configuration (security keys) is generated from the file
-openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf. You need to configure
-your EPC to know about the UE. If you change the file
-openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf then you need to
-regenerate the configuration files using the program targets/bin/conf2uedata.
-You run it as:
-    $OPENAIR_DIR/targets/bin/conf2uedata -c $OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf -o $OPENAIR_DIR/cmake_targets/basic_simulator/ue
--- a/targets/ARCH/tcp_bridge/tcp_bridge.c
+++ b/targets/ARCH/tcp_bridge/tcp_bridge.c
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-int fullread(int fd, void *_buf, int count)
-{
-  char *buf = _buf;
-  int ret = 0;
-  int l;
-  while (count) {
-    l = read(fd, buf, count);
-    if (l <= 0) return -1;
-    count -= l;
-    buf += l;
-    ret += l;
-  }
-  return ret;
-}
-int fullwrite(int fd, void *_buf, int count)
-{
-  char *buf = _buf;
-  int ret = 0;
-  int l;
-  while (count) {
-    l = write(fd, buf, count);
-    if (l <= 0) return -1;
-    count -= l;
-    buf += l;
-    ret += l;
-  }
-  return ret;
-}
-#include "common_lib.h"
-typedef struct {
-  int32_t data[30720]; /* max 20MHz */
-  unsigned long timestamp;
-  int size;
-} input_buffer;
-#define BSIZE 16
-typedef struct {
-  int sock;
-  int samples_per_subframe;
-  input_buffer b[BSIZE];
-  int bstart;
-  int blen;
-  unsigned long read_timestamp;
-} tcp_bridge_state_t;
-/****************************************************************************/
-/* buffer management                                                        */
-/* (could be simpler, we are synchronous)                                   */
-/* maybe we should lock                                                     */
-/****************************************************************************/
-void put_buffer(tcp_bridge_state_t *t, void *data, int size, unsigned long timestamp)
-{
-  int nextpos;
-  if (t->blen == BSIZE) { printf("tcp_bridge: buffer full\n"); exit(1); }
-  if (size > 30720*4) abort();
-  if (t->blen) {
-    int lastpos = (t->bstart+t->blen-1) % BSIZE;
-    if (timestamp != t->b[lastpos].timestamp + t->samples_per_subframe)
-      { printf("tcp_bridge: discontinuity\n"); exit(1); }
-  }
-  nextpos = (t->bstart+t->blen) % BSIZE;
-  t->b[nextpos].timestamp = timestamp;
-  t->b[nextpos].size      = size;
-  memcpy(t->b[nextpos].data, data, size);
-  t->blen++;
-}
-void get_buffer(tcp_bridge_state_t *t, void *data, int size, unsigned long timestamp)
-{
-  int pos;
-  if (t->blen == 0) { printf("tcp_bridge: buffer empty\n"); exit(1); }
-  if (size >30720*4) abort();
-  pos = t->bstart;
-  if (size != t->b[pos].size) { printf("tcp_bridge: bad size\n"); exit(1); }
-  memcpy(data, t->b[pos].data, size);
-  t->bstart = (t->bstart + 1) % BSIZE;
-  t->blen--;
-}
-/****************************************************************************/
-/* end of buffer management                                                 */
-/****************************************************************************/
-/****************************************************************************/
-/* network management (read/write)                                          */
-/****************************************************************************/
-void read_data_from_network(int sock, input_buffer *b)
-{
-  if (fullread(sock, &b->timestamp, sizeof(b->timestamp)) != sizeof(b->timestamp)) goto err;
-  if (fullread(sock, &b->size, sizeof(b->size)) != sizeof(b->size)) goto err;
-  if (fullread(sock, b->data, b->size) != b->size) goto err;
-  return;
-err:
-  printf("tcp_bridge: read_data_from_network fails\n");
-  exit(1);
-}
-void write_data_to_network(int sock, input_buffer *b)
-{
-  if (fullwrite(sock, &b->timestamp, sizeof(b->timestamp)) != sizeof(b->timestamp)) goto err;
-  if (fullwrite(sock, &b->size, sizeof(b->size)) != sizeof(b->size)) goto err;
-  if (fullwrite(sock, b->data, b->size) != b->size) goto err;
-  return;
-err:
-  printf("tcp_bridge: write_data_to_network fails\n");
-  exit(1);
-}
-/****************************************************************************/
-/* end of network management                                                */
-/****************************************************************************/
-int tcp_bridge_start(openair0_device *device)
-{
-  int i;
-  int port = 4042;
-  tcp_bridge_state_t *tcp_bridge = device->priv;
-  int sock = socket(AF_INET, SOCK_STREAM, 0);
-  if (sock == -1) { perror("tcp_bridge: socket"); exit(1); }
-  int enable = 1;
-  if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int)))
-    { perror("tcp_bridge: SO_REUSEADDR"); exit(1); }
-  struct sockaddr_in addr = {
-    sin_family: AF_INET,
-    sin_port: htons(port),
-    sin_addr: { s_addr: INADDR_ANY }
-  };
-  if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)))
-    { perror("tcp_bridge: bind"); exit(1); }
-  if (listen(sock, 5))
-    { perror("tcp_bridge: listen"); exit(1); }
-  printf("tcp_bridge: wait for connection on port %d\n", port);
-  socklen_t len = sizeof(addr);
-  int sock2 = accept(sock, (struct sockaddr *)&addr, &len);
-  if (sock2 == -1)
-    { perror("tcp_bridge: accept"); exit(1); }
-  close(sock);
-  tcp_bridge->sock = sock2;
-  /* the other end has to send 10 subframes at startup */
-  for (i = 0; i < 10; i++)
-    read_data_from_network(sock2, &tcp_bridge->b[i]);
-  tcp_bridge->bstart = 0;
-  tcp_bridge->blen = 10;
-  printf("tcp_bridge: connection established\n");
-  return 0;
-}
-int tcp_bridge_request(openair0_device *device, void *msg, ssize_t msg_len) { abort(); return 0; }
-int tcp_bridge_reply(openair0_device *device, void *msg, ssize_t msg_len) { abort(); return 0; }
-int tcp_bridge_get_stats(openair0_device* device) { return 0; }
-int tcp_bridge_reset_stats(openair0_device* device) { return 0; }
-void tcp_bridge_end(openair0_device *device) {}
-int tcp_bridge_stop(openair0_device *device) { return 0; }
-int tcp_bridge_set_freq(openair0_device* device, openair0_config_t *openair0_cfg,int exmimo_dump_config) { return 0; }
-int tcp_bridge_set_gains(openair0_device* device, openair0_config_t *openair0_cfg) { return 0; }
-int tcp_bridge_write(openair0_device *device, openair0_timestamp timestamp, void **buff, int nsamps, int cc, int flags)
-{
-  tcp_bridge_state_t *t = device->priv;
-  input_buffer out;
-  int i;
-//printf("write ts %ld nsamps %d\n", timestamp, nsamps);
-  if (nsamps > 30720) abort();
-  /* read buffer timestamped with 'timestamp' if not already here */
-  for (i = 0; i < t->blen; i++) {
-    input_buffer *b = &t->b[(t->bstart + i) % BSIZE];
-    if (b->timestamp == timestamp) break;
-  }
-  if (i == t->blen) {
-    int nextpos = (t->bstart + t->blen) % BSIZE;
-    if (t->blen == BSIZE) abort();
-    read_data_from_network(t->sock, &t->b[nextpos]);
-    t->blen++;
-    if (t->b[nextpos].timestamp != timestamp) abort();
-  }
-  memcpy(out.data, buff[0], nsamps * 4);
-  out.timestamp = timestamp;
-  out.size = nsamps * 4;
-  write_data_to_network(t->sock, &out);
-  return nsamps;
-}
-int tcp_bridge_read(openair0_device *device, openair0_timestamp *timestamp, void **buff, int nsamps, int cc)
-{
-  tcp_bridge_state_t *t = device->priv;
-  input_buffer *b;
-  if (cc != 1) abort();
-  if (t->blen == 0) abort();
-  b = &t->b[t->bstart];
-  if (b->timestamp != t->read_timestamp) abort();
-  if (b->size != nsamps * 4) abort();
-  *timestamp = b->timestamp;
-  memcpy(buff[0], b->data, b->size);
-  t->read_timestamp += nsamps;
-  t->bstart = (t->bstart + 1) % BSIZE;
-  t->blen--;
-static unsigned long ts = 0;
-//printf("read ts %ld nsamps %d\n", ts, nsamps);
-*timestamp = ts;
-ts += nsamps;
-  return nsamps;
-}
-int tcp_bridge_write_init(openair0_device *device)
-{
-    return 0;
-}
-__attribute__((__visibility__("default")))
-int device_init(openair0_device* device, openair0_config_t *openair0_cfg)
-{
-  tcp_bridge_state_t *tcp_bridge = (tcp_bridge_state_t*)malloc(sizeof(tcp_bridge_state_t));
-  memset(tcp_bridge, 0, sizeof(tcp_bridge_state_t));
-  /* only 25 or 50 PRBs handled for the moment */
-  if (openair0_cfg[0].sample_rate != 61440000 &&
-      openair0_cfg[0].sample_rate != 30720000 &&
-      openair0_cfg[0].sample_rate != 15360000 &&
-      openair0_cfg[0].sample_rate !=  7680000) {
-    printf("tcp_bridge: ERROR: only sample rate 61.44, 30.72, 15.36, and 7.68 Msps supported\n");
-    exit(1);
-  }
-  device->trx_start_func   = tcp_bridge_start;
-  device->trx_get_stats_func   = tcp_bridge_get_stats;
-  device->trx_reset_stats_func = tcp_bridge_reset_stats;
-  device->trx_end_func         = tcp_bridge_end;
-  device->trx_stop_func        = tcp_bridge_stop;
-  device->trx_set_freq_func = tcp_bridge_set_freq;
-  device->trx_set_gains_func = tcp_bridge_set_gains;
-  device->trx_write_func   = tcp_bridge_write;
-  device->trx_read_func    = tcp_bridge_read;
-  device->trx_write_init   = tcp_bridge_write_init;
-  device->priv = tcp_bridge;
-  switch ((int)openair0_cfg[0].sample_rate) {
-  case 61440000: tcp_bridge->samples_per_subframe = 61440; break;
-  case 30720000: tcp_bridge->samples_per_subframe = 30720; break;
-  case 15360000: tcp_bridge->samples_per_subframe = 15360; break;
-  case 7680000:  tcp_bridge->samples_per_subframe = 7680; break;
-  }
-  /* let's pretend to be a b2x0 */
-  device->type = USRP_B200_DEV;
-  device->openair0_cfg=&openair0_cfg[0];
-  return 0;
-}
--- a/targets/ARCH/tcp_bridge/tcp_bridge_oai.c
+++ b/targets/ARCH/tcp_bridge/tcp_bridge_oai.c
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -1387,12 +1387,6 @@ int setup_RU_buffers(RU_t *ru) {
    else if (frame_parms->N_RB_DL == 50)  ru->N_TA_offset = 624/2;
    else if (frame_parms->N_RB_DL == 25)  ru->N_TA_offset = 624/4;
-    if(IS_SOFTMODEM_BASICSIM)
-      /* this is required for the basic simulator in TDD mode
-       * TODO: find a proper cleaner solution
-       */
-      ru->N_TA_offset = 0;
    if      (frame_parms->N_RB_DL == 100) /* no scaling to do */;
    else if (frame_parms->N_RB_DL == 50) {
      ru->sf_extension       /= 2;

--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -360,12 +360,6 @@ void init_UE(int nb_inst,
      }
    } else UE->N_TA_offset = 0;
-    if( IS_SOFTMODEM_BASICSIM)
-      /* this is required for the basic simulator in TDD mode
-       * TODO: find a proper cleaner solution
-       */
-      UE->N_TA_offset = 0;
    LOG_I(PHY,"Intializing UE Threads for instance %d (%p,%p)...\n",inst,PHY_vars_UE_g[inst],PHY_vars_UE_g[inst][0]);
    init_UE_threads(inst);
@@ -883,7 +877,7 @@ static void *UE_thread_rxn_txnp4(void *arg)
    proc->instance_cnt_rxtx--;
-    if ( IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
+    if (IS_SOFTMODEM_RFSIM) {
      if (pthread_cond_signal(&proc->cond_rxtx) != 0) abort();
    }
@@ -1998,12 +1992,6 @@ void *UE_thread(void *arg)
  log_scheduler(__func__);
  while (!oai_exit) {
-    if (IS_SOFTMODEM_BASICSIM)
-      while (!(UE->proc.instance_cnt_synch < 0)) {
-        printf("ue sync not ready\n");
-        usleep(500*1000);
-      }
    AssertFatal ( 0== pthread_mutex_lock(&UE->proc.mutex_synch), "");
    int instance_cnt_synch = UE->proc.instance_cnt_synch;
    int is_synchronized    = UE->is_synchronized;
@@ -2121,7 +2109,7 @@ void *UE_thread(void *arg)
        // update thread index for received subframe
        UE->current_thread_id[sub_frame] = thread_idx;
-        if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM ) {
+        if (IS_SOFTMODEM_RFSIM ) {
          int t;
          for (t = 0; t < 2; t++) {
@@ -2213,8 +2201,8 @@ void *UE_thread(void *arg)
              LOG_E(PHY,"can't compensate: diff =%d\n", first_symbols);
          }
-          /* no timeout in IS_SOFTMODEM_BASICSIM or IS_SOFTMODEM_RFSIM mode */
+          /* no timeout in IS_SOFTMODEM_RFSIM mode */
-          if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM) {
+          if (IS_SOFTMODEM_RFSIM) {
            ret = pthread_mutex_lock(&proc->mutex_rxtx);
          } else {
            struct timespec tv;

--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -519,7 +519,7 @@ int restart_L1L2(module_id_t enb_id) {
 static void init_pdcp(int ue_id) {
  uint32_t pdcp_initmask = (!IS_SOFTMODEM_NOS1) ? LINK_ENB_PDCP_TO_GTPV1U_BIT : (LINK_ENB_PDCP_TO_GTPV1U_BIT | PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT);
-  if (IS_SOFTMODEM_BASICSIM || IS_SOFTMODEM_RFSIM || (nfapi_getmode()==NFAPI_UE_STUB_PNF)) {
+  if (IS_SOFTMODEM_RFSIM || (nfapi_getmode()==NFAPI_UE_STUB_PNF)) {
    pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT;
  }