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
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
zzha zzha
OpenXG-RAN
Commits
a4607947
Commit
a4607947
authored
Aug 16, 2023
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Delete dead code
parent
afc75c5d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
62 deletions
+0
-62
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+0
-41
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/MESSAGES/asn1_msg.h
+0
-21
No files found.
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
a4607947
...
...
@@ -242,16 +242,6 @@ uint8_t do_SIB23_NR(rrc_gNB_carrier_data_t *carrier,
return
((
enc_rval
.
encoded
+
7
)
/
8
);
}
void
do_SpCellConfig
(
gNB_RRC_INST
*
rrc
,
struct
NR_SpCellConfig
*
spconfig
){
//gNB_RrcConfigurationReq *common_configuration;
//common_configuration = CALLOC(1,sizeof(gNB_RrcConfigurationReq));
//Fill servingcellconfigcommon config value
//Fill common config to structure
// rrc->configuration = common_configuration;
spconfig
->
reconfigurationWithSync
=
CALLOC
(
1
,
sizeof
(
struct
NR_ReconfigurationWithSync
));
}
//------------------------------------------------------------------------------
int
do_RRCReject
(
uint8_t
Mod_id
,
uint8_t
*
const
buffer
)
...
...
@@ -474,37 +464,6 @@ void free_nr_noS1_bearer_config(NR_RadioBearerConfig_t **rbconfig,
*
rlc_rbconfig
=
NULL
;
}
void
fill_mastercellGroupConfig
(
NR_CellGroupConfig_t
*
cellGroupConfig
,
NR_CellGroupConfig_t
*
ue_context_mastercellGroup
,
int
use_rlc_um_for_drb
,
uint8_t
configure_srb
,
NR_DRB_ToAddModList_t
*
drb_configList
,
long
*
priority
)
{
cellGroupConfig
->
cellGroupId
=
0
;
cellGroupConfig
->
rlc_BearerToReleaseList
=
NULL
;
cellGroupConfig
->
rlc_BearerToAddModList
=
calloc
(
1
,
sizeof
(
*
cellGroupConfig
->
rlc_BearerToAddModList
));
// RLC Bearer Config
// TS38.331 9.2.1 Default SRB configurations
if
(
configure_srb
){
NR_RLC_BearerConfig_t
*
rlc_BearerConfig
=
get_SRB_RLC_BearerConfig
(
2
,
3
,
NR_LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms5
);
asn1cSeqAdd
(
&
cellGroupConfig
->
rlc_BearerToAddModList
->
list
,
rlc_BearerConfig
);
asn1cSeqAdd
(
&
ue_context_mastercellGroup
->
rlc_BearerToAddModList
->
list
,
rlc_BearerConfig
);
}
// DRB Configuration
if
(
drb_configList
!=
NULL
)
{
for
(
int
i
=
0
;
i
<
drb_configList
->
list
.
count
;
++
i
)
{
const
NR_RLC_Config_PR
rlc_conf
=
use_rlc_um_for_drb
?
NR_RLC_Config_PR_um_Bi_Directional
:
NR_RLC_Config_PR_am
;
int
rb_id
=
drb_configList
->
list
.
array
[
i
]
->
drb_Identity
;
NR_RLC_BearerConfig_t
*
rlc_BearerConfig
=
get_DRB_RLC_BearerConfig
(
3
+
rb_id
,
rb_id
,
rlc_conf
,
priority
[
rb_id
-
1
]);
asn1cSeqAdd
(
&
cellGroupConfig
->
rlc_BearerToAddModList
->
list
,
rlc_BearerConfig
);
asn1cSeqAdd
(
&
ue_context_mastercellGroup
->
rlc_BearerToAddModList
->
list
,
rlc_BearerConfig
);
}
}
}
//------------------------------------------------------------------------------
int
do_RRCSetup
(
rrc_gNB_ue_context_t
*
const
ue_context_pP
,
uint8_t
*
const
buffer
,
...
...
openair2/RRC/NR/MESSAGES/asn1_msg.h
View file @
a4607947
...
...
@@ -58,8 +58,6 @@ int xer_sprint_NR(char *string, size_t string_size, struct asn_TYPE_descriptor_s
uint8_t
do_SIB23_NR
(
rrc_gNB_carrier_data_t
*
carrier
,
gNB_RrcConfigurationReq
*
configuration
);
void
do_SpCellConfig
(
gNB_RRC_INST
*
rrc
,
struct
NR_SpCellConfig
*
spconfig
);
int
do_RRCReject
(
uint8_t
Mod_id
,
uint8_t
*
const
buffer
);
...
...
@@ -79,25 +77,6 @@ void fill_nr_noS1_bearer_config(NR_RadioBearerConfig_t **rbconfig,
NR_RLC_BearerConfig_t
**
rlc_rbconfig
);
void
free_nr_noS1_bearer_config
(
NR_RadioBearerConfig_t
**
rbconfig
,
NR_RLC_BearerConfig_t
**
rlc_rbconfig
);
/**
* @brief Function to fill out the master cell group config to be used in RRCReconfiguration.
* If it is misused the ue_context_mastercellGroup, might lead to ASN1 encoding failure,
* because in ue_context_mastercellGroup the rlc_BearerConfigs are added but never removed,
* so the maximum number of rlc_BearerConfigs is exceeded.
*
* @param cellGroupConfig The MCG that will be used in do_RRCReconfiguration.
* @param ue_context_mastercellGroup The MCG that is stored in the ue context.
* @param[in] use_rlc_um_for_drb Set to 1, if RLC uses 'Unacknowledged Mode' for the DRB.
* @param[in] configure_srb Set to 1, if SRB2 needs be added to MCG.
* @param[in] drb_configList The Data Radio Bearer list, to be added.
* @param[in] priority The priorities set for the Data Radio Bearers.
*/
void
fill_mastercellGroupConfig
(
NR_CellGroupConfig_t
*
cellGroupConfig
,
NR_CellGroupConfig_t
*
ue_context_mastercellGroup
,
int
use_rlc_um_for_drb
,
uint8_t
configure_srb
,
NR_DRB_ToAddModList_t
*
drb_configList
,
long
*
priority
);
int
do_RRCSetup
(
rrc_gNB_ue_context_t
*
const
ue_context_pP
,
uint8_t
*
const
buffer
,
...
...
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