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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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-RAN
Commits
60e39af3
Commit
60e39af3
authored
Dec 14, 2021
by
Melissa Elkadi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updating min_txtxtime_pdsch and dl_harq_pid fix
parent
f028f8e2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf
...iles/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+1
-1
ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
...files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+1
-0
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+5
-5
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+5
-0
No files found.
ci-scripts/conf_files/episci/episci_gnb.band78.sa.fr1.106PRB.usrpn310.conf
View file @
60e39af3
...
...
@@ -36,7 +36,7 @@ gNBs =
pdsch_AntennaPorts
=
1
;
pusch_AntennaPorts
=
1
;
ul_prbblacklist
=
"51,52,53,54"
min_rxtxtime_pdsch
=
6
;
pdcch_ConfigSIB1
= (
{
controlResourceSetZero
=
12
;
...
...
ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
View file @
60e39af3
...
...
@@ -36,6 +36,7 @@ gNBs =
pdsch_AntennaPorts
=
1
;
pusch_AntennaPorts
=
1
;
ul_prbblacklist
=
"51,52,53,54"
min_rxtxtime_pdsch
=
6
;
pdcch_ConfigSIB1
= (
{
...
...
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
View file @
60e39af3
...
...
@@ -107,14 +107,14 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
{
crc_ind
->
crc_list
[
j
].
handle
=
pusch_config_pdu
->
handle
;
crc_ind
->
crc_list
[
j
].
harq_id
=
pusch_config_pdu
->
pusch_data
.
harq_process_id
;
LOG_
I
(
NR_MAC
,
"This is the harq pid %d for crc_list[%d]
\n
"
,
crc_ind
->
crc_list
[
j
].
harq_id
,
j
);
LOG_
I
(
NR_MAC
,
"This is sched sfn/sl [%d %d] and crc sfn/sl [%d %d]
\n
"
,
LOG_
D
(
NR_MAC
,
"This is the harq pid %d for crc_list[%d]
\n
"
,
crc_ind
->
crc_list
[
j
].
harq_id
,
j
);
LOG_
D
(
NR_MAC
,
"This is sched sfn/sl [%d %d] and crc sfn/sl [%d %d]
\n
"
,
scheduled_response
->
frame
,
scheduled_response
->
slot
,
crc_ind
->
sfn
,
crc_ind
->
slot
);
crc_ind
->
crc_list
[
j
].
num_cb
=
pusch_config_pdu
->
pusch_data
.
num_cb
;
crc_ind
->
crc_list
[
j
].
rnti
=
pusch_config_pdu
->
rnti
;
crc_ind
->
crc_list
[
j
].
tb_crc_status
=
0
;
crc_ind
->
crc_list
[
j
].
timing_advance
=
scheduled_response
->
tx_request
->
tx_config
.
timing_advance
;
crc_ind
->
crc_list
[
j
].
ul_cqi
=
scheduled_response
->
tx_request
->
tx_config
.
ul_cqi
;
crc_ind
->
crc_list
[
j
].
ul_cqi
=
255
;
}
if
(
!
put_queue
(
&
nr_rx_ind_queue
,
rx_ind
))
...
...
@@ -140,7 +140,7 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
crc_ind
=
NULL
;
}
LOG_
I
(
PHY
,
"In %s: Filled queue rx/crc_ind which was filled by ulconfig.
\n
"
,
__FUNCTION__
);
LOG_
D
(
PHY
,
"In %s: Filled queue rx/crc_ind which was filled by ulconfig.
\n
"
,
__FUNCTION__
);
scheduled_response
->
tx_request
->
number_of_pdus
=
0
;
}
...
...
@@ -162,7 +162,7 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
"Too many dl_config pdus %d"
,
dl_config
->
number_pdus
);
for
(
int
i
=
0
;
i
<
dl_config
->
number_pdus
;
++
i
)
{
LOG_
I
(
PHY
,
"In %s: processing %s PDU of %d total DL PDUs (dl_config %p)
\n
"
,
LOG_
D
(
PHY
,
"In %s: processing %s PDU of %d total DL PDUs (dl_config %p)
\n
"
,
__FUNCTION__
,
dl_pdu_type
[
dl_config
->
dl_config_list
[
i
].
pdu_type
-
1
],
dl_config
->
number_pdus
,
dl_config
);
uint8_t
pdu_type
=
dl_config
->
dl_config_list
[
i
].
pdu_type
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
60e39af3
...
...
@@ -741,6 +741,11 @@ void pf_dl(module_id_t module_id,
const
uint16_t
bwpSize
=
NRRIV2BW
(
genericParameters
->
locationAndBandwidth
,
MAX_BWP_SIZE
);
int
rbStart
=
0
;
// start wrt BWPstart
if
(
sched_ctrl
->
available_dl_harq
.
head
<
0
)
{
LOG_D
(
MAC
,
"UE %d RNTI %04x has no free HARQ process, skipping
\n
"
,
UE_id
,
UE_info
->
rnti
[
UE_id
]);
continue
;
}
/* Find a free CCE */
bool
freeCCE
=
find_free_CCE
(
module_id
,
slot
,
UE_id
);
if
(
!
freeCCE
)
{
...
...
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