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
99ea7146
Commit
99ea7146
authored
Nov 26, 2024
by
luis_pereira87
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor UL MAC PDU decoding
parent
c942fe43
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
276 additions
and
255 deletions
+276
-255
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
+14
-2
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+261
-252
No files found.
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
View file @
99ea7146
...
...
@@ -427,12 +427,24 @@ typedef struct {
#define DL_SCH_LCID_CON_RES_ID 0x3E
#define DL_SCH_LCID_PADDING 0x3F
#define UL_SCH_LCID_CCCH
1
0x00
#define UL_SCH_LCID_CCCH
_64_BITS
0x00
#define UL_SCH_LCID_SRB1 0x01
#define UL_SCH_LCID_SRB2 0x02
#define UL_SCH_LCID_SRB3 0x03
#define UL_SCH_LCID_DTCH 0x04
#define UL_SCH_LCID_CCCH 0x34
#define UL_SCH_LCID_EXTENDED_LCID_2_OCT 0x21
#define UL_SCH_LCID_EXTENDED_LCID_1_OCT 0x22
#define UL_SCH_LCID_CCCH_48_BITS_REDCAP 0x23
#define UL_SCH_LCID_CCCH_64_BITS_REDCAP 0x24
#define UL_SCH_LCID_TRUNCATED_ENHANCED_BFR 0x2B
#define UL_SCH_LCID_TIMING_ADVANCE_REPORT 0x2C
#define UL_SCH_LCID_TRUNCATED_SIDELINK_BSR 0x2D
#define UL_SCH_LCID_SIDELINK_BSR 0x2E
#define UL_SCH_LCID_LBT_FAILURE_4_OCT 0x30
#define UL_SCH_LCID_LBT_FAILURE_1_OCT 0x31
#define UL_SCH_LCID_BFR 0x32
#define UL_SCH_LCID_TRUNCATED_BFR 0x33
#define UL_SCH_LCID_CCCH_48_BITS 0x34
#define UL_SCH_LCID_RECOMMENDED_BITRATE_QUERY 0x35
#define UL_SCH_LCID_MULTI_ENTRY_PHR_4_OCT 0x36
#define UL_SCH_LCID_CONFIGURED_GRANT_CONFIRMATION 0x37
...
...
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
99ea7146
...
...
@@ -656,7 +656,7 @@ static uint8_t *fill_msg3_pdu_from_rlc(NR_UE_MAC_INST_t *mac, uint8_t *pdu, int
{
RA_config_t
*
ra
=
&
mac
->
ra
;
// regular Msg3/MsgA_PUSCH with PDU coming from higher layers
*
(
NR_MAC_SUBHEADER_FIXED
*
)
pdu
=
(
NR_MAC_SUBHEADER_FIXED
){.
LCID
=
UL_SCH_LCID_CCCH
};
*
(
NR_MAC_SUBHEADER_FIXED
*
)
pdu
=
(
NR_MAC_SUBHEADER_FIXED
){.
LCID
=
UL_SCH_LCID_CCCH
_48_BITS
};
pdu
+=
sizeof
(
NR_MAC_SUBHEADER_FIXED
);
tbs_size_t
len
=
mac_rlc_data_req
(
mac
->
ue_id
,
mac
->
ue_id
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
99ea7146
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