Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG UE
Commits
bbee4d98
Commit
bbee4d98
authored
2 years ago
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oaienv -> ranenv| build_oai -> build_ran
parent
38d8ad32
Changes
17
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
72 additions
and
51 deletions
+72
-51
src/MAC/NR_SCD_UE/nr_ue_procedures.c
src/MAC/NR_SCD_UE/nr_ue_procedures.c
+2
-2
src/PHY/SCHED_NR_UE/phy_procedures_nr_ue.c
src/PHY/SCHED_NR_UE/phy_procedures_nr_ue.c
+1
-1
src/PHY/SIMULATION/NR_UE_PHY/unit_tests/build/run_tests.sh
src/PHY/SIMULATION/NR_UE_PHY/unit_tests/build/run_tests.sh
+2
-2
src/PHY/SIMULATION/NR_UE_PHY/unit_tests/readme.txt
src/PHY/SIMULATION/NR_UE_PHY/unit_tests/readme.txt
+2
-2
src/cmake_targets/autotests/run_exec_lte-softmodem_tests.py
src/cmake_targets/autotests/run_exec_lte-softmodem_tests.py
+24
-24
src/cmake_targets/autotests/v2/actions/compilation.bash
src/cmake_targets/autotests/v2/actions/compilation.bash
+1
-1
src/cmake_targets/autotests/v2/actions/execution.bash
src/cmake_targets/autotests/v2/actions/execution.bash
+1
-1
src/cmake_targets/autotests/v2/actions/execution_compile.bash
...cmake_targets/autotests/v2/actions/execution_compile.bash
+1
-1
src/cmake_targets/autotests/v2/actions/run_enb.bash
src/cmake_targets/autotests/v2/actions/run_enb.bash
+2
-2
src/cmake_targets/autotests/v2/actions/start_3276.bash
src/cmake_targets/autotests/v2/actions/start_3276.bash
+1
-1
src/cmake_targets/autotests/v2/actions/start_bandrich.bash
src/cmake_targets/autotests/v2/actions/start_bandrich.bash
+1
-1
src/cmake_targets/build_ran
src/cmake_targets/build_ran
+4
-4
src/common/utils/telnetsrv/DOC/telnetusage.md
src/common/utils/telnetsrv/DOC/telnetusage.md
+1
-1
src/ranenv
src/ranenv
+21
-0
src/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme
src/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme
+6
-6
src/targets/ARCH/tcp_bridge/README.tcp_bridge_oai
src/targets/ARCH/tcp_bridge/README.tcp_bridge_oai
+1
-1
src/targets/DOCS/nfapi-L2-emulator-setup.txt
src/targets/DOCS/nfapi-L2-emulator-setup.txt
+1
-1
No files found.
src/MAC/NR_SCD_UE/nr_ue_procedures.c
View file @
bbee4d98
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
src/PHY/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
bbee4d98
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
src/PHY/SIMULATION/NR_UE_PHY/unit_tests/build/run_tests.sh
View file @
bbee4d98
...
...
@@ -147,8 +147,8 @@ then
then
echo
"cd
$OAIENV_DIR
"
cd
$OAIENV_DIR
echo
"source
oai
env"
source
oai
env
echo
"source
ran
env"
source
ran
env
echo
"cd
$WORK_DIR
"
cd
$WORK_DIR
echo
"cmake CMakeLists.txt"
...
...
This diff is collapsed.
Click to expand it.
src/PHY/SIMULATION/NR_UE_PHY/unit_tests/readme.txt
View file @
bbee4d98
...
...
@@ -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
oai
env
- under openairinterface5g enter >source
ran
env
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
oai
env".
Before building, oai environment should be set by entering under directory openairinterface5g "source
ran
env".
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:
...
...
This diff is collapsed.
Click to expand it.
src/cmake_targets/autotests/run_exec_lte-softmodem_tests.py
View file @
bbee4d98
This diff is collapsed.
Click to expand it.
src/cmake_targets/autotests/v2/actions/compilation.bash
View file @
bbee4d98
cd
/tmp/oai_test_setup/oai
source
oai
env
source
ran
env
cd
cmake_targets
rm
-rf
log
mkdir
-p
log
...
...
This diff is collapsed.
Click to expand it.
src/cmake_targets/autotests/v2/actions/execution.bash
View file @
bbee4d98
cd
/tmp/oai_test_setup/oai
source
oai
env
source
ran
env
echo
$EXEC
$EXEC_ARGS
$EXEC
$EXEC_ARGS
This diff is collapsed.
Click to expand it.
src/cmake_targets/autotests/v2/actions/execution_compile.bash
View file @
bbee4d98
cd
/tmp/oai_test_setup/oai
source
oai
env
source
ran
env
sudo
rmmod nasmesh
||
true
sudo
rmmod ue_ip
||
true
cd
cmake_targets
...
...
This diff is collapsed.
Click to expand it.
src/cmake_targets/autotests/v2/actions/run_enb.bash
View file @
bbee4d98
...
...
@@ -2,11 +2,11 @@
stty
isig intr ^C
cd
/tmp/oai_test_setup/oai
source
oai
env
source
ran
env
sudo
rmmod nasmesh
||
true
sudo
rmmod ue_ip
||
true
cd
cmake_targets/ran_build/build
ulimit
-c
unlimited
sudo rm
-f
core
#sudo -E ./lte-softmodem -O $OPENAIR_DIR/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.conf
sudo
-E
./lte-softmodem
-O
/tmp/enb.conf
\ No newline at end of file
sudo
-E
./lte-softmodem
-O
/tmp/enb.conf
This diff is collapsed.
Click to expand it.
src/cmake_targets/autotests/v2/actions/start_3276.bash
View file @
bbee4d98
...
...
@@ -2,7 +2,7 @@
stty
isig intr ^C
cd
/tmp/oai_test_setup/oai
source
oai
env
source
ran
env
sudo
rmmod nasmesh
||
true
sudo
rmmod ue_ip
||
true
cd
cmake_targets/autotests/v2/actions
...
...
This diff is collapsed.
Click to expand it.
src/cmake_targets/autotests/v2/actions/start_bandrich.bash
View file @
bbee4d98
...
...
@@ -15,7 +15,7 @@ stty isig intr ^C
#while [ ! -e /dev/bandrich ]; do sleep 1; done
cd
/tmp/oai_test_setup/oai
source
oai
env
source
ran
env
sudo
rmmod nasmesh
||
true
sudo
rmmod ue_ip
||
true
cd
cmake_targets/autotests/v2/actions
...
...
This diff is collapsed.
Click to expand it.
src/cmake_targets/build_
oai
→
src/cmake_targets/build_
ran
View file @
bbee4d98
...
...
@@ -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"
}
...
...
This diff is collapsed.
Click to expand it.
src/common/utils/telnetsrv/DOC/telnetusage.md
View file @
bbee4d98
...
...
@@ -3,7 +3,7 @@ By default the embedded telnet server, which is implemented in a shared library,
```
bash
cd
\<
oai repository
\>
/openairinterface5g
source
oai
env
source
ran
env
cd
cmake_targets
./build_oai
--build-lib
telnetsrv
```
...
...
This diff is collapsed.
Click to expand it.
src/
oai
env
→
src/
ran
env
View file @
bbee4d98
...
...
@@ -7,14 +7,14 @@ export OPENAIR_TARGETS=$OPENAIR_HOME/targets
export PATH=$PATH:$OPENAIR_TARGETS/bin
alias
oai
='cd $OPENAIR_HOME'
alias
oai
0='cd $OPENAIR0_DIR'
alias
oai
1='cd $PHY_DIR'
alias
oai
2='cd $MAC_DIR'
alias
oai
t='cd $OPENAIR_TARGETS'
alias
oai
lte='cd $OPENAIR_TARGETS/RT/USER'
alias
oai
s='cd $OPENAIR_TARGETS/SIMU/USER'
alias
oai
ex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
alias
ran
='cd $OPENAIR_HOME'
alias
ran
0='cd $OPENAIR0_DIR'
alias
ran
1='cd $PHY_DIR'
alias
ran
2='cd $MAC_DIR'
alias
ran
t='cd $OPENAIR_TARGETS'
alias
ran
lte='cd $OPENAIR_TARGETS/RT/USER'
alias
ran
s='cd $OPENAIR_TARGETS/SIMU/USER'
alias
ran
ex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
export IIOD_REMOTE=192.168.1.2
#export IIOD_REMOTE=192.168.1.11
...
...
This diff is collapsed.
Click to expand it.
src/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme
View file @
bbee4d98
...
...
@@ -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
oai
env
gedit
ran
env
export IIOD_REMOTE=192.168.1.11
...
...
@@ -67,7 +67,7 @@ compilation:
------------
sudo cset shield --reset
cd eur_oai_develop-nr/openairinterface5g/
source
oai
env
source
ran
env
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
oai
env
source
ran
env
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
oai
env
gedit
ran
env
export IIOD_REMOTE=192.168.1.21
...
...
@@ -113,7 +113,7 @@ compilation:
------------
sudo cset shield --reset
cd eur_oai_develop-nr/openairinterface5g/
source
oai
env
source
ran
env
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
oai
env
source
ran
env
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
This diff is collapsed.
Click to expand it.
src/targets/ARCH/tcp_bridge/README.tcp_bridge_oai
View file @
bbee4d98
...
...
@@ -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]
.
oai
env
.
ran
env
cd cmake_targets
./build_oai -I -w USRP
./build_oai --basic-simulator
...
...
This diff is collapsed.
Click to expand it.
src/targets/DOCS/nfapi-L2-emulator-setup.txt
View file @
bbee4d98
#Build instructions
source
oai
env
source
ran
env
cd cmake_targets
#Create lte-uesoftmodem-nos1 (UE) and lte-softmodem-nos1 (eNB) executables
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment