Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
09831815
Commit
09831815
authored
Dec 23, 2016
by
Raymond Knopp
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes for sidekiq
parent
467384bc
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
75 additions
and
544 deletions
+75
-544
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+23
-6
cmake_targets/build_oai
cmake_targets/build_oai
+15
-15
openair1/PHY/LTE_TRANSPORT/initial_sync.c
openair1/PHY/LTE_TRANSPORT/initial_sync.c
+7
-3
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+2
-0
targets/ARCH/COMMON/common_lib.c
targets/ARCH/COMMON/common_lib.c
+3
-0
targets/ARCH/COMMON/common_lib.h
targets/ARCH/COMMON/common_lib.h
+2
-0
targets/ARCH/SDIQ/USERSPACE/LIB/sdiq_lib.c
targets/ARCH/SDIQ/USERSPACE/LIB/sdiq_lib.c
+0
-510
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+1
-1
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+22
-9
No files found.
cmake_targets/CMakeLists.txt
View file @
09831815
...
...
@@ -478,7 +478,7 @@ add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4
add_list1_option
(
NB_ANTENNAS_TX
"2"
"Number of antennas in transmission"
"1"
"2"
"4"
)
add_list1_option
(
NB_ANTENNAS_TXRX
"2"
"Number of antennas in ????"
"1"
"2"
"4"
)
add_list2_option
(
RF_BOARD
"EXMIMO"
"RF head type"
"None"
"EXMIMO"
"OAI_USRP"
"OAI_BLADERF"
"OAI_S
D
IQ"
"CPRIGW"
"OAI_LMSSDR"
)
add_list2_option
(
RF_BOARD
"EXMIMO"
"RF head type"
"None"
"EXMIMO"
"OAI_USRP"
"OAI_BLADERF"
"OAI_S
K
IQ"
"CPRIGW"
"OAI_LMSSDR"
)
add_list2_option
(
TRANSP_PRO
"None"
"Transport protocol type"
"None"
"ETHERNET"
)
...
...
@@ -509,12 +509,14 @@ set(HWLIB_BLADERF_SOURCE
)
add_library
(
oai_bladerfdevif MODULE
${
HWLIB_BLADERF_SOURCE
}
)
include_directories
(
"
${
OPENAIR_TARGETS
}
/ARCH/SDIQ/USERSPACE/LIB/"
)
set
(
option_HWSDIQLIB_lib
"-L $(SDK)/lib/support/$(BUILD_CONFIG)/usr/lib/epiq -lglib-2.0 -Wl,--enable-new-dtags -Wl,-rpath,/usr/lib/epiq "
)
set
(
HWLIB_SDIQ_SOURCE
${
OPENAIR_TARGETS
}
/ARCH/SDIQ/USERSPACE/LIB/sdiq_lib.c
set
(
SKIQ_SDK $ENV{SKIQ_SDK}
)
include_directories
(
"
${
OPENAIR_TARGETS
}
/ARCH/SKIQ/USERSPACE/LIB/"
)
set
(
option_HWSKIQLIB_lib
"-L
${
SKIQ_SDK
}
/lib/support/x86_64.gcc/usr/lib/epiq
${
SKIQ_SDK
}
/lib/libsidekiq__x86_64.gcc.a
${
SKIQ_SDK
}
/arg_parser/lib/arg_parser__x86_64.gcc.a -lglib-2.0 -Wl,--enable-new-dtags -Wl,-rpath,/usr/lib/epiq "
)
set
(
HWLIB_SKIQ_SOURCE
${
OPENAIR_TARGETS
}
/ARCH/SKIQ/USERSPACE/LIB/skiq_lib.c
)
add_library
(
oai_s
diqdevif MODULE
${
HWLIB_SDIQ_SOURCE
}
)
add_library
(
oai_s
kiqdevif MODULE
${
HWLIB_SKIQ_SOURCE
}
)
include_directories
(
"
${
OPENAIR_TARGETS
}
/ARCH/LMSSDR/USERSPACE/LIB/"
)
set
(
option_HWLMSSDRLIB_lib
"-l LMS_SDR -l LMS7002M -l Si5351C"
)
...
...
@@ -562,6 +564,21 @@ elseif (${RF_BOARD} STREQUAL "OAI_BLADERF")
set
(
option_HW_lib
"bladeRF -rdynamic -ldl"
)
elseif
(
${
RF_BOARD
}
STREQUAL
"OAI_SKIQ"
)
include_directories
(
"
${
OPENAIR_TARGETS
}
/ARCH/SKIQ/USERSPACE/LIB/"
)
include_directories
(
"
${
OPENAIR2_DIR
}
/UTIL/LOG"
)
include_directories
(
"/usr/include"
)
include_directories
(
"
${
SKIQ_SDK
}
/sidekiq_core/inc"
)
set
(
HW_SOURCE
${
HW_SOURCE
}
${
OPENAIR_TARGETS
}
/ARCH/SKIQ/USERSPACE/LIB/skiq_lib.c
)
LINK_DIRECTORIES
(
"/usr/lib/x86_64-linux-gnu"
)
set
(
option_HW_lib
"-L
${
SKIQ_SDK
}
/lib/support/x86_64.gcc/usr/lib/epiq
${
SKIQ_SDK
}
/lib/libsidekiq__x86_64.gcc.a
${
SKIQ_SDK
}
/arg_parser/lib/arg_parser__x86_64.gcc.a \
-lglib-2.0 \
-Wl,--enable-new-dtags \
-Wl,-rpath,/usr/lib/epiq"
)
elseif
(
${
RF_BOARD
}
STREQUAL
"OAI_LMSSDR"
)
include_directories
(
"
${
OPENAIR_TARGETS
}
/ARCH/LMSSDR/USERSPACE/LIB"
)
include_directories
(
"
${
OPENAIR_TARGETS
}
/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR"
)
...
...
cmake_targets/build_oai
View file @
09831815
...
...
@@ -87,7 +87,7 @@ Options
default is Rel10,
Rel8 limits the implementation to 3GPP Release 8 version
-w | --hardware
EXMIMO, USRP, S
D
IQ, BLADERF, ETHERNET, LMSSDR, None (Default)
EXMIMO, USRP, S
K
IQ, BLADERF, ETHERNET, LMSSDR, None (Default)
Adds this RF board support (in external packages installation and in compilation)
-t | --transport protocol
ETHERNET , None
...
...
@@ -184,7 +184,7 @@ function main() {
-w
|
--hardware
)
HW
=
"
$2
"
#"${i#*=}"
# Use OAI_USRP as the key word USRP is used inside UHD driver
if
[
"
$HW
"
!=
"S
D
IQ"
-a
"
$HW
"
!=
"BLADERF"
-a
"
$HW
"
!=
"USRP"
-a
"
$HW
"
!=
"LMSSDR"
-a
"
$HW
"
!=
"None"
-a
"
$HW
"
!=
"EXMIMO"
]
;
then
if
[
"
$HW
"
!=
"S
K
IQ"
-a
"
$HW
"
!=
"BLADERF"
-a
"
$HW
"
!=
"USRP"
-a
"
$HW
"
!=
"LMSSDR"
-a
"
$HW
"
!=
"None"
-a
"
$HW
"
!=
"EXMIMO"
]
;
then
echo_fatal
"Unknown HW type
$HW
will exit..."
else
if
[
"
$HW
"
==
"USRP"
]
;
then
...
...
@@ -193,8 +193,8 @@ function main() {
if
[
"
$HW
"
==
"BLADERF"
]
;
then
HW
=
"OAI_BLADERF"
fi
if
[
"
$HW
"
==
"S
D
IQ"
]
;
then
HW
=
"OAI_S
D
IQ"
if
[
"
$HW
"
==
"S
K
IQ"
]
;
then
HW
=
"OAI_S
K
IQ"
fi
if
[
"
$HW
"
==
"LMSSDR"
]
;
then
HW
=
"OAI_LMSSDR"
...
...
@@ -321,7 +321,7 @@ function main() {
#Now we set flags to enable deadline scheduler settings
#By default: USRP: disable,
#By default: BLADERF: enable,
#By default: S
D
IQ: enable,
#By default: S
K
IQ: enable,
#By default: EXMIMO: enable
if
[
"
$FORCE_DEADLINE_SCHEDULER_FLAG_USER
"
=
""
]
;
then
if
[
"
$HW
"
=
"EXMIMO"
]
;
then
...
...
@@ -332,7 +332,7 @@ function main() {
DEADLINE_SCHEDULER_FLAG_USER
=
"False"
elif
[
"
$HW
"
=
"OAI_BLADERF"
]
;
then
DEADLINE_SCHEDULER_FLAG_USER
=
"False"
elif
[
"
$HW
"
=
"OAI_S
D
IQ"
]
;
then
elif
[
"
$HW
"
=
"OAI_S
K
IQ"
]
;
then
DEADLINE_SCHEDULER_FLAG_USER
=
"False"
elif
[
"
$HW
"
=
"OAI_LMSSDR"
]
;
then
DEADLINE_SCHEDULER_FLAG_USER
=
"False"
...
...
@@ -401,9 +401,9 @@ function main() {
flash_firmware_bladerf
fi
fi
if
[
"
$HW
"
==
"OAI_S
D
IQ"
]
;
then
echo_info
"installing packages for S
D
IQ support"
check_install_s
d
iq_driver
if
[
"
$HW
"
==
"OAI_S
K
IQ"
]
;
then
echo_info
"installing packages for S
K
IQ support"
check_install_s
k
iq_driver
if
[
!
"
$DISABLE_HARDWARE_DEPENDENCY
"
==
"True"
]
;
then
install_usrp_uhd_driver
fi
...
...
@@ -751,15 +751,15 @@ function main() {
ln
-s
liboai_bladerfdevif.so liboai_device.so
ln
-s
$dbin
/liboai_bladerfdevif.so.
$REL
$dbin
/liboai_device.so
echo_info
"liboai_device.so is linked to BLADERF device library"
elif
[
"
$HW
"
==
"OAI_S
D
IQ"
]
;
then
if
[
-f
$
(
SDIQ_SDK
)
/sidekiq_core/inc
]
;
then
elif
[
"
$HW
"
==
"OAI_S
K
IQ"
]
;
then
if
[
-f
$
SKIQ_SDK
/sidekiq_core/inc
]
;
then
compilations
\
$build_dir
oai_s
ide
kiqdevif
\
liboai_s
idekiqdevif.so
$dbin
/liboai_side
kiqdevif.so.
$REL
$build_dir
oai_skiqdevif
\
liboai_s
kiqdevif.so
$dbin
/liboai_s
kiqdevif.so.
$REL
fi
ln
-s
liboai_s
ide
kiqdevif.so liboai_device.so
ln
-s
$dbin
/liboai_s
ide
kiqdevif.so.
$REL
$dbin
/liboai_device.so
ln
-s
liboai_skiqdevif.so liboai_device.so
ln
-s
$dbin
/liboai_skiqdevif.so.
$REL
$dbin
/liboai_device.so
echo_info
"liboai_device.so is linked to SIDEKIQ device library"
elif
[
"
$HW
"
==
"OAI_LMSSDR"
]
;
then
# if [ -f "/usr/include/libbladeRF.h" ] ; then
...
...
openair1/PHY/LTE_TRANSPORT/initial_sync.c
View file @
09831815
...
...
@@ -508,7 +508,7 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode)
phich_string
[
ue
->
frame_parms
.
phich_config_common
.
phich_resource
],
ue
->
frame_parms
.
nb_antennas_tx_eNB
);
#if defined(OAI_USRP) || defined(EXMIMO) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
#if defined(OAI_USRP) || defined(EXMIMO) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
|| defined(OAI_SKIQ)
LOG_I
(
PHY
,
"[UE %d] Frame %d Measured Carrier Frequency %.0f Hz (offset %d Hz)
\n
"
,
ue
->
Mod_id
,
ue
->
proc
.
proc_rxtx
[
0
].
frame_rx
,
...
...
@@ -564,22 +564,26 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode)
#ifndef OAI_USRP
#ifndef OAI_BLADERF
#ifndef OAI_LMSSDR
#ifndef OAI_SKIQ
phy_adjust_gain
(
ue
,
ue
->
measurements
.
rx_power_avg_dB
[
0
],
0
);
#endif
#endif
#endif
#endif
}
else
{
#ifndef OAI_USRP
#ifndef OAI_BLADERF
#ifndef OAI_LMSSDR
#ifndef OAI_SKIQ
phy_adjust_gain
(
ue
,
dB_fixed
(
ue
->
measurements
.
rssi
),
0
);
#endif
#endif
#endif
#endif
}
// exit_fun("debug exit");
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
09831815
...
...
@@ -1476,9 +1476,11 @@ void ue_measurement_procedures(uint16_t l, PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,
#ifndef OAI_USRP
#ifndef OAI_BLADERF
#ifndef OAI_LMSSDR
#ifndef OAI_SKIQ
phy_adjust_gain
(
ue
,
dB_fixed
(
ue
->
measurements
.
rssi
),
0
);
#endif
#endif
#endif
#endif
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL
,
VCD_FUNCTION_OUT
);
...
...
targets/ARCH/COMMON/common_lib.c
View file @
09831815
...
...
@@ -56,6 +56,9 @@ case USRP_X300_DEV:
case
LMSSDR_DEV
:
printf
(
"[%s] has loaded LMSSDR device.
\n
"
,((
device
->
host_type
==
BBU_HOST
)
?
"BBU"
:
"RRH"
));
break
;
case
SKIQ_DEV
:
printf
(
"[%s] has loaded Sidekiq device.
\n
"
,((
device
->
host_type
==
BBU_HOST
)
?
"BBU"
:
"RRH"
));
break
;
case
NONE_DEV
:
printf
(
"[%s] has not loaded a HW device.
\n
"
,((
device
->
host_type
==
BBU_HOST
)
?
"BBU"
:
"RRH"
));
break
;
...
...
targets/ARCH/COMMON/common_lib.h
View file @
09831815
...
...
@@ -94,6 +94,8 @@ typedef enum {
BLADERF_DEV
,
/*!\brief device is LMSSDR (SoDeRa)*/
LMSSDR_DEV
,
/*!\brief device is SKIQ*/
SKIQ_DEV
,
/*!\brief device is NONE*/
NONE_DEV
,
MAX_RF_DEV_TYPE
...
...
targets/ARCH/SDIQ/USERSPACE/LIB/sdiq_lib.c
deleted
100644 → 0
View file @
467384bc
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-softmodem.c
View file @
09831815
...
...
@@ -704,7 +704,7 @@ static void get_options (int argc, char **argv)
{
"no-L2-connect"
,
no_argument
,
NULL
,
LONG_OPTION_NO_L2_CONNECT
},
{
"calib-prach-tx"
,
no_argument
,
NULL
,
LONG_OPTION_CALIB_PRACH_TX
},
{
"ue-rxgain"
,
required_argument
,
NULL
,
LONG_OPTION_RXGAIN
},
{
"ue-rxgain-off"
,
required_argument
,
NULL
,
LONG_OPTION_RXGAINOFF
},
{
"ue-rxgain-off"
,
required_argument
,
NULL
,
LONG_OPTION_RXGAINOFF
},
{
"ue-txgain"
,
required_argument
,
NULL
,
LONG_OPTION_TXGAIN
},
{
"ue-scan-carrier"
,
no_argument
,
NULL
,
LONG_OPTION_SCANCARRIER
},
{
"ue-max-power"
,
required_argument
,
NULL
,
LONG_OPTION_MAXPOWER
},
...
...
targets/RT/USER/lte-ue.c
View file @
09831815
...
...
@@ -568,8 +568,8 @@ static void *UE_thread_synch(void *arg)
openair0_cfg
[
card
].
rx_gain
[
i
]
=
UE
->
rx_total_gain_dB
;
//-USRP_GAIN_OFFSET;
UE
->
rfdevice
.
trx_set_freq_func
(
&
UE
->
rfdevice
,
&
openair0_cfg
[
0
],
0
);
UE
->
rfdevice
.
trx_set_freq_func
(
&
UE
->
rfdevice
,
&
openair0_cfg
[
0
],
0
);
// usleep(1000);
}
}
...
...
@@ -869,11 +869,11 @@ void *UE_thread(void *arg) {
attr
.
sched_nice
=
0
;
attr
.
sched_priority
=
0
;
//sched_get_priority_max(SCHED_DEADLINE);
// This creates a .5 ms reservation
// This creates a .5 ms reservation
every 1ms
attr
.
sched_policy
=
SCHED_DEADLINE
;
attr
.
sched_runtime
=
1
00000
;
attr
.
sched_runtime
=
5
00000
;
attr
.
sched_deadline
=
500000
;
attr
.
sched_period
=
5
00000
;
attr
.
sched_period
=
10
00000
;
if
(
sched_setattr
(
0
,
&
attr
,
flags
)
<
0
)
{
perror
(
"[SCHED] main eNB thread: sched_setattr failed
\n
"
);
...
...
@@ -926,18 +926,19 @@ void *UE_thread(void *arg) {
exit_fun
(
"nothing to add"
);
return
&
UE_thread_retval
;
}
if
(
instance_cnt_synch
<
0
)
{
// we can invoke the synch
// grab 10 ms of signal and wakeup synch thread
for
(
int
i
=
0
;
i
<
UE
->
frame_parms
.
nb_antennas_rx
;
i
++
)
rxp
[
i
]
=
(
void
*
)
&
rxdata
[
i
][
0
];
if
(
UE
->
mode
!=
loop_through_memory
)
{
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
rxs
=
UE
->
rfdevice
.
trx_read_func
(
&
UE
->
rfdevice
,
&
timestamp
,
rxp
,
UE
->
frame_parms
.
samples_per_tti
*
10
,
UE
->
frame_parms
.
nb_antennas_rx
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
if
(
rxs
!=
UE
->
frame_parms
.
samples_per_tti
*
10
)
{
...
...
@@ -945,7 +946,7 @@ void *UE_thread(void *arg) {
return
&
UE_thread_retval
;
}
}
instance_cnt_synch
=
++
UE
->
proc
.
instance_cnt_synch
;
if
(
instance_cnt_synch
==
0
)
{
if
(
pthread_cond_signal
(
&
UE
->
proc
.
cond_synch
)
!=
0
)
{
...
...
@@ -958,6 +959,7 @@ void *UE_thread(void *arg) {
exit_fun
(
"nothing to add"
);
return
&
UE_thread_retval
;
}
}
//
else
{
// grab 10 ms of signal into dummy buffer
...
...
@@ -967,11 +969,14 @@ void *UE_thread(void *arg) {
rxp
[
i
]
=
(
void
*
)
&
dummy_rx
[
i
][
0
];
for
(
int
sf
=
0
;
sf
<
10
;
sf
++
)
{
// printf("Reading dummy sf %d\n",sf);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
rxs
=
UE
->
rfdevice
.
trx_read_func
(
&
UE
->
rfdevice
,
&
timestamp
,
rxp
,
UE
->
frame_parms
.
samples_per_tti
,
UE
->
frame_parms
.
nb_antennas_rx
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
if
(
rxs
!=
UE
->
frame_parms
.
samples_per_tti
){
exit_fun
(
"problem in rx"
);
...
...
@@ -1005,11 +1010,14 @@ void *UE_thread(void *arg) {
UE
->
proc
.
proc_rxtx
[
1
].
frame_rx
++
;
// read in first symbol
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
rxs
=
UE
->
rfdevice
.
trx_read_func
(
&
UE
->
rfdevice
,
&
timestamp
,
(
void
**
)
rxdata
,
UE
->
frame_parms
.
ofdm_symbol_size
+
UE
->
frame_parms
.
nb_prefix_samples0
,
UE
->
frame_parms
.
nb_antennas_rx
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
slot_fep
(
UE
,
0
,
0
,
...
...
@@ -1033,14 +1041,16 @@ void *UE_thread(void *arg) {
for
(
i
=
0
;
i
<
UE
->
frame_parms
.
nb_antennas_rx
;
i
++
)
rxp
[
i
]
=
(
void
*
)
&
rxdata
[
i
][
UE
->
frame_parms
.
ofdm_symbol_size
+
UE
->
frame_parms
.
nb_prefix_samples0
+
(
sf
*
UE
->
frame_parms
.
samples_per_tti
)];
// grab signal for subframe
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
if
(
UE
->
mode
!=
loop_through_memory
)
{
if
(
sf
<
9
)
{
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
rxs
=
UE
->
rfdevice
.
trx_read_func
(
&
UE
->
rfdevice
,
&
timestamp
,
rxp
,
UE
->
frame_parms
.
samples_per_tti
,
UE
->
frame_parms
.
nb_antennas_rx
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
1
);
// prepare tx buffer pointers
...
...
@@ -1066,11 +1076,13 @@ void *UE_thread(void *arg) {
}
else
{
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
rxs
=
UE
->
rfdevice
.
trx_read_func
(
&
UE
->
rfdevice
,
&
timestamp
,
rxp
,
UE
->
frame_parms
.
samples_per_tti
-
UE
->
frame_parms
.
ofdm_symbol_size
-
UE
->
frame_parms
.
nb_prefix_samples0
,
UE
->
frame_parms
.
nb_antennas_rx
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
1
);
// prepare tx buffer pointers
...
...
@@ -1092,16 +1104,17 @@ void *UE_thread(void *arg) {
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
0
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
1
);
// read in first symbol of next frame and adjust for timing drift
rxs
=
UE
->
rfdevice
.
trx_read_func
(
&
UE
->
rfdevice
,
&
timestamp1
,
(
void
**
)
rxdata
,
UE
->
frame_parms
.
ofdm_symbol_size
+
UE
->
frame_parms
.
nb_prefix_samples0
-
rx_off_diff
,
UE
->
frame_parms
.
nb_antennas_rx
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
rx_off_diff
=
0
;
}
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
// operate on thread sf mod 2
UE_rxtx_proc_t
*
proc
=
&
UE
->
proc
.
proc_rxtx
[
sf
&
1
];
...
...
FANG WANG
@wf
mentioned in commit
b4e48d88
·
Jul 05, 2022
mentioned in commit
b4e48d88
mentioned in commit b4e48d88298e04f14b6c11fc0224cf1327224240
Toggle commit list
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