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
canghaiwuhen
OpenXG-RAN
Commits
2e9f391a
Commit
2e9f391a
authored
Jan 29, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Store active LCs in MAC, remove unneeded headers
parent
5420e740
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
26 deletions
+38
-26
openair2/ENB_APP/flexran_agent_ran_api.c
openair2/ENB_APP/flexran_agent_ran_api.c
+2
-2
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/config.c
+28
-0
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac.h
+8
-24
No files found.
openair2/ENB_APP/flexran_agent_ran_api.c
View file @
2e9f391a
...
@@ -890,13 +890,13 @@ uint8_t flexran_get_rrc_status(mid_t mod_id, rnti_t rnti) {
...
@@ -890,13 +890,13 @@ uint8_t flexran_get_rrc_status(mid_t mod_id, rnti_t rnti) {
uint64_t
flexran_get_ue_aggregated_max_bitrate_dl
(
mid_t
mod_id
,
mid_t
ue_id
)
{
uint64_t
flexran_get_ue_aggregated_max_bitrate_dl
(
mid_t
mod_id
,
mid_t
ue_id
)
{
if
(
!
mac_is_present
(
mod_id
))
return
0
;
if
(
!
mac_is_present
(
mod_id
))
return
0
;
return
RC
.
mac
[
mod_id
]
->
UE_info
.
UE_sched_ctrl
[
ue_id
].
ue_AggregatedMaximumBitrateDL
;
return
0
;
//
RC.mac[mod_id]->UE_info.UE_sched_ctrl[ue_id].ue_AggregatedMaximumBitrateDL;
}
}
uint64_t
flexran_get_ue_aggregated_max_bitrate_ul
(
mid_t
mod_id
,
mid_t
ue_id
)
{
uint64_t
flexran_get_ue_aggregated_max_bitrate_ul
(
mid_t
mod_id
,
mid_t
ue_id
)
{
if
(
!
mac_is_present
(
mod_id
))
return
0
;
if
(
!
mac_is_present
(
mod_id
))
return
0
;
return
RC
.
mac
[
mod_id
]
->
UE_info
.
UE_sched_ctrl
[
ue_id
].
ue_AggregatedMaximumBitrateUL
;
return
0
;
//
RC.mac[mod_id]->UE_info.UE_sched_ctrl[ue_id].ue_AggregatedMaximumBitrateUL;
}
}
int
flexran_get_half_duplex
(
mid_t
mod_id
,
rnti_t
rnti
)
{
int
flexran_get_half_duplex
(
mid_t
mod_id
,
rnti_t
rnti
)
{
...
...
openair2/LAYER2/MAC/config.c
View file @
2e9f391a
...
@@ -882,6 +882,34 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
...
@@ -882,6 +882,34 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
}
}
}
}
if
(
logicalChannelIdentity
>
0
)
{
// is SRB1,2 or DRB
if
((
UE_id
=
find_UE_id
(
Mod_idP
,
rntiP
))
<
0
)
{
LOG_E
(
MAC
,
"Configuration received for unknown UE (%x), shouldn't happen
\n
"
,
rntiP
);
return
(
-
1
);
}
int
idx
=
-
1
;
UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
for
(
int
i
=
0
;
i
<
sched_ctrl
->
dl_lc_num
;
++
i
)
{
if
(
sched_ctrl
->
dl_lc_ids
[
i
]
==
logicalChannelIdentity
)
{
/* TODO this might also mean we have to remove it, not clear */
idx
=
i
;
break
;
}
}
if
(
idx
<
0
)
{
sched_ctrl
->
dl_lc_num
++
;
sched_ctrl
->
dl_lc_ids
[
sched_ctrl
->
dl_lc_num
-
1
]
=
logicalChannelIdentity
;
sched_ctrl
->
dl_lc_bytes
[
sched_ctrl
->
dl_lc_num
-
1
]
=
0
;
LOG_I
(
MAC
,
"UE %d RNTI %x adding LC %ld idx %d to scheduling control (total %d)
\n
"
,
UE_id
,
rntiP
,
logicalChannelIdentity
,
sched_ctrl
->
dl_lc_num
-
1
,
sched_ctrl
->
dl_lc_num
);
if
(
logicalChannelIdentity
==
1
)
{
// if it is SRB1, add SRB2 directly because RRC does not indicate this separately
sched_ctrl
->
dl_lc_num
++
;
sched_ctrl
->
dl_lc_ids
[
sched_ctrl
->
dl_lc_num
-
1
]
=
2
;
sched_ctrl
->
dl_lc_bytes
[
sched_ctrl
->
dl_lc_num
-
1
]
=
0
;
LOG_I
(
MAC
,
"UE %d RNTI %x adding LC 2 idx %d to scheduling control (total %d)
\n
"
,
UE_id
,
rntiP
,
sched_ctrl
->
dl_lc_num
-
1
,
sched_ctrl
->
dl_lc_num
);
}
}
}
// SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
// SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
if
(
logicalChannelConfig
!=
NULL
)
{
// check for eMTC specific things
if
(
logicalChannelConfig
!=
NULL
)
{
// check for eMTC specific things
UE_id
=
find_UE_id
(
Mod_idP
,
rntiP
);
UE_id
=
find_UE_id
(
Mod_idP
,
rntiP
);
...
...
openair2/LAYER2/MAC/mac.h
View file @
2e9f391a
...
@@ -852,10 +852,10 @@ typedef struct {
...
@@ -852,10 +852,10 @@ typedef struct {
// Logical channel info for link with RLC
// Logical channel info for link with RLC
/// LCGID mapping
/// LCGID mapping
(UL)
long
lcgidmap
[
11
];
long
lcgidmap
[
11
];
///UE logical channel priority
///UE logical channel priority
(UL)
long
lcgidpriority
[
11
];
long
lcgidpriority
[
11
];
/// phr information
/// phr information
...
@@ -913,31 +913,15 @@ typedef struct {
...
@@ -913,31 +913,15 @@ typedef struct {
/*! \brief scheduling control information set through an API (not used)*/
/*! \brief scheduling control information set through an API (not used)*/
typedef
struct
{
typedef
struct
{
///UL transmission bandwidth in RBs
/// number of active DL LCs
uint8_t
ul_bandwidth
[
MAX_NUM_LCID
];
uint8_t
dl_lc_num
;
///DL transmission bandwidth in RBs
/// order in which DLSCH scheduler should allocate LCs
uint8_t
dl_bandwidth
[
MAX_NUM_LCID
];
uint8_t
dl_lc_ids
[
MAX_NUM_LCID
];
/// number of bytes to schedule for each LC
//To do GBR bearer
uint32_t
dl_lc_bytes
[
MAX_NUM_LCID
];
uint8_t
min_ul_bandwidth
[
MAX_NUM_LCID
];
uint8_t
min_dl_bandwidth
[
MAX_NUM_LCID
];
///aggregated bit rate of non-gbr bearer per UE
uint64_t
ue_AggregatedMaximumBitrateDL
;
///aggregated bit rate of non-gbr bearer per UE
uint64_t
ue_AggregatedMaximumBitrateUL
;
///CQI scheduling interval in subframes.
uint16_t
cqiSchedInterval
;
///Contention resolution timer used during random access
uint8_t
mac_ContentionResolutionTimer
;
uint16_t
max_rbs_allowed_slice_uplink
[
NFAPI_CC_MAX
][
MAX_NUM_SLICES
];
uint16_t
max_rbs_allowed_slice_uplink
[
NFAPI_CC_MAX
][
MAX_NUM_SLICES
];
uint8_t
max_mcs
[
MAX_NUM_LCID
];
uint16_t
priority
[
MAX_NUM_LCID
];
// resource scheduling information
// resource scheduling information
/// Current DL harq round per harq_pid on each CC
/// Current DL harq round per harq_pid on each CC
...
...
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