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
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
wangjie
OpenXG-RAN
Commits
855752f4
Commit
855752f4
authored
Jan 24, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a few warnings
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
50cfaf7f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
9 deletions
+7
-9
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+1
-3
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+4
-4
No files found.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
855752f4
...
@@ -3558,7 +3558,7 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
...
@@ -3558,7 +3558,7 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue,
uint16_t
slots_per_frame
=
ue
->
frame_parms
.
slots_per_frame
;
uint16_t
slots_per_frame
=
ue
->
frame_parms
.
slots_per_frame
;
uint16_t
slots_per_subframe
=
ue
->
frame_parms
.
slots_per_subframe
;
uint16_t
slots_per_subframe
=
ue
->
frame_parms
.
slots_per_subframe
;
uint8_t
numerology
=
ue
->
frame_parms
.
numerology_index
,
mapping_type_ul
,
mapping_type_dl
;
uint8_t
numerology
=
ue
->
frame_parms
.
numerology_index
,
mapping_type_ul
,
mapping_type_dl
;
int
ul_tx_timing_adjustment
,
N_TA_max
,
factor_mu
,
N_t_1
,
N_t_2
,
N_1
,
N_2
,
d_1_1
,
d_2_1
,
d
;
int
ul_tx_timing_adjustment
,
N_TA_max
,
factor_mu
,
N_t_1
,
N_t_2
,
N_1
,
N_2
,
d_1_1
=
0
,
d_2_1
,
d
;
uint8_t
d_2_2
=
0
;
// set to 0 because there is only 1 BWP
uint8_t
d_2_2
=
0
;
// set to 0 because there is only 1 BWP
// TODO this should corresponds to the switching time as defined in
// TODO this should corresponds to the switching time as defined in
// TS 38.133
// TS 38.133
...
@@ -4276,8 +4276,6 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
...
@@ -4276,8 +4276,6 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
uint8_t
do_pdcch_flag
,
uint8_t
do_pdcch_flag
,
runmode_t
mode
)
runmode_t
mode
)
{
{
int
l
,
l2
;
int
pilot1
;
int
frame_rx
=
proc
->
frame_rx
;
int
frame_rx
=
proc
->
frame_rx
;
int
nr_tti_rx
=
proc
->
nr_tti_rx
;
int
nr_tti_rx
=
proc
->
nr_tti_rx
;
int
slot_pbch
;
int
slot_pbch
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
855752f4
...
@@ -2127,7 +2127,7 @@ void nr_ue_process_mac_pdu(
...
@@ -2127,7 +2127,7 @@ void nr_ue_process_mac_pdu(
uint16_t
mac_subheader_len
;
uint16_t
mac_subheader_len
;
uint16_t
mac_sdu_len
;
uint16_t
mac_sdu_len
;
NR_UE_MAC_INST_t
*
UE_mac_inst
=
get_mac_inst
(
module_idP
);
//
NR_UE_MAC_INST_t *UE_mac_inst = get_mac_inst(module_idP);
//uint8_t scs = UE_mac_inst->mib->subCarrierSpacingCommon;
//uint8_t scs = UE_mac_inst->mib->subCarrierSpacingCommon;
//uint16_t bwp_ul_NB_RB = UE_mac_inst->initial_bwp_ul.N_RB;
//uint16_t bwp_ul_NB_RB = UE_mac_inst->initial_bwp_ul.N_RB;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
855752f4
...
@@ -91,7 +91,7 @@ int nr_generate_dlsch_pdu(module_id_t module_idP,
...
@@ -91,7 +91,7 @@ int nr_generate_dlsch_pdu(module_id_t module_idP,
timing_advance_cmd
=
gNB
->
ta_command
;
timing_advance_cmd
=
gNB
->
ta_command
;
AssertFatal
(
timing_advance_cmd
<
64
,
"timing_advance_cmd %d > 63
\n
"
,
timing_advance_cmd
);
AssertFatal
(
timing_advance_cmd
<
64
,
"timing_advance_cmd %d > 63
\n
"
,
timing_advance_cmd
);
((
NR_MAC_CE_TA
*
)
ce_ptr
)
->
TA_COMMAND
=
timing_advance_cmd
;
//(timing_advance_cmd+31)&0x3f;
((
NR_MAC_CE_TA
*
)
ce_ptr
)
->
TA_COMMAND
=
timing_advance_cmd
;
//(timing_advance_cmd+31)&0x3f;
if
(
gNB
->
tag
->
tag_Id
!=
NULL
){
if
(
gNB
->
tag
->
tag_Id
!=
0
){
tag_id
=
gNB
->
tag
->
tag_Id
;
tag_id
=
gNB
->
tag
->
tag_Id
;
((
NR_MAC_CE_TA
*
)
ce_ptr
)
->
TAGID
=
tag_id
;
((
NR_MAC_CE_TA
*
)
ce_ptr
)
->
TAGID
=
tag_id
;
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @
855752f4
...
@@ -288,8 +288,8 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
...
@@ -288,8 +288,8 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
unsigned
char
sdu_lcids
[
NB_RB_MAX
]
=
{
0
};
unsigned
char
sdu_lcids
[
NB_RB_MAX
]
=
{
0
};
uint16_t
sdu_lengths
[
NB_RB_MAX
]
=
{
0
};
uint16_t
sdu_lengths
[
NB_RB_MAX
]
=
{
0
};
int
p
adding
=
0
,
p
ost_padding
=
0
,
ta_len
=
0
,
header_length_total
=
0
,
sdu_length_total
=
0
,
num_sdus
=
0
;
int
post_padding
=
0
,
ta_len
=
0
,
header_length_total
=
0
,
sdu_length_total
=
0
,
num_sdus
=
0
;
int
CC_id
,
lcid
,
offset
,
i
,
j
=
0
,
k
=
0
,
header_length_last
,
TBS_bytes
;
int
CC_id
,
lcid
,
offset
,
i
,
header_length_last
,
TBS_bytes
;
int
UE_id
=
0
;
int
UE_id
=
0
;
uint16_t
rnti
=
0x1234
;
uint16_t
rnti
=
0x1234
;
...
@@ -398,10 +398,10 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
...
@@ -398,10 +398,10 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
if
(
TBS_bytes
>=
2
+
header_length_total
+
sdu_length_total
+
ta_len
)
{
if
(
TBS_bytes
>=
2
+
header_length_total
+
sdu_length_total
+
ta_len
)
{
// we have to consider padding
// we have to consider padding
// padding param currently not in use
// padding param currently not in use
padding
=
TBS_bytes
-
header_length_total
-
sdu_length_total
-
ta_len
-
1
;
//
padding = TBS_bytes - header_length_total - sdu_length_total - ta_len - 1;
post_padding
=
1
;
post_padding
=
1
;
}
else
{
}
else
{
padding
=
0
;
//
padding = 0;
post_padding
=
0
;
post_padding
=
0
;
}
}
...
...
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