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
OpenXG
OpenXG UE
Commits
0976417f
Commit
0976417f
authored
Jun 21, 2021
by
Michael Cook
Committed by
Melissa
Jun 21, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add -Werror compiler option
Fix some warnings, too.
parent
84d396ca
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+4
-4
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+2
-1
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+3
-3
No files found.
cmake_targets/CMakeLists.txt
View file @
0976417f
...
...
@@ -306,7 +306,7 @@ endif()
#
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
C_FLAGS_PROCESSOR
}
-pipe -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -fPIC"
)
"
${
CMAKE_C_FLAGS
}
${
C_FLAGS_PROCESSOR
}
-pipe -std=gnu99 -Wall -W
error -W
strict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -fPIC"
)
# add autotools definitions that were maybe used!
if
(
CUDA_FOUND
)
set
(
MKVER
"'MAKE_VERSION(a,b,c)=((a)*256+(b)*16+c)'"
)
...
...
@@ -314,14 +314,14 @@ if (CUDA_FOUND)
"
${
CMAKE_C_FLAGS
}
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP -D CUDA_FLAG"
)
set
(
CUDA_CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
C_FLAGS_PROCESSOR
}
-Wno-packed-bitfield-compat -fPIC -Wall -fno-strict-aliasing -rdynamic -std=c++11 -D CUDA_FLAG"
"
${
CMAKE_CXX_FLAGS
}
${
C_FLAGS_PROCESSOR
}
-Wno-packed-bitfield-compat -fPIC -Wall -
Werror -
fno-strict-aliasing -rdynamic -std=c++11 -D CUDA_FLAG"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP -D
${
MKVER
}
-D CUDA_FLAG"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
C_FLAGS_PROCESSOR
}
-Wno-packed-bitfield-compat -fPIC -Wall -fno-strict-aliasing -rdynamic -std=c++11 -D
${
MKVER
}
-D CUDA_FLAG"
"
${
CMAKE_CXX_FLAGS
}
${
C_FLAGS_PROCESSOR
}
-Wno-packed-bitfield-compat -fPIC -Wall -
Werror -
fno-strict-aliasing -rdynamic -std=c++11 -D
${
MKVER
}
-D CUDA_FLAG"
)
else
(
CUDA_FOUND
)
set
(
MKVER
"'MAKE_VERSION(a,b,c)=((a)*256+(b)*16+c)'"
)
...
...
@@ -329,7 +329,7 @@ else (CUDA_FOUND)
"
${
CMAKE_C_FLAGS
}
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FCNTL_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_STRERROR=1 -DHAVE_SOCKET=1 -DHAVE_MEMSET=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_LIBSCTP -D
${
MKVER
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
C_FLAGS_PROCESSOR
}
-Wno-packed-bitfield-compat -fPIC -Wall -fno-strict-aliasing -rdynamic -std=c++11 -D
${
MKVER
}
"
"
${
CMAKE_CXX_FLAGS
}
${
C_FLAGS_PROCESSOR
}
-Wno-packed-bitfield-compat -fPIC -Wall -
Werror -
fno-strict-aliasing -rdynamic -std=c++11 -D
${
MKVER
}
"
)
endif
()
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
0976417f
...
...
@@ -944,7 +944,8 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
tx_req
.
tx_request_body
[
0
].
pdu_index
=
j
;
tx_req
.
tx_request_body
[
0
].
pdu
=
ulsch_input_buffer
;
if
((
ra
->
ra_state
!=
RA_SUCCEEDED
&&
!
ra
->
cfra
)
||
(
get_softmodem_params
()
->
nsa
&&
ra
->
cfra
&&
ra
->
ra_state
==
RA_SUCCEEDED
)){
if
((
ra
->
ra_state
!=
RA_SUCCEEDED
&&
!
ra
->
cfra
)
||
(
ra
->
ra_state
==
RA_SUCCEEDED
&&
ra
->
cfra
&&
get_softmodem_params
()
->
nsa
))
{
nr_Msg3_transmitted
(
ul_info
->
module_id
,
ul_info
->
cc_id
,
ul_info
->
frame_tx
,
ul_info
->
gNB_index
);
}
}
...
...
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @
0976417f
...
...
@@ -271,9 +271,9 @@ static void copy_tx_data_req_to_dl_info(nr_downlink_indication_t *dl_info, nfapi
for
(
int
j
=
0
;
j
<
pdu_list
->
num_TLV
;
j
++
)
{
if
(
pdu_list
->
TLVs
[
j
].
tag
)
dl_info
->
rx_ind
->
rx_indication_body
[
i
].
pdsch_pdu
.
pdu
=
pdu_list
->
TLVs
[
j
].
value
.
ptr
;
dl_info
->
rx_ind
->
rx_indication_body
[
i
].
pdsch_pdu
.
pdu
=
(
void
*
)
pdu_list
->
TLVs
[
j
].
value
.
ptr
;
// Melissa, fix me!
else
if
(
!
pdu_list
->
TLVs
[
j
].
tag
)
dl_info
->
rx_ind
->
rx_indication_body
[
i
].
pdsch_pdu
.
pdu
=
pdu_list
->
TLVs
[
j
].
value
.
direct
;
dl_info
->
rx_ind
->
rx_indication_body
[
i
].
pdsch_pdu
.
pdu
=
(
void
*
)
pdu_list
->
TLVs
[
j
].
value
.
direct
;
// Melissa, fix me!
dl_info
->
rx_ind
->
rx_indication_body
[
i
].
pdsch_pdu
.
pdu_length
=
pdu_list
->
TLVs
[
j
].
length
;
if
(
tx_data_request
->
Slot
==
7
)
{
//Melissa this means we have an RAR, sorta hacky though
dl_info
->
rx_ind
->
rx_indication_body
[
i
].
pdu_type
=
FAPI_NR_RX_PDU_TYPE_RAR
;
...
...
@@ -640,7 +640,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
fapi_nr_dl_config_request_t
*
dl_config
=
&
mac
->
dl_config_request
;
if
((
!
dl_info
->
dci_ind
&&
!
dl_info
->
rx_ind
)
||
(
!
def_dci_pdu_rel15
)
)
{
//Melissa review this with Raymond
if
((
!
dl_info
->
dci_ind
&&
!
dl_info
->
rx_ind
)
||
!
def_dci_pdu_rel15
)
{
//Melissa review this with Raymond
// UL indication to schedule DCI reception
nr_ue_scheduler
(
dl_info
,
NULL
);
}
else
{
...
...
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