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
lizhongxiao
OpenXG UE
Commits
b9e221f1
Commit
b9e221f1
authored
Feb 26, 2021
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nr_generate_Msg4 support for multiple RA procedures
parent
e4f4af6c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
23 deletions
+9
-23
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+7
-15
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+2
-8
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
b9e221f1
...
@@ -475,7 +475,7 @@ void nr_initiate_ra_proc(module_id_t module_idP,
...
@@ -475,7 +475,7 @@ void nr_initiate_ra_proc(module_id_t module_idP,
NR_COMMON_channels_t
*
cc
=
&
nr_mac
->
common_channels
[
CC_id
];
NR_COMMON_channels_t
*
cc
=
&
nr_mac
->
common_channels
[
CC_id
];
NR_ServingCellConfigCommon_t
*
scc
=
cc
->
ServingCellConfigCommon
;
NR_ServingCellConfigCommon_t
*
scc
=
cc
->
ServingCellConfigCommon
;
uint8_t
total_RApreambles
=
64
;
uint8_t
total_RApreambles
=
MAX_NUM_NR_PRACH_PREAMBLES
;
uint8_t
num_ssb_per_RO
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
->
present
;
uint8_t
num_ssb_per_RO
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
->
present
;
int
pr_found
;
int
pr_found
;
...
@@ -624,16 +624,16 @@ void nr_initiate_ra_proc(module_id_t module_idP,
...
@@ -624,16 +624,16 @@ void nr_initiate_ra_proc(module_id_t module_idP,
NR_COMMON_channels_t
*
cc
=
&
mac
->
common_channels
[
CC_id
];
NR_COMMON_channels_t
*
cc
=
&
mac
->
common_channels
[
CC_id
];
for
(
int
i
=
0
;
i
<
NR_NB_RA_PROC_MAX
;
i
++
)
{
for
(
int
i
=
0
;
i
<
NR_NB_RA_PROC_MAX
;
i
++
)
{
NR_RA_t
*
ra
=
&
cc
->
ra
[
i
];
NR_RA_t
*
ra
=
&
cc
->
ra
[
i
];
LOG_D
(
MAC
,
"RA[state:%d]
\n
"
,
ra
->
state
);
LOG_D
(
NR_
MAC
,
"RA[state:%d]
\n
"
,
ra
->
state
);
switch
(
ra
->
state
)
{
switch
(
ra
->
state
)
{
case
Msg2
:
case
Msg2
:
nr_generate_Msg2
(
module_idP
,
CC_id
,
frameP
,
slotP
,
ra
);
nr_generate_Msg2
(
module_idP
,
CC_id
,
frameP
,
slotP
,
ra
);
break
;
break
;
case
Msg4
:
case
Msg4
:
nr_generate_Msg4
(
module_idP
,
CC_id
,
frameP
,
slotP
);
nr_generate_Msg4
(
module_idP
,
CC_id
,
frameP
,
slotP
,
ra
);
break
;
break
;
case
WAIT_Msg4_ACK
:
case
WAIT_Msg4_ACK
:
nr_check_Msg4_Ack
(
module_idP
,
CC_id
,
frameP
,
slotP
);
nr_check_Msg4_Ack
(
module_idP
,
CC_id
,
frameP
,
slotP
,
ra
);
break
;
break
;
default:
default:
break
;
break
;
...
@@ -1055,14 +1055,10 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
...
@@ -1055,14 +1055,10 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
}
}
}
}
void
nr_generate_Msg4
(
module_id_t
module_idP
,
void
nr_generate_Msg4
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
sub_frame_t
slotP
,
NR_RA_t
*
ra
)
{
int
CC_id
,
frame_t
frameP
,
sub_frame_t
slotP
)
{
gNB_MAC_INST
*
nr_mac
=
RC
.
nrmac
[
module_idP
];
gNB_MAC_INST
*
nr_mac
=
RC
.
nrmac
[
module_idP
];
NR_COMMON_channels_t
*
cc
=
&
nr_mac
->
common_channels
[
CC_id
];
NR_COMMON_channels_t
*
cc
=
&
nr_mac
->
common_channels
[
CC_id
];
NR_RA_t
*
ra
=
&
cc
->
ra
[
0
];
if
(
ra
->
Msg4_frame
==
frameP
&&
ra
->
Msg4_slot
==
slotP
)
{
if
(
ra
->
Msg4_frame
==
frameP
&&
ra
->
Msg4_slot
==
slotP
)
{
...
@@ -1285,16 +1281,12 @@ void nr_generate_Msg4(module_id_t module_idP,
...
@@ -1285,16 +1281,12 @@ void nr_generate_Msg4(module_id_t module_idP,
}
}
}
}
void
nr_check_Msg4_Ack
(
module_id_t
module_id
,
void
nr_check_Msg4_Ack
(
module_id_t
module_id
,
int
CC_id
,
frame_t
frame
,
sub_frame_t
slot
,
NR_RA_t
*
ra
)
{
int
CC_id
,
frame_t
frame
,
sub_frame_t
slot
)
{
LOG_W
(
NR_MAC
,
"nr_check_Msg4_Ack() is not implemented yet!
\n
"
);
LOG_W
(
NR_MAC
,
"nr_check_Msg4_Ack() is not implemented yet!
\n
"
);
gNB_MAC_INST
*
nr_mac
=
RC
.
nrmac
[
module_id
];
gNB_MAC_INST
*
nr_mac
=
RC
.
nrmac
[
module_id
];
NR_COMMON_channels_t
*
cc
=
&
nr_mac
->
common_channels
[
CC_id
];
NR_COMMON_channels_t
*
cc
=
&
nr_mac
->
common_channels
[
CC_id
];
NR_RA_t
*
ra
=
&
cc
->
ra
[
0
];
ra
->
state
=
RA_IDLE
;
ra
->
state
=
RA_IDLE
;
}
}
...
@@ -1303,7 +1295,7 @@ void nr_clear_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP){
...
@@ -1303,7 +1295,7 @@ void nr_clear_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP){
NR_RA_t
*
ra
=
&
RC
.
nrmac
[
module_idP
]
->
common_channels
[
CC_id
].
ra
[
0
];
NR_RA_t
*
ra
=
&
RC
.
nrmac
[
module_idP
]
->
common_channels
[
CC_id
].
ra
[
0
];
LOG_D
(
MAC
,
"[gNB %d][RAPROC] CC_id %d Frame %d Clear Random access information rnti %x
\n
"
,
module_idP
,
CC_id
,
frameP
,
ra
->
rnti
);
LOG_D
(
MAC
,
"[gNB %d][RAPROC] CC_id %d Frame %d Clear Random access information rnti %x
\n
"
,
module_idP
,
CC_id
,
frameP
,
ra
->
rnti
);
ra
->
state
=
IDLE
;
ra
->
state
=
RA_
IDLE
;
ra
->
timing_offset
=
0
;
ra
->
timing_offset
=
0
;
ra
->
RRC_timer
=
20
;
ra
->
RRC_timer
=
20
;
ra
->
rnti
=
0
;
ra
->
rnti
=
0
;
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
b9e221f1
...
@@ -355,15 +355,9 @@ int nr_write_ce_dlsch_pdu(module_id_t module_idP,
...
@@ -355,15 +355,9 @@ int nr_write_ce_dlsch_pdu(module_id_t module_idP,
void
nr_generate_Msg2
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
sub_frame_t
slotP
,
NR_RA_t
*
ra
);
void
nr_generate_Msg2
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
sub_frame_t
slotP
,
NR_RA_t
*
ra
);
void
nr_generate_Msg4
(
module_id_t
module_idP
,
void
nr_generate_Msg4
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
sub_frame_t
slotP
,
NR_RA_t
*
ra
);
int
CC_id
,
frame_t
frameP
,
sub_frame_t
slotP
);
void
nr_check_Msg4_Ack
(
module_id_t
module_id
,
void
nr_check_Msg4_Ack
(
module_id_t
module_id
,
int
CC_id
,
frame_t
frame
,
sub_frame_t
slot
,
NR_RA_t
*
ra
);
int
CC_id
,
frame_t
frame
,
sub_frame_t
slot
);
void
nr_process_mac_pdu
(
void
nr_process_mac_pdu
(
module_id_t
module_idP
,
module_id_t
module_idP
,
...
...
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