Commit c50101f3 authored by wujing's avatar wujing

oaienv -> ranenv| build_oai -> build_ran

parent 6befa8ad
......@@ -3820,7 +3820,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
NR_MAC_RAR *rar = (NR_MAC_RAR *) (dlsch_buffer + 1); // RAR subPDU pointer
uint8_t preamble_index = ra->ra_PreambleIndex;
LOG_E(NR_MAC, "In %s:[%d.%d]: [UE %d][RAPROC] invoking MAC for received RAR (current preamble %d)\n", __FUNCTION__, frame, slot, mod_id, preamble_index);
LOG_D(NR_MAC, "In %s:[%d.%d]: [UE %d][RAPROC] invoking MAC for received RAR (current preamble %d)\n", __FUNCTION__, frame, slot, mod_id, preamble_index);
while (1) {
n_subheaders++;
......@@ -3839,7 +3839,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
}
}
if (rarh->RAPID == preamble_index) {
LOG_E(NR_MAC, "[UE %d][RAPROC][%d.%d] Found RAR with the intended RAPID %d\n", mod_id, frame, slot, rarh->RAPID);
LOG_D(NR_MAC, "[UE %d][RAPROC][%d.%d] Found RAR with the intended RAPID %d\n", mod_id, frame, slot, rarh->RAPID);
rar = (NR_MAC_RAR *) (dlsch_buffer + n_subheaders + (n_subPDUs - 1) * sizeof(NR_MAC_RAR));
ra->RA_RAPID_found = 1;
if (get_softmodem_params()->emulate_l1) {
......
......@@ -1857,7 +1857,7 @@ void nr_ue_prach_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, uint8_t
int16_t ra_preamble_rx_power = (int16_t)(prach_resources->ra_PREAMBLE_RECEIVED_TARGET_POWER - pathloss + 30);
ue->tx_power_dBm[nr_slot_tx] = min(nr_get_Pcmax(mod_id), ra_preamble_rx_power);
LOG_E(PHY, "In %s: [UE %d][RAPROC][%d.%d]: Generating PRACH Msg1 (preamble %d, PL %d dB, P0_PRACH %d, TARGET_RECEIVED_POWER %d dBm, RA-RNTI %x)\n",
LOG_D(PHY, "In %s: [UE %d][RAPROC][%d.%d]: Generating PRACH Msg1 (preamble %d, PL %d dB, P0_PRACH %d, TARGET_RECEIVED_POWER %d dBm, RA-RNTI %x)\n",
__FUNCTION__,
mod_id,
frame_tx,
......
......@@ -147,8 +147,8 @@ then
then
echo "cd $OAIENV_DIR"
cd $OAIENV_DIR
echo "source oaienv"
source oaienv
echo "source ranenv"
source ranenv
echo "cd $WORK_DIR"
cd $WORK_DIR
echo "cmake CMakeLists.txt"
......
......@@ -26,7 +26,7 @@ This directory contains testbenchs for 5G NR physical layers.
Before building unit tests, full UE build should be done before (maily for asn1 dependencies):
Initialise environment:
- under openairinterface5g enter >source oaienv
- under openairinterface5g enter >source ranenv
Install tools:
- under openairinterface5g/cmake_targets/build -I
Build NR UE:
......@@ -49,7 +49,7 @@ input_buffer_test.h: it allows providing samples for pss test.
How to build & run tests
========================
Before building, oai environment should be set by entering under directory openairinterface5g "source oaienv".
Before building, oai environment should be set by entering under directory openairinterface5g "source ranenv".
A script "run_tests.sh" allows to build, to run and to check all tests.
To run a complete non regression of unit tests, go under directory NR_UE_PHY/unit_tests/build and execute:
......
cd /tmp/oai_test_setup/oai
source oaienv
source ranenv
cd cmake_targets
rm -rf log
mkdir -p log
......
cd /tmp/oai_test_setup/oai
source oaienv
source ranenv
echo $EXEC $EXEC_ARGS
$EXEC $EXEC_ARGS
cd /tmp/oai_test_setup/oai
source oaienv
source ranenv
sudo rmmod nasmesh || true
sudo rmmod ue_ip || true
cd cmake_targets
......
......@@ -2,7 +2,7 @@
stty isig intr ^C
cd /tmp/oai_test_setup/oai
source oaienv
source ranenv
sudo rmmod nasmesh || true
sudo rmmod ue_ip || true
cd cmake_targets/ran_build/build
......
......@@ -2,7 +2,7 @@
stty isig intr ^C
cd /tmp/oai_test_setup/oai
source oaienv
source ranenv
sudo rmmod nasmesh || true
sudo rmmod ue_ip || true
cd cmake_targets/autotests/v2/actions
......
......@@ -15,7 +15,7 @@ stty isig intr ^C
#while [ ! -e /dev/bandrich ]; do sleep 1; done
cd /tmp/oai_test_setup/oai
source oaienv
source ranenv
sudo rmmod nasmesh || true
sudo rmmod ue_ip || true
cd cmake_targets/autotests/v2/actions
......
......@@ -20,7 +20,7 @@
# * contact@openairinterface.org
# */
# file build_oai
# file build_ran
# brief OAI automated build tool that can be used to install, compile, run OAI.
# author Navid Nikaein, Lionel GAUTHIER, Laurent Thomas
......@@ -171,10 +171,10 @@ Options
Print this help
Usage (first build):
NI/ETTUS B201 + COTS UE : ./build_oai -I -i --eNB -w USRP
NI/ETTUS B201 + COTS UE : ./build_ran -I -i --eNB -w USRP
Usage (regular):
Eurecom EXMIMO + OAI ENB : ./build_oai --eNB
NI/ETTUS B201 + OAI ENB : ./build_oai --eNB -w USRP"
Eurecom EXMIMO + RAN ENB : ./build_ran --eNB
NI/ETTUS B201 + RAN ENB : ./build_ran --eNB -w USRP"
}
......
......@@ -3,7 +3,7 @@ By default the embedded telnet server, which is implemented in a shared library,
```bash
cd \<oai repository\>/openairinterface5g
source oaienv
source ranenv
cd cmake_targets
./build_oai --build-lib telnetsrv
```
......
......@@ -7,14 +7,14 @@ export OPENAIR_TARGETS=$OPENAIR_HOME/targets
export PATH=$PATH:$OPENAIR_TARGETS/bin
alias oai='cd $OPENAIR_HOME'
alias oai0='cd $OPENAIR0_DIR'
alias oai1='cd $PHY_DIR'
alias oai2='cd $MAC_DIR'
alias oait='cd $OPENAIR_TARGETS'
alias oailte='cd $OPENAIR_TARGETS/RT/USER'
alias oais='cd $OPENAIR_TARGETS/SIMU/USER'
alias oaiex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
alias ran='cd $OPENAIR_HOME'
alias ran0='cd $OPENAIR0_DIR'
alias ran1='cd $PHY_DIR'
alias ran2='cd $MAC_DIR'
alias rant='cd $OPENAIR_TARGETS'
alias ranlte='cd $OPENAIR_TARGETS/RT/USER'
alias rans='cd $OPENAIR_TARGETS/SIMU/USER'
alias ranex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
export IIOD_REMOTE=192.168.1.2
#export IIOD_REMOTE=192.168.1.11
......
......@@ -58,7 +58,7 @@ sudo gedit /usr/local/etc/syriq/cpu-irq.sh
echo '1' > /proc/irq/49/smp_affinity_list
echo '5' > /proc/irq/48/smp_affinity_list
gedit oaienv
gedit ranenv
export IIOD_REMOTE=192.168.1.11
......@@ -67,7 +67,7 @@ compilation:
------------
sudo cset shield --reset
cd eur_oai_develop-nr/openairinterface5g/
source oaienv
source ranenv
sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706 -I
sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706
......@@ -76,7 +76,7 @@ sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706
run:
----
source oaienv
source ranenv
sudo -E /usr/local/etc/syriq/cpu-irq.sh
sudo -E cset shield -e ./targets/bin/nr-uesoftmodem.Rel15 -- --numerology 1 -r 106 -C 3510000000 --loop-memory --rf-config-file /usr/local/etc/syriq/ue.band22.tm1.PRB100.NR40.dat
......@@ -104,7 +104,7 @@ sudo lspci -vv -s 02:00.0 | grep Interr
sudo gedit /usr/local/etc/syriq/cpu-irq.sh
echo '1' > /proc/irq/46/smp_affinity_list
gedit oaienv
gedit ranenv
export IIOD_REMOTE=192.168.1.21
......@@ -113,7 +113,7 @@ compilation:
------------
sudo cset shield --reset
cd eur_oai_develop-nr/openairinterface5g/
source oaienv
source ranenv
sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706 -I --enable-cpu-affinity
......@@ -130,7 +130,7 @@ sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706 --enable-cpu-affini
run:
----
source oaienv
source ranenv
sudo -E /usr/local/etc/syriq/cpu-irq.sh
sudo -E cset shield -e ./targets/bin/nr-softmodem.Rel15 -- -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf --rf-config-file /usr/local/etc/syriq/gnb.band22.tm1.PRB100.NR40_hwgain15.dat
......@@ -2,7 +2,7 @@ The driver tcp_bridge_oai.c is to be used with the basic simulator.
To build the basic simulator:
cd [openair top directory]
. oaienv
. ranenv
cd cmake_targets
./build_oai -I -w USRP
./build_oai --basic-simulator
......
#Build instructions
source oaienv
source ranenv
cd cmake_targets
#Create lte-uesoftmodem-nos1 (UE) and lte-softmodem-nos1 (eNB) executables
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment