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
ao gleen
OpenXG-RAN
Commits
3089dc0d
Commit
3089dc0d
authored
Apr 17, 2020
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rlc v2: update to latest develop
All previous commits for rlc v2 are proably not functional or even compiling.
parent
12374511
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
45 deletions
+18
-45
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+0
-3
openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h
openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h
+0
-4
openair2/LAYER2/rlc_v2/rlc_oai_api.c
openair2/LAYER2/rlc_v2/rlc_oai_api.c
+18
-34
openair2/LAYER2/rlc_v2/rlc_ue_manager.h
openair2/LAYER2/rlc_v2/rlc_ue_manager.h
+0
-4
No files found.
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
View file @
3089dc0d
...
@@ -107,7 +107,6 @@ tbs_size_t mac_rlc_data_req(
...
@@ -107,7 +107,6 @@ tbs_size_t mac_rlc_data_req(
int
ret
;
int
ret
;
nr_rlc_ue_t
*
ue
;
nr_rlc_ue_t
*
ue
;
nr_rlc_entity_t
*
rb
;
nr_rlc_entity_t
*
rb
;
int
is_enb
;
int
maxsize
;
int
maxsize
;
nr_rlc_manager_lock
(
nr_rlc_ue_manager
);
nr_rlc_manager_lock
(
nr_rlc_ue_manager
);
...
@@ -121,8 +120,6 @@ tbs_size_t mac_rlc_data_req(
...
@@ -121,8 +120,6 @@ tbs_size_t mac_rlc_data_req(
if
(
rb
!=
NULL
)
{
if
(
rb
!=
NULL
)
{
rb
->
set_time
(
rb
,
nr_rlc_current_time
);
rb
->
set_time
(
rb
,
nr_rlc_current_time
);
/* UE does not seem to use saved_status_ind_tb_size */
is_enb
=
nr_rlc_manager_get_enb_flag
(
nr_rlc_ue_manager
);
maxsize
=
tb_sizeP
;
maxsize
=
tb_sizeP
;
ret
=
rb
->
generate_pdu
(
rb
,
buffer_pP
,
maxsize
);
ret
=
rb
->
generate_pdu
(
rb
,
buffer_pP
,
maxsize
);
}
else
{
}
else
{
...
...
openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h
View file @
3089dc0d
...
@@ -28,10 +28,6 @@ typedef void nr_rlc_ue_manager_t;
...
@@ -28,10 +28,6 @@ typedef void nr_rlc_ue_manager_t;
typedef
struct
nr_rlc_ue_t
{
typedef
struct
nr_rlc_ue_t
{
int
rnti
;
int
rnti
;
/* due to openair calling status_ind/data_req, we need to keep this.
* To be considered 'hackish'.
*/
int
saved_status_ind_tb_size
[
2
+
5
];
nr_rlc_entity_t
*
srb
[
2
];
nr_rlc_entity_t
*
srb
[
2
];
nr_rlc_entity_t
*
drb
[
5
];
nr_rlc_entity_t
*
drb
[
5
];
}
nr_rlc_ue_t
;
}
nr_rlc_ue_t
;
...
...
openair2/LAYER2/rlc_v2/rlc_oai_api.c
View file @
3089dc0d
...
@@ -98,17 +98,14 @@ tbs_size_t mac_rlc_data_req(
...
@@ -98,17 +98,14 @@ tbs_size_t mac_rlc_data_req(
const
MBMS_flag_t
MBMS_flagP
,
const
MBMS_flag_t
MBMS_flagP
,
const
logical_chan_id_t
channel_idP
,
const
logical_chan_id_t
channel_idP
,
const
tb_size_t
tb_sizeP
,
const
tb_size_t
tb_sizeP
,
char
*
buffer_pP
char
*
buffer_pP
,
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
const
uint32_t
sourceL2Id
,
,
const
uint32_t
sourceL2Id
const
uint32_t
destinationL2Id
,
const
uint32_t
destinationL2Id
#endif
)
)
{
{
int
ret
;
int
ret
;
rlc_ue_t
*
ue
;
rlc_ue_t
*
ue
;
rlc_entity_t
*
rb
;
rlc_entity_t
*
rb
;
int
is_enb
;
int
maxsize
;
int
maxsize
;
rlc_manager_lock
(
rlc_ue_manager
);
rlc_manager_lock
(
rlc_ue_manager
);
...
@@ -122,11 +119,6 @@ tbs_size_t mac_rlc_data_req(
...
@@ -122,11 +119,6 @@ tbs_size_t mac_rlc_data_req(
if
(
rb
!=
NULL
)
{
if
(
rb
!=
NULL
)
{
rb
->
set_time
(
rb
,
rlc_current_time
);
rb
->
set_time
(
rb
,
rlc_current_time
);
/* UE does not seem to use saved_status_ind_tb_size */
is_enb
=
rlc_manager_get_enb_flag
(
rlc_ue_manager
);
if
(
is_enb
)
maxsize
=
ue
->
saved_status_ind_tb_size
[
channel_idP
-
1
];
else
maxsize
=
tb_sizeP
;
maxsize
=
tb_sizeP
;
ret
=
rb
->
generate_pdu
(
rb
,
buffer_pP
,
maxsize
);
ret
=
rb
->
generate_pdu
(
rb
,
buffer_pP
,
maxsize
);
}
else
{
}
else
{
...
@@ -153,11 +145,8 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
...
@@ -153,11 +145,8 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
const
eNB_flag_t
enb_flagP
,
const
eNB_flag_t
enb_flagP
,
const
MBMS_flag_t
MBMS_flagP
,
const
MBMS_flag_t
MBMS_flagP
,
const
logical_chan_id_t
channel_idP
,
const
logical_chan_id_t
channel_idP
,
const
tb_size_t
tb_sizeP
const
uint32_t
sourceL2Id
,
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
const
uint32_t
destinationL2Id
,
const
uint32_t
sourceL2Id
,
const
uint32_t
destinationL2Id
#endif
)
)
{
{
rlc_ue_t
*
ue
;
rlc_ue_t
*
ue
;
...
@@ -192,7 +181,6 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
...
@@ -192,7 +181,6 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
ret
.
bytes_in_buffer
=
buf_stat
.
status_size
ret
.
bytes_in_buffer
=
buf_stat
.
status_size
+
buf_stat
.
retx_size
+
buf_stat
.
retx_size
+
buf_stat
.
tx_size
;
+
buf_stat
.
tx_size
;
ue
->
saved_status_ind_tb_size
[
channel_idP
-
1
]
=
tb_sizeP
;
}
else
{
}
else
{
ret
.
bytes_in_buffer
=
0
;
ret
.
bytes_in_buffer
=
0
;
}
}
...
@@ -271,11 +259,9 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
...
@@ -271,11 +259,9 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
const
mui_t
muiP
,
const
mui_t
muiP
,
confirm_t
confirmP
,
confirm_t
confirmP
,
sdu_size_t
sdu_sizeP
,
sdu_size_t
sdu_sizeP
,
mem_block_t
*
sdu_pP
mem_block_t
*
sdu_pP
,
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
const
uint32_t
*
const
sourceL2Id
,
,
const
uint32_t
*
const
sourceL2Id
const
uint32_t
*
const
destinationL2Id
,
const
uint32_t
*
const
destinationL2Id
#endif
)
)
{
{
int
rnti
=
ctxt_pP
->
rnti
;
int
rnti
=
ctxt_pP
->
rnti
;
...
@@ -283,7 +269,7 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
...
@@ -283,7 +269,7 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
rlc_entity_t
*
rb
;
rlc_entity_t
*
rb
;
LOG_D
(
RLC
,
"%s rnti %d srb_flag %d rb_id %d mui %d confirm %d sdu_size %d MBMS_flag %d
\n
"
,
LOG_D
(
RLC
,
"%s rnti %d srb_flag %d rb_id %d mui %d confirm %d sdu_size %d MBMS_flag %d
\n
"
,
__FUNCTION__
,
rnti
,
srb_flagP
,
rb_idP
,
muiP
,
confirmP
,
sdu_sizeP
,
__FUNCTION__
,
rnti
,
srb_flagP
,
(
int
)
rb_idP
,
muiP
,
confirmP
,
sdu_sizeP
,
MBMS_flagP
);
MBMS_flagP
);
if
(
ctxt_pP
->
enb_flag
)
if
(
ctxt_pP
->
enb_flag
)
...
@@ -801,12 +787,10 @@ static void add_drb(int rnti, int module_id, struct LTE_DRB_ToAddMod *s)
...
@@ -801,12 +787,10 @@ static void add_drb(int rnti, int module_id, struct LTE_DRB_ToAddMod *s)
rlc_op_status_t
rrc_rlc_config_asn1_req
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rlc_op_status_t
rrc_rlc_config_asn1_req
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
const
LTE_SRB_ToAddModList_t
*
const
srb2add_listP
,
const
LTE_SRB_ToAddModList_t
*
const
srb2add_listP
,
const
LTE_DRB_ToAddModList_t
*
const
drb2add_listP
,
const
LTE_DRB_ToAddModList_t
*
const
drb2add_listP
,
const
LTE_DRB_ToReleaseList_t
*
const
drb2release_listP
const
LTE_DRB_ToReleaseList_t
*
const
drb2release_listP
,
#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0))
const
LTE_PMCH_InfoList_r9_t
*
const
pmch_InfoList_r9_pP
,
,
const
LTE_PMCH_InfoList_r9_t
*
const
pmch_InfoList_r9_pP
const
uint32_t
sourceL2Id
,
,
const
uint32_t
sourceL2Id
const
uint32_t
destinationL2Id
,
const
uint32_t
destinationL2Id
#endif
)
)
{
{
int
rnti
=
ctxt_pP
->
rnti
;
int
rnti
=
ctxt_pP
->
rnti
;
...
@@ -879,24 +863,24 @@ rlc_op_status_t rrc_rlc_config_req (
...
@@ -879,24 +863,24 @@ rlc_op_status_t rrc_rlc_config_req (
}
}
if
((
srb_flagP
&&
!
(
rb_idP
>=
1
&&
rb_idP
<=
2
))
||
if
((
srb_flagP
&&
!
(
rb_idP
>=
1
&&
rb_idP
<=
2
))
||
(
!
srb_flagP
&&
!
(
rb_idP
>=
1
&&
rb_idP
<=
5
)))
{
(
!
srb_flagP
&&
!
(
rb_idP
>=
1
&&
rb_idP
<=
5
)))
{
LOG_E
(
RLC
,
"%s:%d:%s: bad rb_id (%d) (is_srb %d)
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
rb_idP
,
srb_flagP
);
LOG_E
(
RLC
,
"%s:%d:%s: bad rb_id (%d) (is_srb %d)
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
(
int
)
rb_idP
,
srb_flagP
);
exit
(
1
);
exit
(
1
);
}
}
rlc_manager_lock
(
rlc_ue_manager
);
rlc_manager_lock
(
rlc_ue_manager
);
LOG_D
(
RLC
,
"%s:%d:%s: remove rb %d (is_srb %d) for UE %d
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
rb_idP
,
srb_flagP
,
ctxt_pP
->
rnti
);
LOG_D
(
RLC
,
"%s:%d:%s: remove rb %d (is_srb %d) for UE %d
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
(
int
)
rb_idP
,
srb_flagP
,
ctxt_pP
->
rnti
);
ue
=
rlc_manager_get_ue
(
rlc_ue_manager
,
ctxt_pP
->
rnti
);
ue
=
rlc_manager_get_ue
(
rlc_ue_manager
,
ctxt_pP
->
rnti
);
if
(
srb_flagP
)
{
if
(
srb_flagP
)
{
if
(
ue
->
srb
[
rb_idP
-
1
]
!=
NULL
)
{
if
(
ue
->
srb
[
rb_idP
-
1
]
!=
NULL
)
{
ue
->
srb
[
rb_idP
-
1
]
->
delete
(
ue
->
srb
[
rb_idP
-
1
]);
ue
->
srb
[
rb_idP
-
1
]
->
delete
(
ue
->
srb
[
rb_idP
-
1
]);
ue
->
srb
[
rb_idP
-
1
]
=
NULL
;
ue
->
srb
[
rb_idP
-
1
]
=
NULL
;
}
else
}
else
LOG_W
(
RLC
,
"removing non allocated SRB %d, do nothing
\n
"
,
rb_idP
);
LOG_W
(
RLC
,
"removing non allocated SRB %d, do nothing
\n
"
,
(
int
)
rb_idP
);
}
else
{
}
else
{
if
(
ue
->
drb
[
rb_idP
-
1
]
!=
NULL
)
{
if
(
ue
->
drb
[
rb_idP
-
1
]
!=
NULL
)
{
ue
->
drb
[
rb_idP
-
1
]
->
delete
(
ue
->
drb
[
rb_idP
-
1
]);
ue
->
drb
[
rb_idP
-
1
]
->
delete
(
ue
->
drb
[
rb_idP
-
1
]);
ue
->
drb
[
rb_idP
-
1
]
=
NULL
;
ue
->
drb
[
rb_idP
-
1
]
=
NULL
;
}
else
}
else
LOG_W
(
RLC
,
"removing non allocated DRB %d, do nothing
\n
"
,
rb_idP
);
LOG_W
(
RLC
,
"removing non allocated DRB %d, do nothing
\n
"
,
(
int
)
rb_idP
);
}
}
/* remove UE if it has no more RB configured */
/* remove UE if it has no more RB configured */
for
(
i
=
0
;
i
<
2
;
i
++
)
for
(
i
=
0
;
i
<
2
;
i
++
)
...
...
openair2/LAYER2/rlc_v2/rlc_ue_manager.h
View file @
3089dc0d
...
@@ -29,10 +29,6 @@ typedef void rlc_ue_manager_t;
...
@@ -29,10 +29,6 @@ typedef void rlc_ue_manager_t;
typedef
struct
rlc_ue_t
{
typedef
struct
rlc_ue_t
{
int
rnti
;
int
rnti
;
int
module_id
;
/* necesarry for the L2 simulator - not clean, to revise */
int
module_id
;
/* necesarry for the L2 simulator - not clean, to revise */
/* due to openair calling status_ind/data_req, we need to keep this.
* To be considered 'hackish'.
*/
int
saved_status_ind_tb_size
[
2
+
5
];
rlc_entity_t
*
srb
[
2
];
rlc_entity_t
*
srb
[
2
];
rlc_entity_t
*
drb
[
5
];
rlc_entity_t
*
drb
[
5
];
}
rlc_ue_t
;
}
rlc_ue_t
;
...
...
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