Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
oai
openairinterface5G
Commits
2f7e7b98
Commit
2f7e7b98
authored
3 years ago
by
Francesco Mani
Browse files
Options
Downloads
Patches
Plain Diff
remove some more logs
parent
dbdf3813
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!1757
Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c
,
!1555
integration_2022_wk19b
,
!1357
Bupt UL-MIMO
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake_targets/autotests/test_case_list.xml
+1
-1
1 addition, 1 deletion
cmake_targets/autotests/test_case_list.xml
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+6
-5
6 additions, 5 deletions
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
with
7 additions
and
6 deletions
cmake_targets/autotests/test_case_list.xml
+
1
−
1
View file @
2f7e7b98
...
...
@@ -1331,7 +1331,7 @@
-n100 -m9 -r106 -s10 -W2 -y2 -z2
-n100 -m9 -r106 -s13 -W4 -y4 -z4</main_exec_args>
<tags>nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8 nr_ulsim.test9 nr_ulsim.test10 nr_ulsim.test11 nr_ulsim.test12 nr_ulsim.test13 nr_ulsim.test14 nr_ulsim.test15 nr_ulsim.test16 nr_ulsim.test1
6
</tags>
<tags>nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8 nr_ulsim.test9 nr_ulsim.test10 nr_ulsim.test11 nr_ulsim.test12 nr_ulsim.test13 nr_ulsim.test14 nr_ulsim.test15 nr_ulsim.test16 nr_ulsim.test1
7
</tags>
<search_expr_true>PUSCH test OK</search_expr_true>
<search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
<nruns>3</nruns>
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+
6
−
5
View file @
2f7e7b98
...
...
@@ -346,7 +346,7 @@ void ul_ports_config(NR_UE_MAC_INST_t * mac, nfapi_nr_ue_pusch_pdu_t *pusch_conf
}
long
*
max_length
=
NULL
;
long
*
dmrs_type
=
NULL
;
LOG_
I
(
NR_MAC
,
"transformPrecoder %s
\n
"
,
transformPrecoder
==
NR_PUSCH_Config__transformPrecoder_disabled
?
"disabled"
:
"enabled"
);
LOG_
D
(
NR_MAC
,
"transformPrecoder %s
\n
"
,
transformPrecoder
==
NR_PUSCH_Config__transformPrecoder_disabled
?
"disabled"
:
"enabled"
);
if
(
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeA
)
{
max_length
=
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeA
->
choice
.
setup
->
maxLength
;
...
...
@@ -357,7 +357,8 @@ void ul_ports_config(NR_UE_MAC_INST_t * mac, nfapi_nr_ue_pusch_pdu_t *pusch_conf
dmrs_type
=
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeB
->
choice
.
setup
->
dmrs_Type
;
}
LOG_I
(
NR_MAC
,
"MappingType%s max_length %s, dmrs_type %s, antenna_ports %d
\n
"
,
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeA
?
"A"
:
"B"
,
max_length
?
"len2"
:
"len1"
,
dmrs_type
?
"type2"
:
"type1"
,
dci
->
antenna_ports
.
val
);
LOG_D
(
NR_MAC
,
"MappingType%s max_length %s, dmrs_type %s, antenna_ports %d
\n
"
,
pusch_Config
->
dmrs_UplinkForPUSCH_MappingTypeA
?
"A"
:
"B"
,
max_length
?
"len2"
:
"len1"
,
dmrs_type
?
"type2"
:
"type1"
,
dci
->
antenna_ports
.
val
);
if
((
transformPrecoder
==
NR_PUSCH_Config__transformPrecoder_enabled
)
&&
(
dmrs_type
==
NULL
)
&&
(
max_length
==
NULL
))
{
// tables 7.3.1.1.2-6
pusch_config_pdu
->
num_dmrs_cdm_grps_no_data
=
2
;
//TBC
...
...
@@ -509,7 +510,7 @@ void ul_ports_config(NR_UE_MAC_INST_t * mac, nfapi_nr_ue_pusch_pdu_t *pusch_conf
//pusch_config_pdu->n_front_load_symb = table_7_3_1_1_2_23[dci->antenna_ports.val][5]; //FIXME
}
}
LOG_
I
(
NR_MAC
,
"num_dmrs_cdm_grps_no_data %d, dmrs_ports %d
\n
"
,
pusch_config_pdu
->
num_dmrs_cdm_grps_no_data
,
pusch_config_pdu
->
dmrs_ports
);
LOG_
D
(
NR_MAC
,
"num_dmrs_cdm_grps_no_data %d, dmrs_ports %d
\n
"
,
pusch_config_pdu
->
num_dmrs_cdm_grps_no_data
,
pusch_config_pdu
->
dmrs_ports
);
}
// Configuration of Msg3 PDU according to clauses:
...
...
@@ -916,7 +917,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
fill_scheduled_response
(
&
scheduled_response
,
&
dcireq
.
dl_config_req
,
NULL
,
NULL
,
mod_id
,
cc_id
,
rx_frame
,
rx_slot
,
dl_info
->
thread_id
);
if
(
mac
->
if_module
!=
NULL
&&
mac
->
if_module
->
scheduled_response
!=
NULL
)
LOG_
I
(
NR_MAC
,
"1# scheduled_response transmitted, %d, %d
\n
"
,
rx_frame
,
rx_slot
);
LOG_
D
(
NR_MAC
,
"1# scheduled_response transmitted, %d, %d
\n
"
,
rx_frame
,
rx_slot
);
mac
->
if_module
->
scheduled_response
(
&
scheduled_response
);
}
else
{
...
...
@@ -1030,7 +1031,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
fill_scheduled_response
(
&
scheduled_response
,
NULL
,
ul_config
,
&
tx_req
,
mod_id
,
cc_id
,
rx_frame
,
rx_slot
,
ul_info
->
thread_id
);
if
(
mac
->
if_module
!=
NULL
&&
mac
->
if_module
->
scheduled_response
!=
NULL
){
LOG_
I
(
NR_MAC
,
"3# scheduled_response transmitted,%d, %d
\n
"
,
frame_tx
,
slot_tx
);
LOG_
D
(
NR_MAC
,
"3# scheduled_response transmitted,%d, %d
\n
"
,
frame_tx
,
slot_tx
);
mac
->
if_module
->
scheduled_response
(
&
scheduled_response
);
}
pthread_mutex_lock
(
&
ul_config
->
mutex_ul_config
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment