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
OpenXG
OpenXG UE
Commits
d018cfad
Commit
d018cfad
authored
Feb 23, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
additional review fixes
parent
8ea5cc89
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
8 deletions
+9
-8
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+2
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+1
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+3
-3
No files found.
openair2/GNB_APP/gnb_config.c
View file @
d018cfad
...
@@ -740,7 +740,7 @@ void RCconfig_nr_macrlc() {
...
@@ -740,7 +740,7 @@ void RCconfig_nr_macrlc() {
uint16_t
prbbl
[
275
];
uint16_t
prbbl
[
275
];
int
num_prbbl
=
0
;
int
num_prbbl
=
0
;
int
prb
;
int
prb
;
memset
(
prbbl
,
0
,
prbbl
);
memset
(
prbbl
,
0
,
sizeof
(
prbbl
)
);
while
(
pt
)
{
while
(
pt
)
{
prb
=
atoi
(
pt
);
prb
=
atoi
(
pt
);
prbbl
[
prb
]
=
0x3FFF
;
// all symbols taken
prbbl
[
prb
]
=
0x3FFF
;
// all symbols taken
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
d018cfad
...
@@ -681,7 +681,7 @@ bool allocate_dl_retransmission(module_id_t module_id,
...
@@ -681,7 +681,7 @@ bool allocate_dl_retransmission(module_id_t module_id,
/* retransmissions: directly allocate */
/* retransmissions: directly allocate */
*
n_rb_sched
-=
sched_ctrl
->
sched_pdsch
.
rbSize
;
*
n_rb_sched
-=
sched_ctrl
->
sched_pdsch
.
rbSize
;
for
(
int
rb
=
0
;
rb
<
sched_ctrl
->
sched_pdsch
.
rbSize
;
rb
++
)
for
(
int
rb
=
0
;
rb
<
sched_ctrl
->
sched_pdsch
.
rbSize
;
rb
++
)
rballoc_mask
[
rb
+
sched_ctrl
->
sched_pdsch
.
rbStart
]
-
=
SL_to_bitmap
(
ps
->
startSymbolIndex
,
ps
->
nrOfSymbols
);
rballoc_mask
[
rb
+
sched_ctrl
->
sched_pdsch
.
rbStart
]
^
=
SL_to_bitmap
(
ps
->
startSymbolIndex
,
ps
->
nrOfSymbols
);
return
true
;
return
true
;
}
}
...
@@ -878,7 +878,7 @@ void pf_dl(module_id_t module_id,
...
@@ -878,7 +878,7 @@ void pf_dl(module_id_t module_id,
/* transmissions: directly allocate */
/* transmissions: directly allocate */
n_rb_sched
-=
sched_pdsch
->
rbSize
;
n_rb_sched
-=
sched_pdsch
->
rbSize
;
for
(
int
rb
=
0
;
rb
<
sched_pdsch
->
rbSize
;
rb
++
)
for
(
int
rb
=
0
;
rb
<
sched_pdsch
->
rbSize
;
rb
++
)
rballoc_mask
[
rb
+
sched_pdsch
->
rbStart
]
-
=
slbitmap
;
rballoc_mask
[
rb
+
sched_pdsch
->
rbStart
]
^
=
slbitmap
;
}
}
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
d018cfad
...
@@ -1149,6 +1149,8 @@ void set_r_pucch_parms(int rsetindex,
...
@@ -1149,6 +1149,8 @@ void set_r_pucch_parms(int rsetindex,
int
*
nr_of_symbols
,
int
*
nr_of_symbols
,
int
*
start_symbol_index
)
{
int
*
start_symbol_index
)
{
// procedure described in 38.213 section 9.2.1
int
prboffset
=
r_pucch
/
default_pucch_csset
[
rsetindex
];
int
prboffset
=
r_pucch
/
default_pucch_csset
[
rsetindex
];
int
prboffsetm8
=
(
r_pucch
-
8
)
/
default_pucch_csset
[
rsetindex
];
int
prboffsetm8
=
(
r_pucch
-
8
)
/
default_pucch_csset
[
rsetindex
];
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
d018cfad
...
@@ -1282,8 +1282,7 @@ int nr_acknack_scheduling(int mod_id,
...
@@ -1282,8 +1282,7 @@ int nr_acknack_scheduling(int mod_id,
cg
->
spCellConfig
&&
cg
->
spCellConfig
&&
cg
->
spCellConfig
->
spCellConfigDedicated
&&
cg
->
spCellConfig
->
spCellConfigDedicated
&&
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
&&
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
&&
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
initialUplinkBWP
&&
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
initialUplinkBWP
)
{
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
initialUplinkBWP
->
pucch_Config
->
choice
.
setup
)
{
pucch_Config
=
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
initialUplinkBWP
->
pucch_Config
->
choice
.
setup
;
pucch_Config
=
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
initialUplinkBWP
->
pucch_Config
->
choice
.
setup
;
}
}
NR_BWP_t
*
genericParameters
=
sched_ctrl
->
active_ubwp
?
NR_BWP_t
*
genericParameters
=
sched_ctrl
->
active_ubwp
?
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
d018cfad
...
@@ -1091,7 +1091,7 @@ bool allocate_ul_retransmission(module_id_t module_id,
...
@@ -1091,7 +1091,7 @@ bool allocate_ul_retransmission(module_id_t module_id,
/* Mark the corresponding RBs as used */
/* Mark the corresponding RBs as used */
n_rb_sched
-=
sched_pusch
->
rbSize
;
n_rb_sched
-=
sched_pusch
->
rbSize
;
for
(
int
rb
=
0
;
rb
<
sched_ctrl
->
sched_pusch
.
rbSize
;
rb
++
)
for
(
int
rb
=
0
;
rb
<
sched_ctrl
->
sched_pusch
.
rbSize
;
rb
++
)
rballoc_mask
[
rb
+
sched_ctrl
->
sched_pusch
.
rbStart
]
-
=
SL_to_bitmap
(
sched_ctrl
->
pusch_semi_static
.
startSymbolIndex
,
sched_ctrl
->
pusch_semi_static
.
nrOfSymbols
);
rballoc_mask
[
rb
+
sched_ctrl
->
sched_pusch
.
rbStart
]
^
=
SL_to_bitmap
(
sched_ctrl
->
pusch_semi_static
.
startSymbolIndex
,
sched_ctrl
->
pusch_semi_static
.
nrOfSymbols
);
return
true
;
return
true
;
}
}
...
@@ -1256,7 +1256,7 @@ void pf_ul(module_id_t module_id,
...
@@ -1256,7 +1256,7 @@ void pf_ul(module_id_t module_id,
/* Mark the corresponding RBs as used */
/* Mark the corresponding RBs as used */
n_rb_sched
-=
sched_pusch
->
rbSize
;
n_rb_sched
-=
sched_pusch
->
rbSize
;
for
(
int
rb
=
0
;
rb
<
sched_ctrl
->
sched_pusch
.
rbSize
;
rb
++
)
for
(
int
rb
=
0
;
rb
<
sched_ctrl
->
sched_pusch
.
rbSize
;
rb
++
)
rballoc_mask
[
rb
+
sched_ctrl
->
sched_pusch
.
rbStart
]
-
=
SL_to_bitmap
(
ps
->
startSymbolIndex
,
ps
->
nrOfSymbols
);
rballoc_mask
[
rb
+
sched_ctrl
->
sched_pusch
.
rbStart
]
^
=
SL_to_bitmap
(
ps
->
startSymbolIndex
,
ps
->
nrOfSymbols
);
continue
;
continue
;
}
}
...
@@ -1389,7 +1389,7 @@ void pf_ul(module_id_t module_id,
...
@@ -1389,7 +1389,7 @@ void pf_ul(module_id_t module_id,
n_rb_sched
-=
sched_pusch
->
rbSize
;
n_rb_sched
-=
sched_pusch
->
rbSize
;
for
(
int
rb
=
0
;
rb
<
sched_ctrl
->
sched_pusch
.
rbSize
;
rb
++
)
for
(
int
rb
=
0
;
rb
<
sched_ctrl
->
sched_pusch
.
rbSize
;
rb
++
)
rballoc_mask
[
rb
+
sched_ctrl
->
sched_pusch
.
rbStart
]
-
=
SL_to_bitmap
(
ps
->
startSymbolIndex
,
ps
->
nrOfSymbols
);
rballoc_mask
[
rb
+
sched_ctrl
->
sched_pusch
.
rbStart
]
^
=
SL_to_bitmap
(
ps
->
startSymbolIndex
,
ps
->
nrOfSymbols
);
}
}
}
}
...
...
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