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
lizhongxiao
OpenXG UE
Commits
987ce14d
Commit
987ce14d
authored
Feb 27, 2019
by
Javier Morgade
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FeMBMS RRC->MAC config request protypes
parent
894a0639
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
105 additions
and
0 deletions
+105
-0
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/config.c
+9
-0
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac.h
+1
-0
openair2/LAYER2/MAC/mac_proto.h
openair2/LAYER2/MAC/mac_proto.h
+15
-0
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_defs.h
+2
-0
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+78
-0
No files found.
openair2/LAYER2/MAC/config.c
View file @
987ce14d
...
...
@@ -772,6 +772,15 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
,
LTE_SystemInformationBlockType1_v1310_IEs_t
*
sib1_v13ext
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
uint8_t
FeMBMS_Flag
,
LTE_BCCH_DL_SCH_Message_MBMS_t
*
mib_fembms
,
LTE_SchedulingInfo_MBMS_r14_t
*
schedulingInfo_fembms
,
struct
LTE_NonMBSFN_SubframeConfig_r14
*
nonMBSFN_SubframeConfig
,
LTE_SystemInformationBlockType1_MBMS_r14_t
*
sib1_mbms_r14_fembms
,
LTE_MBSFN_AreaInfoList_r9_t
*
mbsfn_AreaInfoList_fembms
#endif
)
{
...
...
openair2/LAYER2/MAC/mac.h
View file @
987ce14d
...
...
@@ -1317,6 +1317,7 @@ typedef struct {
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
BCCH_PDU
BCCH_MBMS_pdu
;
uint8_t
FeMBMS_flag
;
#endif
}
COMMON_channels_t
;
...
...
openair2/LAYER2/MAC/mac_proto.h
View file @
987ce14d
...
...
@@ -972,6 +972,12 @@ int generate_dlsch_header(unsigned char *mac_header,
@param mbsfn_AreaInfoList pointer to MBSFN Area Info list from SIB13
@param pmch_InfoList pointer to PMCH_InfoList from MBSFNAreaConfiguration Message (MCCH Message)
@param sib1_ext_r13 SI Scheduling information for SI-BR UEs
@param mib_fembms pointer to FeMBMS MIB
@param FeMBMS_Flag indicates FeMBMS transmission
@param schedulingInfo_fembms pointer to FeMBMS SI Scheduling Information
@param non_MBSFN_SubframeConfig pointer to FeMBMS Non MBSFN Subframe Config
@param sib1_mbms_r14_fembms pointer SI Scheduling infomration for SI-MBMS
@param mbsfn_AreaInfoList_fembms pointer to FeMBMS MBSFN Area Info list from SIB1-MBMS
*/
int
rrc_mac_config_req_eNB
(
module_id_t
module_idP
,
...
...
@@ -1021,6 +1027,15 @@ int rrc_mac_config_req_eNB(module_id_t module_idP,
,
LTE_SystemInformationBlockType1_v1310_IEs_t
*
sib1_ext_r13
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
uint8_t
FeMBMS_Flag
,
LTE_BCCH_DL_SCH_Message_MBMS_t
*
mib_fembms
,
LTE_SchedulingInfo_MBMS_r14_t
*
schedulingInfo_fembms
,
struct
LTE_NonMBSFN_SubframeConfig_r14
*
nonMBSFN_SubframeConfig
,
LTE_SystemInformationBlockType1_MBMS_r14_t
*
sib1_mbms_r14_fembms
,
LTE_MBSFN_AreaInfoList_r9_t
*
mbsfn_AreaInfoList_fembms
#endif
);
...
...
openair2/RRC/LTE/rrc_defs.h
View file @
987ce14d
...
...
@@ -665,6 +665,7 @@ typedef struct {
LTE_SystemInformationBlockType2_t
*
sib2_BR
;
LTE_SystemInformationBlockType1_MBMS_r14_t
*
sib1_MBMS
;
LTE_SystemInformationBlockType13_r9_t
*
sib13_MBMS
;
uint8_t
FeMBMS_flag
;
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0))
LTE_SystemInformationBlockType13_r9_t
*
sib13
;
...
...
@@ -801,6 +802,7 @@ typedef struct UE_RRC_INST_s {
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
LTE_SystemInformationBlockType13_r9_t
*
sib13_MBMS
[
NB_CNX_UE
];
uint8_t
FeMBMS_flag
;
#endif
#ifdef CBA
uint8_t
num_active_cba_groups
;
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
987ce14d
...
...
@@ -61,6 +61,12 @@
#include "LTE_SL-CommConfig-r12.h"
#include "LTE_PeriodicBSR-Timer-r12.h"
#include "LTE_RetxBSR-Timer-r12.h"
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
#include "LTE_BCCH-BCH-Message-MBMS.h"
#include "LTE_BCCH-DL-SCH-Message-MBMS.h"
#include "LTE_SystemInformationBlockType1-MBMS-r14.h"
#include "LTE_NonMBSFN-SubframeConfig-r14.h"
#endif
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "T.h"
...
...
@@ -564,6 +570,15 @@ if(configuration->radioresourceconfig[CC_id].mbms_dedicated_serving_cell == TRUE
#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
,
sib1_v13ext
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
FeMBMS_flag
,
(
LTE_BCCH_DL_SCH_Message_MBMS_t
*
)
NULL
,
(
LTE_SchedulingInfo_MBMS_r14_t
*
)
NULL
,
(
struct
LTE_NonMBSFN_SubframeConfig_r14
*
)
NULL
,
(
LTE_SystemInformationBlockType1_MBMS_r14_t
*
)
NULL
,
(
LTE_MBSFN_AreaInfoList_r9_t
*
)
NULL
#endif
);
}
...
...
@@ -649,6 +664,15 @@ init_MCCH(
#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
,
(
LTE_SystemInformationBlockType1_v1310_IEs_t
*
)
NULL
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
(
LTE_BCCH_DL_SCH_Message_MBMS_t
*
)
NULL
,
(
LTE_SchedulingInfo_MBMS_r14_t
*
)
NULL
,
(
struct
LTE_NonMBSFN_SubframeConfig_r14
*
)
NULL
,
(
LTE_SystemInformationBlockType1_MBMS_r14_t
*
)
NULL
,
(
LTE_MBSFN_AreaInfoList_r9_t
*
)
NULL
#endif
);
//LOG_I(RRC,"DUY: lcid after rrc_mac_config_req is %02d\n",RC.rrc[enb_mod_idP]->mcch_message->pmch_InfoList_r9.list.array[0]->mbms_SessionInfoList_r9.list.array[0]->logicalChannelIdentity_r9);
...
...
@@ -1389,6 +1413,15 @@ rrc_eNB_generate_RRCConnectionReestablishment(
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
,(
LTE_SystemInformationBlockType1_v1310_IEs_t
*
)
NULL
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
(
LTE_BCCH_DL_SCH_Message_MBMS_t
*
)
NULL
,
(
LTE_SchedulingInfo_MBMS_r14_t
*
)
NULL
,
(
struct
LTE_NonMBSFN_SubframeConfig_r14
*
)
NULL
,
(
LTE_SystemInformationBlockType1_MBMS_r14_t
*
)
NULL
,
(
LTE_MBSFN_AreaInfoList_r9_t
*
)
NULL
#endif
);
break
;
...
...
@@ -4518,6 +4551,15 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover(
#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
,
(
LTE_SystemInformationBlockType1_v1310_IEs_t
*
)
NULL
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
(
LTE_BCCH_DL_SCH_Message_MBMS_t
*
)
NULL
,
(
LTE_SchedulingInfo_MBMS_r14_t
*
)
NULL
,
(
struct
LTE_NonMBSFN_SubframeConfig_r14
*
)
NULL
,
(
LTE_SystemInformationBlockType1_MBMS_r14_t
*
)
NULL
,
(
LTE_MBSFN_AreaInfoList_r9_t
*
)
NULL
#endif
);
// Configure target eNB SRB2
...
...
@@ -5015,6 +5057,15 @@ rrc_eNB_generate_RRCConnectionReconfiguration_handover(
#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
,
(
LTE_SystemInformationBlockType1_v1310_IEs_t
*
)
NULL
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
(
LTE_BCCH_DL_SCH_Message_MBMS_t
*
)
NULL
,
(
LTE_SchedulingInfo_MBMS_r14_t
*
)
NULL
,
(
struct
LTE_NonMBSFN_SubframeConfig_r14
*
)
NULL
,
(
LTE_SystemInformationBlockType1_MBMS_r14_t
*
)
NULL
,
(
LTE_MBSFN_AreaInfoList_r9_t
*
)
NULL
#endif
);
/*
...
...
@@ -5282,6 +5333,15 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
,
(
LTE_SystemInformationBlockType1_v1310_IEs_t
*
)
NULL
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
(
LTE_BCCH_DL_SCH_Message_MBMS_t
*
)
NULL
,
(
LTE_SchedulingInfo_MBMS_r14_t
*
)
NULL
,
(
struct
LTE_NonMBSFN_SubframeConfig_r14
*
)
NULL
,
(
LTE_SystemInformationBlockType1_MBMS_r14_t
*
)
NULL
,
(
LTE_MBSFN_AreaInfoList_r9_t
*
)
NULL
#endif
);
}
else
{
// remove LCHAN from MAC/PHY
...
...
@@ -5335,6 +5395,15 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
,
(
LTE_SystemInformationBlockType1_v1310_IEs_t
*
)
NULL
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
(
LTE_BCCH_DL_SCH_Message_MBMS_t
*
)
NULL
,
(
LTE_SchedulingInfo_MBMS_r14_t
*
)
NULL
,
(
struct
LTE_NonMBSFN_SubframeConfig_r14
*
)
NULL
,
(
LTE_SystemInformationBlockType1_MBMS_r14_t
*
)
NULL
,
(
LTE_MBSFN_AreaInfoList_r9_t
*
)
NULL
#endif
);
}
...
...
@@ -5464,6 +5533,15 @@ void rrc_eNB_generate_RRCConnectionSetup(const protocol_ctxt_t *const ctxt_pP,
#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0))
,
(
LTE_SystemInformationBlockType1_v1310_IEs_t
*
)
NULL
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
(
LTE_BCCH_DL_SCH_Message_MBMS_t
*
)
NULL
,
(
LTE_SchedulingInfo_MBMS_r14_t
*
)
NULL
,
(
struct
LTE_NonMBSFN_SubframeConfig_r14
*
)
NULL
,
(
LTE_SystemInformationBlockType1_MBMS_r14_t
*
)
NULL
,
(
LTE_MBSFN_AreaInfoList_r9_t
*
)
NULL
#endif
);
break
;
...
...
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