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
6e69d168
Commit
6e69d168
authored
May 04, 2021
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix SRB2 warning for NSA
parent
3ea98698
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
13 deletions
+32
-13
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
openair2/RRC/NR/rrc_gNB_reconfig.c
openair2/RRC/NR/rrc_gNB_reconfig.c
+31
-12
No files found.
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
6e69d168
...
@@ -679,7 +679,7 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
...
@@ -679,7 +679,7 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
dB_fixed_x10
(
gNB
->
pusch_vars
[
ULSCH_id
]
->
ulsch_noise_power_tot
)
+
gNB
->
pusch_thres
)
{
dB_fixed_x10
(
gNB
->
pusch_vars
[
ULSCH_id
]
->
ulsch_noise_power_tot
)
+
gNB
->
pusch_thres
)
{
NR_gNB_SCH_STATS_t
*
stats
=
get_ulsch_stats
(
gNB
,
ulsch
);
NR_gNB_SCH_STATS_t
*
stats
=
get_ulsch_stats
(
gNB
,
ulsch
);
LOG_
I
(
PHY
,
"PUSCH not detected in %d.%d (%d,%d,%d)
\n
"
,
frame_rx
,
slot_rx
,
LOG_
D
(
PHY
,
"PUSCH not detected in %d.%d (%d,%d,%d)
\n
"
,
frame_rx
,
slot_rx
,
dB_fixed_x10
(
gNB
->
pusch_vars
[
ULSCH_id
]
->
ulsch_power_tot
),
dB_fixed_x10
(
gNB
->
pusch_vars
[
ULSCH_id
]
->
ulsch_power_tot
),
dB_fixed_x10
(
gNB
->
pusch_vars
[
ULSCH_id
]
->
ulsch_noise_power_tot
),
gNB
->
pusch_thres
);
dB_fixed_x10
(
gNB
->
pusch_vars
[
ULSCH_id
]
->
ulsch_noise_power_tot
),
gNB
->
pusch_thres
);
nr_fill_indication
(
gNB
,
frame_rx
,
slot_rx
,
ULSCH_id
,
harq_pid
,
1
);
nr_fill_indication
(
gNB
,
frame_rx
,
slot_rx
,
ULSCH_id
,
harq_pid
,
1
);
...
...
openair2/RRC/NR/rrc_gNB_reconfig.c
View file @
6e69d168
...
@@ -164,12 +164,23 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
...
@@ -164,12 +164,23 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
secondaryCellGroup
->
rlc_BearerToAddModList
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
rlc_BearerToAddModList
));
secondaryCellGroup
->
rlc_BearerToAddModList
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
rlc_BearerToAddModList
));
ASN_SEQUENCE_ADD
(
&
secondaryCellGroup
->
rlc_BearerToAddModList
->
list
,
RLC_BearerConfig
);
ASN_SEQUENCE_ADD
(
&
secondaryCellGroup
->
rlc_BearerToAddModList
->
list
,
RLC_BearerConfig
);
NR_RLC_BearerConfig_t
*
RLC_BearerConfig2
=
calloc
(
1
,
sizeof
(
*
RLC_BearerConfig2
));
NR_RLC_BearerConfig_t
*
RLC_BearerConfig_srb1
=
calloc
(
1
,
sizeof
(
*
RLC_BearerConfig_srb1
));
nr_rlc_bearer_init
(
RLC_BearerConfig2
,
NR_RLC_BearerConfig__servedRadioBearer_PR_srb_Identity
);
nr_rlc_bearer_init
(
RLC_BearerConfig_srb1
,
NR_RLC_BearerConfig__servedRadioBearer_PR_srb_Identity
);
nr_drb_config
(
RLC_BearerConfig2
->
rlc_Config
,
NR_RLC_Config_PR_am
);
nr_drb_config
(
RLC_BearerConfig_srb1
->
rlc_Config
,
NR_RLC_Config_PR_am
);
nr_rlc_bearer_init_ul_spec
(
RLC_BearerConfig2
->
mac_LogicalChannelConfig
);
nr_rlc_bearer_init_ul_spec
(
RLC_BearerConfig_srb1
->
mac_LogicalChannelConfig
);
*
RLC_BearerConfig2
->
mac_LogicalChannelConfig
->
ul_SpecificParameters
->
logicalChannelGroup
=
0
;
// FIXME: this should be obtained in nr_rlc_bearer_init_ul_spec()
// FIXME: this should be obtained in nr_rlc_bearer_init_ul_spec()
ASN_SEQUENCE_ADD
(
&
secondaryCellGroup
->
rlc_BearerToAddModList
->
list
,
RLC_BearerConfig2
);
*
RLC_BearerConfig_srb1
->
mac_LogicalChannelConfig
->
ul_SpecificParameters
->
logicalChannelGroup
=
0
;
ASN_SEQUENCE_ADD
(
&
secondaryCellGroup
->
rlc_BearerToAddModList
->
list
,
RLC_BearerConfig_srb1
);
NR_RLC_BearerConfig_t
*
RLC_BearerConfig_srb2
=
calloc
(
1
,
sizeof
(
*
RLC_BearerConfig_srb2
));
nr_rlc_bearer_init
(
RLC_BearerConfig_srb2
,
NR_RLC_BearerConfig__servedRadioBearer_PR_srb_Identity
);
nr_drb_config
(
RLC_BearerConfig_srb2
->
rlc_Config
,
NR_RLC_Config_PR_am
);
nr_rlc_bearer_init_ul_spec
(
RLC_BearerConfig_srb2
->
mac_LogicalChannelConfig
);
// FIXME: this should be obtained in nr_rlc_bearer_init_ul_spec()
*
RLC_BearerConfig_srb2
->
mac_LogicalChannelConfig
->
ul_SpecificParameters
->
logicalChannelGroup
=
0
;
RLC_BearerConfig_srb2
->
logicalChannelIdentity
=
2
;
RLC_BearerConfig_srb2
->
servedRadioBearer
->
choice
.
srb_Identity
=
2
;
ASN_SEQUENCE_ADD
(
&
secondaryCellGroup
->
rlc_BearerToAddModList
->
list
,
RLC_BearerConfig_srb2
);
secondaryCellGroup
->
mac_CellGroupConfig
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
mac_CellGroupConfig
));
secondaryCellGroup
->
mac_CellGroupConfig
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
mac_CellGroupConfig
));
secondaryCellGroup
->
mac_CellGroupConfig
->
drx_Config
=
NULL
;
secondaryCellGroup
->
mac_CellGroupConfig
->
drx_Config
=
NULL
;
...
@@ -1291,12 +1302,20 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
...
@@ -1291,12 +1302,20 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
e_NR_SecurityConfig__keyToUse
key_to_use
)
{
e_NR_SecurityConfig__keyToUse
key_to_use
)
{
rbconfig
->
srb_ToAddModList
=
calloc
(
1
,
sizeof
(
*
rbconfig
->
srb_ToAddModList
));
rbconfig
->
srb_ToAddModList
=
calloc
(
1
,
sizeof
(
*
rbconfig
->
srb_ToAddModList
));
NR_SRB_ToAddMod_t
*
srb_ToAddMod
=
calloc
(
1
,
sizeof
(
*
srb_ToAddMod
));
srb_ToAddMod
->
srb_Identity
=
rb_id
;
NR_SRB_ToAddMod_t
*
srb1_ToAddMod
=
calloc
(
1
,
sizeof
(
*
srb1_ToAddMod
));
srb_ToAddMod
->
reestablishPDCP
=
NULL
;
srb1_ToAddMod
->
srb_Identity
=
1
;
srb_ToAddMod
->
discardOnPDCP
=
NULL
;
srb1_ToAddMod
->
reestablishPDCP
=
NULL
;
srb_ToAddMod
->
pdcp_Config
=
NULL
;
srb1_ToAddMod
->
discardOnPDCP
=
NULL
;
ASN_SEQUENCE_ADD
(
&
rbconfig
->
srb_ToAddModList
->
list
,
srb_ToAddMod
);
srb1_ToAddMod
->
pdcp_Config
=
NULL
;
ASN_SEQUENCE_ADD
(
&
rbconfig
->
srb_ToAddModList
->
list
,
srb1_ToAddMod
);
NR_SRB_ToAddMod_t
*
srb2_ToAddMod
=
calloc
(
1
,
sizeof
(
*
srb2_ToAddMod
));
srb2_ToAddMod
->
srb_Identity
=
2
;
srb2_ToAddMod
->
reestablishPDCP
=
NULL
;
srb2_ToAddMod
->
discardOnPDCP
=
NULL
;
srb2_ToAddMod
->
pdcp_Config
=
NULL
;
ASN_SEQUENCE_ADD
(
&
rbconfig
->
srb_ToAddModList
->
list
,
srb2_ToAddMod
);
rbconfig
->
srb3_ToRelease
=
NULL
;
rbconfig
->
srb3_ToRelease
=
NULL
;
rbconfig
->
drb_ToAddModList
=
calloc
(
1
,
sizeof
(
*
rbconfig
->
drb_ToAddModList
));
rbconfig
->
drb_ToAddModList
=
calloc
(
1
,
sizeof
(
*
rbconfig
->
drb_ToAddModList
));
...
...
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