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
ac8da484
Commit
ac8da484
authored
Nov 19, 2024
by
Guido Casati
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace cell_group_t with CELL_GROUP_ID_t
* simplified number of Cell Group types
parent
aae05e95
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
11 deletions
+8
-11
openair2/COMMON/e1ap_messages_types.h
openair2/COMMON/e1ap_messages_types.h
+2
-6
openair2/E1AP/e1ap.c
openair2/E1AP/e1ap.c
+3
-3
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR/rrc_gNB_NGAP.c
+3
-2
No files found.
openair2/COMMON/e1ap_messages_types.h
View file @
ac8da484
...
...
@@ -118,10 +118,6 @@ typedef struct e1ap_setup_fail_s {
long
transac_id
;
}
e1ap_setup_fail_t
;
typedef
struct
cell_group_s
{
cell_group_id_t
id
;
}
cell_group_t
;
typedef
struct
up_params_s
{
in_addr_t
tlAddress
;
long
teId
;
...
...
@@ -155,7 +151,7 @@ typedef struct drb_to_setup_s {
in_addr_t
tlAddress
;
long
teId
;
int
numCellGroups
;
cell_group_t
cellGroupList
[
E1AP_MAX_NUM_CELL_GROUPS
];
cell_group_
id_
t
cellGroupList
[
E1AP_MAX_NUM_CELL_GROUPS
];
}
drb_to_setup_t
;
typedef
struct
qos_characteristics_s
{
...
...
@@ -221,7 +217,7 @@ typedef struct DRB_nGRAN_to_setup_s {
/* Cell Group Information (clause 9.3.1.11) */
int
numCellGroups
;
cell_group_t
cellGroupList
[
E1AP_MAX_NUM_CELL_GROUPS
];
cell_group_
id_
t
cellGroupList
[
E1AP_MAX_NUM_CELL_GROUPS
];
/* DRB QoS Flows Parameters (clause 9.3.1.26) */
int
numQosFlow2Setup
;
...
...
openair2/E1AP/e1ap.c
View file @
ac8da484
...
...
@@ -676,9 +676,9 @@ static int fill_BEARER_CONTEXT_SETUP_REQUEST(e1ap_bearer_setup_req_t *const bear
roTimer
->
t_Reordering
=
j
->
pdcp_config
.
reorderingTimer
;
ieC6_1_1
->
pDCP_Configuration
.
rLC_Mode
=
j
->
pdcp_config
.
rLC_Mode
;
/* Cell Group config */
for
(
cell_group_t
*
k
=
j
->
cellGroupList
;
k
<
j
->
cellGroupList
+
j
->
numCellGroups
;
k
++
)
{
for
(
cell_group_
id_
t
*
k
=
j
->
cellGroupList
;
k
<
j
->
cellGroupList
+
j
->
numCellGroups
;
k
++
)
{
asn1cSequenceAdd
(
ieC6_1_1
->
cell_Group_Information
.
list
,
E1AP_Cell_Group_Information_Item_t
,
ieC6_1_1_1
);
ieC6_1_1_1
->
cell_Group_ID
=
k
->
id
;
ieC6_1_1_1
->
cell_Group_ID
=
*
j
->
cellGroupList
;
}
/* QoS Flows */
for
(
qos_flow_to_setup_t
*
k
=
j
->
qosFlows
;
k
<
j
->
qosFlows
+
j
->
numQosFlow2Setup
;
k
++
)
{
...
...
@@ -992,7 +992,7 @@ static void extract_BEARER_CONTEXT_SETUP_REQUEST(const E1AP_E1AP_PDU_t *pdu, e1a
for
(
int
k
=
0
;
k
<
cellGroupList
->
list
.
count
;
k
++
)
{
E1AP_Cell_Group_Information_Item_t
*
cg2Setup
=
cellGroupList
->
list
.
array
[
k
];
drb
->
cellGroupList
[
k
]
.
id
=
cg2Setup
->
cell_Group_ID
;
drb
->
cellGroupList
[
k
]
=
cg2Setup
->
cell_Group_ID
;
}
E1AP_QoS_Flow_QoS_Parameter_List_t
*
qos2SetupList
=
&
drb2Setup
->
qos_flow_Information_To_Be_Setup
;
...
...
openair2/RRC/NR/rrc_gNB_NGAP.c
View file @
ac8da484
...
...
@@ -382,9 +382,10 @@ void trigger_bearer_setup(gNB_RRC_INST *rrc, gNB_RRC_UE_t *UE, int n, pdusession
drb
->
numCellGroups
=
1
;
// assume one cell group associated with a DRB
// Set all Cell Group IDs to MCG
for
(
int
k
=
0
;
k
<
drb
->
numCellGroups
;
k
++
)
{
cell_group_t
*
cellGroup
=
drb
->
cellGroupList
+
k
;
cellGroup
->
id
=
0
;
// MCG
cell_group_
id_
t
*
cellGroup
=
drb
->
cellGroupList
+
k
;
*
cellGroup
=
MCG
;
}
drb
->
numQosFlow2Setup
=
session
->
nb_qos
;
...
...
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