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
94212ba3
Commit
94212ba3
authored
Feb 22, 2021
by
rmagueta
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop-SA-RA' into develop-SA-CBRA
parents
4263fba3
7d43b596
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
12 deletions
+13
-12
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+2
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1
-1
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+2
-2
openair2/RRC/NR_UE/rrc_defs.h
openair2/RRC/NR_UE/rrc_defs.h
+8
-8
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
94212ba3
...
@@ -524,7 +524,8 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
...
@@ -524,7 +524,8 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
uint8_t
sdu_lcids
[
NB_RB_MAX
]
=
{
0
};
uint8_t
sdu_lcids
[
NB_RB_MAX
]
=
{
0
};
uint16_t
sdu_lengths
[
NB_RB_MAX
]
=
{
0
};
uint16_t
sdu_lengths
[
NB_RB_MAX
]
=
{
0
};
int
num_sdus
,
offset
=
0
;
int
num_sdus
=
0
;
int
offset
=
0
;
// Delay init RA procedure to allow the convergence of the IIR filter on PRACH noise measurements at gNB side
// Delay init RA procedure to allow the convergence of the IIR filter on PRACH noise measurements at gNB side
if
(
!
prach_resources
->
init_msg1
)
{
if
(
!
prach_resources
->
init_msg1
)
{
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
94212ba3
...
@@ -465,7 +465,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
...
@@ -465,7 +465,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
// random access pusch with TC-RNTI
// random access pusch with TC-RNTI
if
(
ra
->
rnti
!=
current_rnti
)
{
if
(
ra
->
rnti
!=
current_rnti
)
{
LOG_W
(
MAC
,
LOG_W
(
NR_
MAC
,
"expected TC-RNTI %04x to match current RNTI %04x
\n
"
,
"expected TC-RNTI %04x to match current RNTI %04x
\n
"
,
ra
->
rnti
,
ra
->
rnti
,
current_rnti
);
current_rnti
);
...
...
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
94212ba3
...
@@ -1368,9 +1368,9 @@ uint8_t do_RRCSetupRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv) {
...
@@ -1368,9 +1368,9 @@ uint8_t do_RRCSetupRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv) {
rrcSetupRequest
->
rrcSetupRequest
.
spare
.
size
=
1
;
rrcSetupRequest
->
rrcSetupRequest
.
spare
.
size
=
1
;
rrcSetupRequest
->
rrcSetupRequest
.
spare
.
bits_unused
=
7
;
rrcSetupRequest
->
rrcSetupRequest
.
spare
.
bits_unused
=
7
;
//
if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
if
(
LOG_DEBUGFLAG
(
DEBUG_ASN1
)
)
{
xer_fprint
(
stdout
,
&
asn_DEF_NR_UL_CCCH_Message
,
(
void
*
)
&
ul_ccch_msg
);
xer_fprint
(
stdout
,
&
asn_DEF_NR_UL_CCCH_Message
,
(
void
*
)
&
ul_ccch_msg
);
//
}
}
enc_rval
=
uper_encode_to_buffer
(
&
asn_DEF_NR_UL_CCCH_Message
,
enc_rval
=
uper_encode_to_buffer
(
&
asn_DEF_NR_UL_CCCH_Message
,
NULL
,
NULL
,
...
...
openair2/RRC/NR_UE/rrc_defs.h
View file @
94212ba3
...
@@ -78,14 +78,14 @@ typedef struct OAI_NR_UECapability_s {
...
@@ -78,14 +78,14 @@ typedef struct OAI_NR_UECapability_s {
}
OAI_NR_UECapability_t
;
}
OAI_NR_UECapability_t
;
typedef
enum
requested_SI_List_e
{
typedef
enum
requested_SI_List_e
{
SIB2
=
0x
1
,
SIB2
=
1
,
SIB3
=
0x
2
,
SIB3
=
2
,
SIB4
=
0x
4
,
SIB4
=
4
,
SIB5
=
0x
8
,
SIB5
=
8
,
SIB6
=
0x
16
,
SIB6
=
16
,
SIB7
=
0x
32
,
SIB7
=
32
,
SIB8
=
0x
64
,
SIB8
=
64
,
SIB9
=
0x
128
SIB9
=
128
}
requested_SI_List_t
;
}
requested_SI_List_t
;
// 3GPP TS 38.300 Section 9.2.6
// 3GPP TS 38.300 Section 9.2.6
...
...
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