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
f24cff92
Commit
f24cff92
authored
1 year ago
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make better version of nr_get_msg3_payload()
parent
4958f8b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
27 deletions
+18
-27
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/LAYER2/NR_MAC_UE/mac_proto.h
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+16
-24
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+1
-2
No files found.
openair2/LAYER2/NR_MAC_UE/mac_proto.h
View file @
f24cff92
...
@@ -502,7 +502,7 @@ void set_ra_rnti(NR_UE_MAC_INST_t *mac, fapi_nr_ul_config_prach_pdu *prach_pdu);
...
@@ -502,7 +502,7 @@ void set_ra_rnti(NR_UE_MAC_INST_t *mac, fapi_nr_ul_config_prach_pdu *prach_pdu);
void
nr_Msg1_transmitted
(
module_id_t
mod_id
);
void
nr_Msg1_transmitted
(
module_id_t
mod_id
);
void
nr_Msg3_transmitted
(
module_id_t
mod_id
,
uint8_t
CC_id
,
frame_t
frameP
,
slot_t
slotP
,
uint8_t
gNB_id
);
void
nr_Msg3_transmitted
(
module_id_t
mod_id
,
uint8_t
CC_id
,
frame_t
frameP
,
slot_t
slotP
,
uint8_t
gNB_id
);
void
nr_get_msg3_payload
(
module_id_t
mod_id
);
void
nr_get_msg3_payload
(
module_id_t
mod_id
,
uint8_t
*
buf
,
int
TBS_max
);
void
send_msg3_rrc_request
(
module_id_t
mod_id
,
int
rnti
);
void
send_msg3_rrc_request
(
module_id_t
mod_id
,
int
rnti
);
void
nr_ue_msg2_scheduler
(
module_id_t
mod_id
,
uint16_t
rach_frame
,
uint16_t
rach_slot
,
uint16_t
*
msg2_frame
,
uint16_t
*
msg2_slot
);
void
nr_ue_msg2_scheduler
(
module_id_t
mod_id
,
uint16_t
rach_frame
,
uint16_t
rach_slot
,
uint16_t
*
msg2_frame
,
uint16_t
*
msg2_slot
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
f24cff92
...
@@ -608,23 +608,25 @@ void nr_Msg3_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, slot
...
@@ -608,23 +608,25 @@ void nr_Msg3_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, slot
ra
->
ra_state
=
WAIT_CONTENTION_RESOLUTION
;
ra
->
ra_state
=
WAIT_CONTENTION_RESOLUTION
;
}
}
void
nr_get_msg3_payload
(
module_id_t
mod_id
)
void
nr_get_msg3_payload
(
module_id_t
mod_id
,
uint8_t
*
buf
,
int
TBS_max
)
{
{
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
mod_id
);
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
mod_id
);
RA_config_t
*
ra
=
&
mac
->
ra
;
RA_config_t
*
ra
=
&
mac
->
ra
;
uint8_t
*
pdu
=
mac
->
CCCH_pdu
.
payload
;
uint8_t
*
pdu
=
buf
;
const
uint8_t
sh_size
=
sizeof
(
NR_MAC_SUBHEADER_FIXED
);
*
(
NR_MAC_SUBHEADER_FIXED
*
)
pdu
=
(
NR_MAC_SUBHEADER_FIXED
){.
LCID
=
UL_SCH_LCID_CCCH
};
NR_MAC_SUBHEADER_FIXED
*
header
=
(
NR_MAC_SUBHEADER_FIXED
*
)
pdu
;
pdu
+=
sizeof
(
NR_MAC_SUBHEADER_FIXED
);
pdu
+=
sh_size
;
// here a big race condition: nothing ensure RRC thread has already pushed data to rlc
int
lcid
=
0
;
// SRB0 for messages sent in MSG3
// there is no issue inside RLC,
// if RRC has called nr_rlc_srb_recv_sdu(),
// we are good even if the name is misleading (we send a ssrb msg, not receive if)
tbs_size_t
len
=
mac_rlc_data_req
(
mod_id
,
tbs_size_t
len
=
mac_rlc_data_req
(
mod_id
,
ra
->
t_crnti
,
ra
->
t_crnti
,
0
,
0
,
0
,
0
,
ENB_FLAG_NO
,
ENB_FLAG_NO
,
MBMS_FLAG_NO
,
MBMS_FLAG_NO
,
lcid
,
0
,
// SRB0 for messages sent in MSG3
16
,
/* size of mac_ce above */
TBS_max
-
sizeof
(
NR_MAC_SUBHEADER_FIXED
)
,
/* size of mac_ce above */
(
char
*
)
pdu
,
(
char
*
)
pdu
,
0
,
0
,
0
);
0
);
...
@@ -632,26 +634,16 @@ void nr_get_msg3_payload(module_id_t mod_id)
...
@@ -632,26 +634,16 @@ void nr_get_msg3_payload(module_id_t mod_id)
// UE Contention Resolution Identity
// UE Contention Resolution Identity
// Store the first 48 bits belonging to the uplink CCCH SDU within Msg3 to determine whether or not the
// Store the first 48 bits belonging to the uplink CCCH SDU within Msg3 to determine whether or not the
// Random Access Procedure has been successful after reception of Msg4
// Random Access Procedure has been successful after reception of Msg4
// We copy from persisted memory to another persisted memory
memcpy
(
ra
->
cont_res_id
,
pdu
,
sizeof
(
uint8_t
)
*
6
);
memcpy
(
ra
->
cont_res_id
,
pdu
,
sizeof
(
uint8_t
)
*
6
);
pdu
+=
len
;
pdu
+=
len
;
int
Msg3_size
=
len
+
sh_size
;
AssertFatal
(
TBS_max
>=
pdu
-
buf
,
"Allocated resources are not enough for Msg3!
\n
"
);
// Build header
header
->
R
=
0
;
header
->
LCID
=
UL_SCH_LCID_CCCH
;
const
uint8_t
TBS_max
=
8
+
sizeof
(
NR_MAC_SUBHEADER_SHORT
)
+
sizeof
(
NR_MAC_SUBHEADER_SHORT
);
// Note: unclear the reason behind the selection of such TBS_max
// Padding: fill remainder with 0
// Padding: fill remainder with 0
if
(
TBS_max
-
Msg3_size
>
0
)
{
LOG_D
(
NR_MAC
,
"Remaining %ld bytes, filling with padding
\n
"
,
pdu
-
buf
);
AssertFatal
(
TBS_max
>
Msg3_size
,
"Allocated resources are not enough for Msg3!
\n
"
);
while
(
pdu
<
buf
+
TBS_max
-
sizeof
(
NR_MAC_SUBHEADER_FIXED
))
{
LOG_D
(
NR_MAC
,
"Remaining %d bytes, filling with padding
\n
"
,
TBS_max
-
Msg3_size
);
*
(
NR_MAC_SUBHEADER_FIXED
*
)
pdu
=
(
NR_MAC_SUBHEADER_FIXED
){.
LCID
=
UL_SCH_LCID_PADDING
};
((
NR_MAC_SUBHEADER_FIXED
*
)
pdu
)
->
R
=
0
;
((
NR_MAC_SUBHEADER_FIXED
*
)
pdu
)
->
LCID
=
UL_SCH_LCID_PADDING
;
pdu
+=
sizeof
(
NR_MAC_SUBHEADER_FIXED
);
pdu
+=
sizeof
(
NR_MAC_SUBHEADER_FIXED
);
memset
(
pdu
,
0
,
TBS_max
-
Msg3_size
-
sizeof
(
NR_MAC_SUBHEADER_FIXED
));
}
}
// Dumping ULSCH payload
LOG_D
(
NR_MAC
,
"Dumping UL Msg3 MAC PDU with length %d:
\n
"
,
TBS_max
);
for
(
int
k
=
0
;
k
<
TBS_max
;
k
++
)
LOG_D
(
NR_MAC
,
"(%i): %i
\n
"
,
k
,
pdu
[
k
]);
}
}
/**
/**
...
@@ -710,7 +702,7 @@ uint8_t nr_ue_get_rach(module_id_t mod_id,
...
@@ -710,7 +702,7 @@ uint8_t nr_ue_get_rach(module_id_t mod_id,
int
size_sdu
=
0
;
int
size_sdu
=
0
;
uint8_t
mac_ce
[
16
]
=
{
0
};
uint8_t
mac_ce
[
16
]
=
{
0
};
uint8_t
*
pdu
=
get_softmodem_params
()
->
sa
?
mac
->
CCCH_pdu
.
payload
:
mac_ce
;
uint8_t
*
pdu
=
get_softmodem_params
()
->
sa
?
mac
->
CCCH_pdu
.
payload
:
mac_ce
;
uint8_t
*
payload
=
pdu
;
const
uint8_t
*
payload
=
pdu
;
// Concerning the C-RNTI MAC CE, it has to be included if the UL transmission (Msg3) is not being made for the CCCH logical channel.
// Concerning the C-RNTI MAC CE, it has to be included if the UL transmission (Msg3) is not being made for the CCCH logical channel.
// Therefore it has been assumed that this event only occurs only when RA is done and it is not SA mode.
// Therefore it has been assumed that this event only occurs only when RA is done and it is not SA mode.
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
f24cff92
...
@@ -1036,8 +1036,7 @@ void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info)
...
@@ -1036,8 +1036,7 @@ void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info)
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
new_data_indicator
,
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
new_data_indicator
,
TBS_bytes
,
ra
->
ra_state
);
TBS_bytes
,
ra
->
ra_state
);
if
(
ra
->
ra_state
==
WAIT_RAR
&&
!
ra
->
cfra
)
{
if
(
ra
->
ra_state
==
WAIT_RAR
&&
!
ra
->
cfra
)
{
nr_get_msg3_payload
(
mod_id
);
nr_get_msg3_payload
(
mod_id
,
ulsch_input_buffer
,
TBS_bytes
);
memcpy
(
ulsch_input_buffer
,
mac
->
CCCH_pdu
.
payload
,
TBS_bytes
);
for
(
int
k
=
0
;
k
<
TBS_bytes
;
k
++
)
{
for
(
int
k
=
0
;
k
<
TBS_bytes
;
k
++
)
{
LOG_D
(
NR_MAC
,
"(%i): 0x%x
\n
"
,
k
,
ulsch_input_buffer
[
k
]);
LOG_D
(
NR_MAC
,
"(%i): 0x%x
\n
"
,
k
,
ulsch_input_buffer
[
k
]);
}
}
...
...
This diff is collapsed.
Click to expand it.
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