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
Michael Black
OpenXG UE
Commits
0a0337ed
Commit
0a0337ed
authored
Nov 26, 2021
by
luis_pereira87
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor cosmetic improvements
parent
524b9d77
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+7
-7
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+2
-1
No files found.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
0a0337ed
...
@@ -520,13 +520,13 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -520,13 +520,13 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
NR_COMMON_channels_t
*
cc
=
&
RC
.
nrmac
[
Mod_idP
]
->
common_channels
[
0
];
NR_COMMON_channels_t
*
cc
=
&
RC
.
nrmac
[
Mod_idP
]
->
common_channels
[
0
];
RC
.
nrmac
[
Mod_idP
]
->
sib1_tda
=
sib1_tda
;
RC
.
nrmac
[
Mod_idP
]
->
sib1_tda
=
sib1_tda
;
for
(
int
n
=
0
;
n
<
NR_NB_RA_PROC_MAX
;
n
++
)
{
for
(
int
n
=
0
;
n
<
NR_NB_RA_PROC_MAX
;
n
++
)
{
cc
->
ra
[
n
].
cfra
=
false
;
cc
->
ra
[
n
].
cfra
=
false
;
cc
->
ra
[
n
].
msg3_dcch_dtch
=
false
;
cc
->
ra
[
n
].
msg3_dcch_dtch
=
false
;
cc
->
ra
[
n
].
rnti
=
0
;
cc
->
ra
[
n
].
rnti
=
0
;
cc
->
ra
[
n
].
preambles
.
num_preambles
=
MAX_NUM_NR_PRACH_PREAMBLES
;
cc
->
ra
[
n
].
preambles
.
num_preambles
=
MAX_NUM_NR_PRACH_PREAMBLES
;
cc
->
ra
[
n
].
preambles
.
preamble_list
=
(
uint8_t
*
)
malloc
(
MAX_NUM_NR_PRACH_PREAMBLES
*
sizeof
(
uint8_t
));
cc
->
ra
[
n
].
preambles
.
preamble_list
=
(
uint8_t
*
)
malloc
(
MAX_NUM_NR_PRACH_PREAMBLES
*
sizeof
(
uint8_t
));
for
(
int
i
=
0
;
i
<
MAX_NUM_NR_PRACH_PREAMBLES
;
i
++
)
for
(
int
i
=
0
;
i
<
MAX_NUM_NR_PRACH_PREAMBLES
;
i
++
)
cc
->
ra
[
n
].
preambles
.
preamble_list
[
i
]
=
i
;
cc
->
ra
[
n
].
preambles
.
preamble_list
[
i
]
=
i
;
}
}
}
}
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
0a0337ed
...
@@ -1405,8 +1405,8 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
...
@@ -1405,8 +1405,8 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
AssertFatal
(
coreset
!=
NULL
,
"Coreset cannot be null for RA-Msg4
\n
"
);
AssertFatal
(
coreset
!=
NULL
,
"Coreset cannot be null for RA-Msg4
\n
"
);
// If UE is known by the network, to use C-RNTI instead of TC-RNTI
rnti_t
tc_rnti
=
ra
->
rnti
;
rnti_t
tc_rnti
=
ra
->
rnti
;
// If UE is known by the network, C-RNTI to be used instead of TC-RNTI
if
(
ra
->
msg3_dcch_dtch
)
{
if
(
ra
->
msg3_dcch_dtch
)
{
ra
->
rnti
=
ra
->
crnti
;
ra
->
rnti
=
ra
->
crnti
;
}
}
...
@@ -1759,6 +1759,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
...
@@ -1759,6 +1759,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
LOG_D
(
NR_MAC
,
"numDlDci: %i
\n
"
,
pdcch_pdu_rel15
->
numDlDci
);
LOG_D
(
NR_MAC
,
"numDlDci: %i
\n
"
,
pdcch_pdu_rel15
->
numDlDci
);
if
(
ra
->
msg3_dcch_dtch
)
{
if
(
ra
->
msg3_dcch_dtch
)
{
// If the UE used MSG3 to transfer a DCCH or DTCH message, then contention resolution is successful upon transmission of PDCCH
LOG_I
(
NR_MAC
,
"(ue %i, rnti 0x%04x) CBRA procedure succeeded!
\n
"
,
UE_id
,
ra
->
rnti
);
LOG_I
(
NR_MAC
,
"(ue %i, rnti 0x%04x) CBRA procedure succeeded!
\n
"
,
UE_id
,
ra
->
rnti
);
nr_clear_ra_proc
(
module_idP
,
CC_id
,
frameP
,
ra
);
nr_clear_ra_proc
(
module_idP
,
CC_id
,
frameP
,
ra
);
UE_info
->
active
[
UE_id
]
=
true
;
UE_info
->
active
[
UE_id
]
=
true
;
...
...
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