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
20ffa1fd
Commit
20ffa1fd
authored
Jan 30, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: fixing a few compilation warnings
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
4579e632
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
executables/nr-gnb.c
executables/nr-gnb.c
+1
-4
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+3
-3
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
+3
-0
No files found.
executables/nr-gnb.c
View file @
20ffa1fd
...
...
@@ -412,10 +412,8 @@ int wakeup_txfh(PHY_VARS_gNB *gNB,gNB_L1_rxtx_proc_t *proc,int frame_tx,int slot
RU_t
*
ru
;
RU_proc_t
*
ru_proc
;
int
waitret
,
ret
;
int
waitret
=
0
,
ret
;
// note this should depend on the numerology used by the TX L1 thread, set here for 500us slot time
AssertFatal
((
ret
=
pthread_mutex_lock
(
&
proc
->
mutex_RUs_tx
))
==
0
,
"mutex_lock returns %d
\n
"
,
ret
);
while
(
proc
->
instance_cnt_RUs
<
0
)
{
...
...
@@ -425,7 +423,6 @@ int wakeup_txfh(PHY_VARS_gNB *gNB,gNB_L1_rxtx_proc_t *proc,int frame_tx,int slot
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_UE
,
proc
->
instance_cnt_RUs
);
AssertFatal
((
ret
=
pthread_mutex_unlock
(
&
proc
->
mutex_RUs_tx
))
==
0
,
"mutex_unlock returns %d
\n
"
,
ret
);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_UE
,
proc
->
instance_cnt_RUs
);
if
(
waitret
==
ETIMEDOUT
)
{
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
20ffa1fd
...
...
@@ -358,7 +358,7 @@ void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id,
void
nr_fill_crc_indication
(
PHY_VARS_gNB
*
gNB
,
int
frame
,
int
slot_rx
,
int
UE_id
,
uint8_t
crc_flag
){
// pthread_mutex_lock(&gNB->UL_INFO_mutex);
nfapi_crc_indication_pdu_t
*
pdu
=
&
gNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
crc_pdu_list
[
gNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
];
//
nfapi_crc_indication_pdu_t *pdu = &gNB->UL_INFO.crc_ind.crc_indication_body.crc_pdu_list[gNB->UL_INFO.crc_ind.crc_indication_body.number_of_crcs];
// gNB->UL_INFO.crc_ind.sfn_sf = frame<<4 | subframe;
// gNB->UL_INFO.crc_ind.header.message_id = NFAPI_CRC_INDICATION;
// gNB->UL_INFO.crc_ind.crc_indication_body.tl.tag = NFAPI_CRC_INDICATION_BODY_TAG;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
20ffa1fd
...
...
@@ -2067,8 +2067,8 @@ void nr_ue_send_sdu(module_id_t module_idP,
if
(
opt_enabled
)
{
trace_pdu
(
DIRECTION_DOWNLINK
,
pduP
,
pdu_len
,
module_idP
,
WS_C_RNTI
,
UE_mac_inst
[
module_idP
].
cs_RNTI
,
frameP
,
ttiP
,
0
,
0
);
//subframeP
LOG_D
(
OPT
,
"[UE %d][DLSCH] Frame %d trace pdu for rnti %
x
with size %d
\n
"
,
(
int
)
UE_mac_inst
[
module_idP
].
cs_RNTI
,
frameP
,
ttiP
,
0
,
0
);
//subframeP
LOG_D
(
OPT
,
"[UE %d][DLSCH] Frame %d trace pdu for rnti %
p
with size %d
\n
"
,
module_idP
,
frameP
,
UE_mac_inst
[
module_idP
].
cs_RNTI
,
pdu_len
);
}
...
...
@@ -2115,7 +2115,7 @@ void nr_ue_process_mac_pdu(
// This function is adapting code from the old
// parse_header(...) and ue_send_sdu(...) functions of OAI LTE
uint8_t
*
pdu_ptr
=
pduP
,
rx_lcid
,
done
=
0
,
i
;
uint8_t
*
pdu_ptr
=
pduP
,
rx_lcid
,
done
=
0
;
int
pdu_len
=
mac_pdu_len
;
uint16_t
mac_ce_len
,
mac_subheader_len
,
mac_sdu_len
;
...
...
openair2/RRC/LTE/rrc_eNB_S1AP.c
View file @
20ffa1fd
...
...
@@ -1686,6 +1686,9 @@ int rrc_eNB_process_S1AP_E_RAB_RELEASE_COMMAND(MessageDef *msg_p, const char *ms
memcpy
(
&
e_rab_release_params
[
0
],
&
(
S1AP_E_RAB_RELEASE_COMMAND
(
msg_p
).
e_rab_release_params
[
0
]),
sizeof
(
e_rab_release_t
)
*
S1AP_MAX_E_RAB
);
eNB_ue_s1ap_id
=
S1AP_E_RAB_RELEASE_COMMAND
(
msg_p
).
eNB_ue_s1ap_id
;
nb_e_rabs_torelease
=
S1AP_E_RAB_RELEASE_COMMAND
(
msg_p
).
nb_e_rabs_torelease
;
if
(
nb_e_rabs_torelease
>
S1AP_MAX_E_RAB
)
{
return
-
1
;
}
ue_context_p
=
rrc_eNB_get_ue_context_from_s1ap_ids
(
instance
,
UE_INITIAL_ID_INVALID
,
eNB_ue_s1ap_id
);
if
(
ue_context_p
!=
NULL
)
{
...
...
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