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
lizhongxiao
OpenXG UE
Commits
d113a4c5
Commit
d113a4c5
authored
Mar 21, 2021
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
:( remove sanitize=address option, fix some cppchecks
parent
f882ff76
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
65 deletions
+47
-65
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+25
-30
cmake_targets/build_oai
cmake_targets/build_oai
+0
-4
common/utils/LOG/log.c
common/utils/LOG/log.c
+1
-1
common/utils/ocp_itti/intertask_interface.cpp
common/utils/ocp_itti/intertask_interface.cpp
+3
-1
openair1/PHY/TOOLS/nr_phy_scope.c
openair1/PHY/TOOLS/nr_phy_scope.c
+1
-1
openair1/SIMULATION/TOOLS/random_channel.c
openair1/SIMULATION/TOOLS/random_channel.c
+17
-28
No files found.
cmake_targets/CMakeLists.txt
View file @
d113a4c5
This diff is collapsed.
Click to expand it.
cmake_targets/build_oai
View file @
d113a4c5
...
...
@@ -421,10 +421,6 @@ function main() {
CMAKE_CMD
=
"
$CMAKE_CMD
-GNinja"
MAKE_CMD
=
ninja
shift
;;
--sanitize
)
CMAKE_CMD
=
"
$CMAKE_CMD
-Dbuild_sanitize=1"
MAKE_CMD
=
ninja
shift
;;
--ittiSIM
)
ittiSIM
=
1
ITTI_SIM
=
"True"
...
...
common/utils/LOG/log.c
View file @
d113a4c5
...
...
@@ -243,7 +243,7 @@ int write_file_matlab(const char *fname,
fprintf
(
fp
,
"%d
\n
"
,((
unsigned
char
*
)
&
data
)[
0
]);
break
;
default:
AssertFatal
(
false
,
"unknown dump format: %
d
\n
"
,
format
);
AssertFatal
(
false
,
"unknown dump format: %
u
\n
"
,
format
);
}
if
((
format
!=
10
&&
format
!=
11
&&
format
!=
12
&&
format
!=
13
&&
format
!=
15
)
||
multiVec
)
{
...
...
common/utils/ocp_itti/intertask_interface.cpp
View file @
d113a4c5
...
...
@@ -339,7 +339,9 @@ extern "C" {
int
itti_create_queue
(
const
task_info_t
*
taskInfo
)
{
pthread_mutex_lock
(
&
lock_nb_queues
);
int
newQueue
=
nb_queues
++
;
AssertFatal
(
tasks
=
(
task_list_t
**
)
realloc
(
tasks
,
nb_queues
*
sizeof
(
*
tasks
)),
""
);
task_list_t
**
tmp
=
(
task_list_t
**
)
realloc
(
tasks
,
nb_queues
*
sizeof
(
*
tasks
));
AssertFatal
(
tmp
!=
NULL
,
""
);
tasks
=
tmp
;
tasks
[
newQueue
]
=
new
task_list_t
;
pthread_mutex_unlock
(
&
lock_nb_queues
);
LOG_I
(
TMR
,
"Starting itti queue: %s as task %d
\n
"
,
taskInfo
->
name
,
newQueue
);
...
...
openair1/PHY/TOOLS/nr_phy_scope.c
View file @
d113a4c5
...
...
@@ -242,7 +242,7 @@ static void genericWaterFall (OAIgraph_t *graph, scopeSample_t *values, const in
for
(
int
pix
=
0
;
pix
<
graph
->
w
;
pix
++
)
{
scopeSample_t
*
end
=
values
+
(
pix
+
1
)
*
samplesPerPixel
;
end
-=
2
;
AssertFatal
(
end
<=
values
+
datasize
,
"diff : %l
d
"
,
end
-
values
+
datasize
);
AssertFatal
(
end
<=
values
+
datasize
,
"diff : %l
u
"
,
end
-
values
+
datasize
);
double
val
=
0
;
for
(
scopeSample_t
*
s
=
values
+
(
pix
)
*
samplesPerPixel
;
...
...
openair1/SIMULATION/TOOLS/random_channel.c
View file @
d113a4c5
...
...
@@ -62,7 +62,7 @@ static double snr_dB=25;
static
double
sinr_dB
=
0
;
static
unsigned
int
max_chan
;
static
channel_desc_t
**
defined_channels
;
static
char
modellist_name
[
MAX_OPTNAME_SIZE
]
=
""
;
static
char
modellist_name
[
MAX_OPTNAME_SIZE
]
=
{
0
}
;
void
fill_channel_desc
(
channel_desc_t
*
chan_desc
,
...
...
@@ -227,7 +227,6 @@ double tdl_a_amps_dB[] = {-13.4,
-
16
.
6
,
-
19
.
9
,
-
29
.
7
};
#define TDL_A_PATHS 23
double
tdl_b_delays
[]
=
{
0
.
0000
,
0
.
1072
,
...
...
@@ -276,7 +275,6 @@ double tdl_b_amps_dB[] = {0,
-
14
.
9
,
-
9
.
2
,
-
11
.
3
};
#define TDL_B_PATHS 23
double
tdl_c_delays
[]
=
{
0
,
0
.
2099
,
...
...
@@ -327,7 +325,6 @@ double tdl_c_amps_dB[] = {-4.4,
-
15
.
7
,
-
21
.
6
,
-
22
.
8
};
#define TDL_C_PATHS 24
double
tdl_d_delays
[]
=
{
//0,
0
,
...
...
@@ -360,7 +357,6 @@ double tdl_d_amps_dB[] = {//-0.2,
-
30
.
0
,
-
27
.
7
};
#define TDL_D_PATHS 13
#define TDL_D_RICEAN_FACTOR .046774
double
tdl_e_delays
[]
=
{
0
,
...
...
@@ -395,7 +391,6 @@ double tdl_e_amps_dB[] = {//-0.03,
-
29
.
8
,
-
29
.
2
};
#define TDL_E_PATHS 14
#define TDL_E_RICEAN_FACTOR 0.0063096
double
epa_delays
[]
=
{
0
,.
03
,.
07
,.
09
,.
11
,.
19
,.
41
};
...
...
@@ -540,7 +535,6 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
LOG_I
(
OCM
,
"Channel Model (inside of new_channel_desc_scm)=%d
\n\n
"
,
channel_model
);
int
tdl_paths
=
0
;
double
tdl_ricean_factor
=
1
;
double
*
tdl_amps_dB
;
double
*
tdl_delays
;
...
...
@@ -676,36 +670,32 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
break
;
/* tapped delay line (TDL) channel model from TR 38.901 Section 7.7.2 */
#define tdl_m(MoDel)\
DevAssert(sizeof(tdl_ ## MoDel ## _amps_dB) == sizeof(tdl_ ## MoDel ## _delays)); \
tdl_paths=sizeof(tdl_ ## MoDel ## _amps_dB)/sizeof(*tdl_ ## MoDel ## _amps_dB);\
tdl_delays=tdl_ ## MoDel ## _delays;\
tdl_amps_dB=tdl_ ## MoDel ## _amps_dB
case
TDL_A
:
case
TDL_B
:
case
TDL_C
:
case
TDL_D
:
case
TDL_E
:
chan_desc
->
ricean_factor
=
1
;
if
(
channel_model
==
TDL_A
)
{
tdl_paths
=
TDL_A_PATHS
;
tdl_delays
=
tdl_a_delays
;
tdl_amps_dB
=
tdl_a_amps_dB
;
tdl_m
(
a
);
}
else
if
(
channel_model
==
TDL_B
)
{
tdl_paths
=
TDL_B_PATHS
;
tdl_delays
=
tdl_b_delays
;
tdl_amps_dB
=
tdl_b_amps_dB
;
tdl_m
(
b
);
}
else
if
(
channel_model
==
TDL_C
)
{
tdl_paths
=
TDL_C_PATHS
;
tdl_delays
=
tdl_c_delays
;
tdl_amps_dB
=
tdl_c_amps_dB
;
printf
(
"Initializing TDL_C channel with %d paths
\n
"
,
TDL_C_PATHS
);
tdl_m
(
c
);
}
else
if
(
channel_model
==
TDL_D
)
{
tdl_paths
=
TDL_D_PATHS
;
tdl_delays
=
tdl_d_delays
;
tdl_amps_dB
=
tdl_d_amps_dB
;
tdl_ricean_factor
=
TDL_D_RICEAN_FACTOR
;
tdl_m
(
d
);
chan_desc
->
ricean_factor
=
TDL_D_RICEAN_FACTOR
;
}
else
if
(
channel_model
==
TDL_E
)
{
tdl_paths
=
TDL_E_PATHS
-
1
;
tdl_delays
=
tdl_e_delays
+
1
;
tdl_amps_dB
=
tdl_e_amps_dB
;
tdl_ricean_factor
=
TDL_E_RICEAN_FACTOR
;
}
tdl_m
(
e
);
chan_desc
->
ricean_factor
=
TDL_E_RICEAN_FACTOR
;
}
int
tdl_pathsby3
=
tdl_paths
/
3
;
if
((
tdl_paths
%
3
)
>
0
)
tdl_pathsby3
++
;
...
...
@@ -728,7 +718,6 @@ channel_desc_t *new_channel_desc_scm(uint8_t nb_tx,
tdl_delays
[
i
]
*=
DS_TDL
;
}
chan_desc
->
delays
=
tdl_delays
;
chan_desc
->
ricean_factor
=
tdl_ricean_factor
;
chan_desc
->
aoa
=
0
;
chan_desc
->
random_aoa
=
0
;
chan_desc
->
ch
=
(
struct
complex
**
)
malloc
(
nb_tx
*
nb_rx
*
sizeof
(
struct
complex
*
));
...
...
@@ -2034,7 +2023,7 @@ int load_channellist(uint8_t nb_tx, uint8_t nb_rx, double sampling_rate, double
paramdef_t
achannel_params
[]
=
CHANNELMOD_MODEL_PARAMS_DESC
;
paramlist_def_t
channel_list
;
memset
(
&
channel_list
,
0
,
sizeof
(
paramlist_def_t
));
strncpy
(
channel_list
.
listname
,
modellist_name
,
MAX_OPTNAME_SIZE
-
1
);
memcpy
(
channel_list
.
listname
,
modellist_name
,
sizeof
(
channel_list
.
listname
)
-
1
);
int
numparams
=
sizeof
(
achannel_params
)
/
sizeof
(
paramdef_t
);
config_getlist
(
&
channel_list
,
achannel_params
,
numparams
,
CHANNELMOD_SECTION
);
...
...
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