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
canghaiwuhen
OpenXG-RAN
Commits
b5b78125
Commit
b5b78125
authored
May 15, 2020
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test scheduling of pucch reception
parent
d268c320
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/PHY/NR_TRANSPORT/pucch_rx.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+5
-0
No files found.
openair1/PHY/NR_TRANSPORT/pucch_rx.c
View file @
b5b78125
...
@@ -367,9 +367,9 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
...
@@ -367,9 +367,9 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
uint8_t
xrtmag_dB
=
dB_fixed
(
xrtmag
);
uint8_t
xrtmag_dB
=
dB_fixed
(
xrtmag
);
#ifdef DEBUG_NR_PUCCH_RX
//
#ifdef DEBUG_NR_PUCCH_RX
printf
(
"PUCCH 0 : maxpos %d
\n
"
,
maxpos
);
printf
(
"PUCCH 0 : maxpos %d
\n
"
,
maxpos
);
#endif
//
#endif
index
=
maxpos
;
index
=
maxpos
;
#endif
#endif
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @
b5b78125
...
@@ -321,6 +321,8 @@ void nr_schedule_pucch(int Mod_idP,
...
@@ -321,6 +321,8 @@ void nr_schedule_pucch(int Mod_idP,
O_ack
=
curr_pucch
->
dai_c
;
O_ack
=
curr_pucch
->
dai_c
;
O_uci
=
O_ack
;
// for now we are just sending acknacks in pucch
O_uci
=
O_ack
;
// for now we are just sending acknacks in pucch
LOG_I
(
MAC
,
"Scheduling pucch reception for frame %d slot %d
\n
"
,
frameP
,
slotP
);
nr_configure_pucch
(
pucch_pdu
,
nr_configure_pucch
(
pucch_pdu
,
scc
,
scc
,
ubwp
,
ubwp
,
...
@@ -485,6 +487,9 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
...
@@ -485,6 +487,9 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
if
(
is_nr_UL_slot
(
cc
->
ServingCellConfigCommon
,
slot_rxP
))
{
if
(
is_nr_UL_slot
(
cc
->
ServingCellConfigCommon
,
slot_rxP
))
{
if
(
get_softmodem_params
()
->
phy_test
==
0
)
{
if
(
get_softmodem_params
()
->
phy_test
==
0
)
{
NR_sched_pucch
*
curr_pucch
=
UE_list
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
;
if
(
curr_pucch
!=
NULL
)
nr_schedule_pucch
(
module_idP
,
UE_id
,
frame_rxP
,
slot_rxP
);
schedule_nr_prach
(
module_idP
,
(
frame_rxP
+
1
)
&
1023
,
slot_rxP
);
schedule_nr_prach
(
module_idP
,
(
frame_rxP
+
1
)
&
1023
,
slot_rxP
);
nr_schedule_reception_msg3
(
module_idP
,
0
,
frame_rxP
,
slot_rxP
);
nr_schedule_reception_msg3
(
module_idP
,
0
,
frame_rxP
,
slot_rxP
);
}
}
...
...
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