Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
b2181288
Commit
b2181288
authored
Oct 20, 2016
by
Xenofon Foukas
Browse files
Moved agent and protocol to flexran naming convention
parent
9ed966cf
Changes
30
Expand all
Hide whitespace changes
Inline
Side-by-side
cmake_targets/CMakeLists.txt
View file @
b2181288
...
...
@@ -840,55 +840,55 @@ include_directories("${OPENAIR_DIR}")
################
if
(
ENB_AGENT_SB_IF
)
# set the version of protobuf messages, V3 not supported yet
add_list1_option
(
PR
PT_VERSION V2
"
PR
PT MSG protobuf grammar version"
V2 V3
)
add_list1_option
(
FL
PT_VERSION V2
"
FL
PT MSG protobuf grammar version"
V2 V3
)
if
(
${
PR
PT_VERSION
}
STREQUAL
"V2"
)
set
(
PR
PTDIR V2
)
elseif
(
${
PR
PT_VERSION
}
STREQUAL
"V3"
)
set
(
PR
PTDIR V3
)
endif
(
${
PR
PT_VERSION
}
STREQUAL
"V2"
)
if
(
${
FL
PT_VERSION
}
STREQUAL
"V2"
)
set
(
FL
PTDIR V2
)
elseif
(
${
FL
PT_VERSION
}
STREQUAL
"V3"
)
set
(
FL
PTDIR V3
)
endif
(
${
FL
PT_VERSION
}
STREQUAL
"V2"
)
set
(
PR
PT_MSG_DIR
${
OPENAIR2_DIR
}
/ENB_APP/MESSAGES/
${
PR
PTDIR
}
)
set
(
PR
PT_MSG_FILES
${
PR
PT_MSG_DIR
}
/header.proto
${
PR
PT_MSG_DIR
}
/
prog
ran.proto
${
PR
PT_MSG_DIR
}
/stats_common.proto
${
PR
PT_MSG_DIR
}
/stats_messages.proto
${
PR
PT_MSG_DIR
}
/time_common.proto
${
PR
PT_MSG_DIR
}
/controller_commands.proto
${
PR
PT_MSG_DIR
}
/mac_primitives.proto
${
PR
PT_MSG_DIR
}
/config_messages.proto
${
PR
PT_MSG_DIR
}
/config_common.proto
${
PR
PT_MSG_DIR
}
/control_delegation.proto
set
(
FL
PT_MSG_DIR
${
OPENAIR2_DIR
}
/ENB_APP/MESSAGES/
${
FL
PTDIR
}
)
set
(
FL
PT_MSG_FILES
${
FL
PT_MSG_DIR
}
/header.proto
${
FL
PT_MSG_DIR
}
/
flex
ran.proto
${
FL
PT_MSG_DIR
}
/stats_common.proto
${
FL
PT_MSG_DIR
}
/stats_messages.proto
${
FL
PT_MSG_DIR
}
/time_common.proto
${
FL
PT_MSG_DIR
}
/controller_commands.proto
${
FL
PT_MSG_DIR
}
/mac_primitives.proto
${
FL
PT_MSG_DIR
}
/config_messages.proto
${
FL
PT_MSG_DIR
}
/config_common.proto
${
FL
PT_MSG_DIR
}
/control_delegation.proto
)
set
(
PR
PT_C_DIR
${
protobuf_generated_dir
}
/
${
PR
PTDIR
}
)
#message("calling protoc_call=${protoc_call}
PR
PT_C_DIR=${
PR
PT_C_DIR}
PR
PT_MSG_FILES=${
PR
PT_MSG_FILES}")
execute_process
(
COMMAND
${
protoc_call
}
${
PR
PT_C_DIR
}
${
PR
PT_MSG_DIR
}
${
PR
PT_MSG_FILES
}
)
file
(
GLOB
PR
PT_source
${
PR
PT_C_DIR
}
/*.c
)
set
(
PR
PT_OAI_generated
${
PR
PT_C_DIR
}
/header.pb-c.c
${
PR
PT_C_DIR
}
/
prog
ran.pb-c.c
${
PR
PT_C_DIR
}
/stats_common.pb-c.c
${
PR
PT_C_DIR
}
/stats_messages.pb-c.c
${
PR
PT_C_DIR
}
/time_common.pb-c.c
${
PR
PT_C_DIR
}
/controller_commands.pb-c.c
${
PR
PT_C_DIR
}
/mac_primitives.pb-c.c
${
PR
PT_C_DIR
}
/config_messages.pb-c.c
${
PR
PT_C_DIR
}
/config_common.pb-c.c
${
PR
PT_C_DIR
}
/control_delegation.pb-c.c
set
(
FL
PT_C_DIR
${
protobuf_generated_dir
}
/
${
FL
PTDIR
}
)
#message("calling protoc_call=${protoc_call}
FL
PT_C_DIR=${
FL
PT_C_DIR}
FL
PT_MSG_FILES=${
FL
PT_MSG_FILES}")
execute_process
(
COMMAND
${
protoc_call
}
${
FL
PT_C_DIR
}
${
FL
PT_MSG_DIR
}
${
FL
PT_MSG_FILES
}
)
file
(
GLOB
FL
PT_source
${
FL
PT_C_DIR
}
/*.c
)
set
(
FL
PT_OAI_generated
${
FL
PT_C_DIR
}
/header.pb-c.c
${
FL
PT_C_DIR
}
/
flex
ran.pb-c.c
${
FL
PT_C_DIR
}
/stats_common.pb-c.c
${
FL
PT_C_DIR
}
/stats_messages.pb-c.c
${
FL
PT_C_DIR
}
/time_common.pb-c.c
${
FL
PT_C_DIR
}
/controller_commands.pb-c.c
${
FL
PT_C_DIR
}
/mac_primitives.pb-c.c
${
FL
PT_C_DIR
}
/config_messages.pb-c.c
${
FL
PT_C_DIR
}
/config_common.pb-c.c
${
FL
PT_C_DIR
}
/control_delegation.pb-c.c
)
file
(
GLOB
pr
pt_h
${
PR
PT_C_DIR
}
/*.h
)
set
(
pr
pt_h
${
pr
pt_h
}
)
file
(
GLOB
fl
pt_h
${
FL
PT_C_DIR
}
/*.h
)
set
(
fl
pt_h
${
fl
pt_h
}
)
add_library
(
PR
PT_MSG
${
PR
PT_OAI_generated
}
${
PR
PT_source
}
add_library
(
FL
PT_MSG
${
FL
PT_OAI_generated
}
${
FL
PT_source
}
)
set
(
PR
PT_MSG_LIB
PR
PT_MSG
)
#message("prpt c dir is : ${
PR
PT_C_DIR}")
include_directories
(
${
PR
PT_C_DIR
}
)
set
(
FL
PT_MSG_LIB
FL
PT_MSG
)
#message("prpt c dir is : ${
FL
PT_C_DIR}")
include_directories
(
${
FL
PT_C_DIR
}
)
add_library
(
ASYNC_IF
${
OPENAIR2_DIR
}
/UTIL/ASYNC_IF/socket_link.c
...
...
@@ -1757,7 +1757,7 @@ add_executable(lte-softmodem
target_link_libraries
(
lte-softmodem -ldl
-Wl,--start-group
RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
NAS_UE_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
PR
PT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
ENB_AGENT_LIB
}
LFDS7
RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
NAS_UE_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
FL
PT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
ENB_AGENT_LIB
}
LFDS7
-Wl,--end-group
)
target_link_libraries
(
lte-softmodem
${
LIBXML2_LIBRARIES
}
)
...
...
@@ -1791,7 +1791,7 @@ add_executable(lte-softmodem-nos1
)
target_link_libraries
(
lte-softmodem-nos1
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
PR
PT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
ENB_AGENT_LIB
}
LFDS7
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
FL
PT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
ENB_AGENT_LIB
}
LFDS7
-Wl,--end-group
)
target_link_libraries
(
lte-softmodem-nos1
${
LIBXML2_LIBRARIES
}
)
...
...
@@ -1936,7 +1936,7 @@ add_executable(oaisim_nos1
target_include_directories
(
oaisim_nos1 PUBLIC
${
OPENAIR_TARGETS
}
/SIMU/USER
)
target_link_libraries
(
oaisim_nos1
-Wl,--start-group
RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS
${
MSC_LIB
}
L2
${
RAL_LIB
}
SIMU SIMU_ETH SECU_OSA
${
ITTI_LIB
}
${
MIH_LIB
}
${
PR
PT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
ENB_AGENT_LIB
}
LFDS7
RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS
${
MSC_LIB
}
L2
${
RAL_LIB
}
SIMU SIMU_ETH SECU_OSA
${
ITTI_LIB
}
${
MIH_LIB
}
${
FL
PT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
ENB_AGENT_LIB
}
LFDS7
-Wl,--end-group
)
target_link_libraries
(
oaisim_nos1
${
LIBXML2_LIBRARIES
}
${
LAPACK_LIBRARIES
}
)
...
...
openair2/ENB_APP/MESSAGES/V2/config_common.proto
View file @
b2181288
...
...
@@ -5,64 +5,64 @@ package protocol;
// Cell config related structures and enums
//
message
prp
_si_config
{
message
flex
_si_config
{
optional
uint32
sfn
=
1
;
optional
uint32
sib1_length
=
2
;
// The length of SIB1 in bytes
optional
uint32
si_window_length
=
3
;
// The scheduling window for all SIs in SF
repeated
prp
_si_message
si_message
=
4
;
// List of SI messages to be sent.
repeated
flex
_si_message
si_message
=
4
;
// List of SI messages to be sent.
// The index identifies the type of an SI message
// 0 - SIB1
// 1..31 - SIx
// 32..63 - PCCH
}
message
prp
_si_message
{
message
flex
_si_message
{
optional
uint32
periodicity
=
1
;
// Periodicity of SI msg in radio frames
optional
uint32
length
=
2
;
// The length of the SI message in bytes
}
enum
prp
_hopping_mode
{
PR
HM_INTER
=
0
;
PR
HM_INTERINTRA
=
1
;
enum
flex
_hopping_mode
{
FL
HM_INTER
=
0
;
FL
HM_INTERINTRA
=
1
;
}
enum
prp
_phich_resource
{
PR
PR_ONE_SIXTH
=
0
;
PR
PR_HALF
=
1
;
PR
PR_ONE
=
2
;
PR
PR_TWO
=
3
;
enum
flex
_phich_resource
{
FL
PR_ONE_SIXTH
=
0
;
FL
PR_HALF
=
1
;
FL
PR_ONE
=
2
;
FL
PR_TWO
=
3
;
}
enum
prp
_phich_duration
{
PR
PD_NORMAL
=
0
;
PR
PD_EXTENDED
=
1
;
enum
flex
_phich_duration
{
FL
PD_NORMAL
=
0
;
FL
PD_EXTENDED
=
1
;
}
enum
prp
_ul_cyclic_prefix_length
{
PR
UCPL_NORMAL
=
0
;
PR
UCPL_EXTENDED
=
1
;
enum
flex
_ul_cyclic_prefix_length
{
FL
UCPL_NORMAL
=
0
;
FL
UCPL_EXTENDED
=
1
;
}
enum
prp
_dl_cyclic_prefix_length
{
PR
DCPL_NORMAL
=
0
;
PR
DCPL_EXTENDED
=
1
;
enum
flex
_dl_cyclic_prefix_length
{
FL
DCPL_NORMAL
=
0
;
FL
DCPL_EXTENDED
=
1
;
}
enum
prp
_duplex_mode
{
PR
DM_TDD
=
0
;
PR
DM_FDD
=
1
;
enum
flex
_duplex_mode
{
FL
DM_TDD
=
0
;
FL
DM_FDD
=
1
;
}
enum
prp
_qam
{
PR
EQ_MOD_16QAM
=
0
;
PR
EQ_MOD_64QAM
=
1
;
enum
flex
_qam
{
FL
EQ_MOD_16QAM
=
0
;
FL
EQ_MOD_64QAM
=
1
;
}
//
// UE config related structures and enums
//
message
prp
_drx_config
{
message
flex
_drx_config
{
optional
uint32
on_duration_timer
=
1
;
// Timer in SF. See TS 36.321
optional
uint32
drx_inactivity_timer
=
2
;
// Timer in SF. See TS 36.321
optional
uint32
drx_retransmission_timer
=
3
;
// Timer in SF. See TS 36.321
...
...
@@ -72,30 +72,30 @@ message prp_drx_config {
optional
uint32
drx_short_cycle_timer
=
7
;
// Timer in subframes. See TS 36.321
}
message
prp
_sps_config
{
message
flex
_sps_config
{
optional
uint32
semi_persistent_sched_interval_UL
=
1
;
// SPS UL scheduling interval in SF
optional
uint32
semi_persistent_sched_interval_DL
=
2
;
// SPS DL scheduling interval in SF
optional
uint32
num_of_conf_sps_proc
=
3
;
// Number of SPS HARQ processes. See TS 36.321
repeated
uint32
n1_PUCCH_AN_persistent_element
=
4
;
// See TS36.213. Ignored when config is used
// as part of
PR
PT_SET_UE_CONFIG
// as part of
FL
PT_SET_UE_CONFIG
optional
uint32
implicit_release_after
=
5
;
// number of empty transmissions before release of SPS
}
message
prp
_sr_config
{
message
flex
_sr_config
{
optional
uint32
sr_action
=
1
;
// Indicates if SR config should be changed or released
// One of the
PR
SRA_* enum values
// One of the
FL
SRA_* enum values
optional
uint32
sched_interval
=
2
;
// SR scheduling interval in SF
optional
uint32
dsr_trans_max
=
3
;
// See TS 36.213
}
message
prp
_cqi_config
{
message
flex
_cqi_config
{
optional
uint32
cqi_action
=
1
;
// Indicats if CQI changed or released.
// One of the
PR
SRA_* enum values
// One of the
FL
SRA_* enum values
optional
uint32
cqi_sched_interval
=
2
;
// CQI scheduling interval in SF
optional
uint32
ri_sched_interval
=
3
;
// RI scheduling interval in SF
}
message
prp
_ue_capabilities
{
message
flex
_ue_capabilities
{
optional
uint32
half_duplex
=
1
;
// Boolean value. Only half duplex support. FDD operation
optional
uint32
intra_SF_hopping
=
2
;
// Support for intra-subframe hopping. Boolean value
optional
uint32
type2_sb_1
=
3
;
// Support for type 2 hopping with n_sb > 1
...
...
@@ -103,7 +103,7 @@ message prp_ue_capabilities {
optional
uint32
res_alloc_type1
=
5
;
// Boolean value. UE support for resource allocation type 1
}
message
prp
_scell_config
{
message
flex
_scell_config
{
optional
uint32
carrier_index
=
1
;
// Id of the carrier component
optional
uint32
scell_index
=
2
;
// Index of this Scell (RRC SCellIndex)
optional
uint32
use_ccs
=
3
;
// Boolean value. Indicates if cross-carrier scheduling
...
...
@@ -113,46 +113,46 @@ message prp_scell_config {
optional
uint32
pdsch_start
=
5
;
// Starting OFDM symbol of PDSCH data region for this SCell
}
enum
prp
_meas_gap_config_pattern
{
PR
MGCP_GP1
=
0
;
PR
MGCP_GP2
=
1
;
PR
MGCP_OFF
=
2
;
enum
flex
_meas_gap_config_pattern
{
FL
MGCP_GP1
=
0
;
FL
MGCP_GP2
=
1
;
FL
MGCP_OFF
=
2
;
}
enum
prp
_setup_release_action
{
PR
SRA_SETUP
=
0
;
PR
SRA_RELEASE
=
1
;
enum
flex
_setup_release_action
{
FL
SRA_SETUP
=
0
;
FL
SRA_RELEASE
=
1
;
}
enum
prp
_ue_transmission_antenna
{
PR
UTA_NONE
=
0
;
PR
UTA_OPEN_LOOP
=
1
;
PR
UTA_CLOSED_LOOP
=
2
;
enum
flex
_ue_transmission_antenna
{
FL
UTA_NONE
=
0
;
FL
UTA_OPEN_LOOP
=
1
;
FL
UTA_CLOSED_LOOP
=
2
;
}
enum
prp
_aperiodic_cqi_report_mode
{
PR
ACRM_RM12
=
0
;
PR
ACRM_RM20
=
1
;
PR
ACRM_RM22
=
2
;
PR
ACRM_RM30
=
3
;
PR
ACRM_RM31
=
4
;
PR
ACRM_NONE
=
5
;
enum
flex
_aperiodic_cqi_report_mode
{
FL
ACRM_RM12
=
0
;
FL
ACRM_RM20
=
1
;
FL
ACRM_RM22
=
2
;
FL
ACRM_RM30
=
3
;
FL
ACRM_RM31
=
4
;
FL
ACRM_NONE
=
5
;
}
enum
prp
_tdd_ack_nack_feedback_mode
{
PR
TANFM_BUNDLING
=
0
;
PR
TANFM_MULTIPLEXING
=
1
;
enum
flex
_tdd_ack_nack_feedback_mode
{
FL
TANFM_BUNDLING
=
0
;
FL
TANFM_MULTIPLEXING
=
1
;
}
//
// Logical channel config related structures and enums
//
message
prp
_lc_config
{
message
flex
_lc_config
{
optional
uint32
lcid
=
1
;
// The logical channel id
optional
uint32
lcg
=
2
;
// The logical channel group (0..3) the LC is mapped to
optional
uint32
direction
=
3
;
// The LC direction. One of the
PR
LCD_* enum values
optional
uint32
qos_bearer_type
=
4
;
// GBR or NGBR bearer. One of the
PR
QBT_* enum values
optional
uint32
direction
=
3
;
// The LC direction. One of the
FL
LCD_* enum values
optional
uint32
qos_bearer_type
=
4
;
// GBR or NGBR bearer. One of the
FL
QBT_* enum values
optional
uint32
qci
=
5
;
// The QCI defined in TS 23.203, coded as defined in TS 36.413
// One less than the actual QCI value
optional
uint64
e_RAB_max_bitrate_UL
=
6
;
// In bps (GBR only)
...
...
@@ -161,20 +161,20 @@ message prp_lc_config {
optional
uint64
e_RAB_guaranteed_bitrate_DL
=
9
;
// In bps (GBR only)
}
enum
prp
_lc_direction
{
PR
LCD_UL
=
0
;
PR
LCD_DL
=
1
;
PR
LCD_BOTH
=
2
;
enum
flex
_lc_direction
{
FL
LCD_UL
=
0
;
FL
LCD_DL
=
1
;
FL
LCD_BOTH
=
2
;
}
enum
prp
_qos_bearer_type
{
PR
QBT_NON_GBR
=
0
;
PR
QBT_GBR
=
1
;
enum
flex
_qos_bearer_type
{
FL
QBT_NON_GBR
=
0
;
FL
QBT_GBR
=
1
;
}
enum
prp
_ue_state_change_type
{
PR
UESC_UPDATED
=
0
;
PR
UESC_ACTIVATED
=
1
;
PR
UESC_DEACTIVATED
=
2
;
PR
UESC_MOVED
=
3
;
enum
flex
_ue_state_change_type
{
FL
UESC_UPDATED
=
0
;
FL
UESC_ACTIVATED
=
1
;
FL
UESC_DEACTIVATED
=
2
;
FL
UESC_MOVED
=
3
;
}
\ No newline at end of file
openair2/ENB_APP/MESSAGES/V2/config_messages.proto
View file @
b2181288
...
...
@@ -3,23 +3,23 @@ package protocol;
import
"config_common.proto"
;
message
prp
_cell_config
{
message
flex
_cell_config
{
optional
uint32
phy_cell_id
=
1
;
// The PCI of this cell
optional
uint32
cell_id
=
2
;
// The PLMN cell id of this cell
optional
uint32
pusch_hopping_offset
=
3
;
// PUSCH resources in RBs for hopping
optional
uint32
hopping_mode
=
4
;
// One of the
PR
HM_* enum values
optional
uint32
hopping_mode
=
4
;
// One of the
FL
HM_* enum values
optional
uint32
n_sb
=
5
;
// The number of subbands
optional
uint32
phich_resource
=
6
;
// The number of REGs used for PHICH
// One of the
PR
PR_* enum values
optional
uint32
phich_duration
=
7
;
// One of the
PR
PD_* enum values
// One of the
FL
PR_* enum values
optional
uint32
phich_duration
=
7
;
// One of the
FL
PD_* enum values
optional
uint32
init_nr_PDCCH_OFDM_sym
=
8
;
// See TS 36.211, section 6.9
optional
prp
_si_config
si_config
=
9
;
// The SI configuration
optional
flex
_si_config
si_config
=
9
;
// The SI configuration
optional
uint32
dl_bandwidth
=
10
;
// The DL transmission bandwidth in RBs
optional
uint32
ul_bandwidth
=
11
;
// The UL transmission bandwidth in RBs
optional
uint32
ul_cyclic_prefix_length
=
13
;
// One of the
PR
UCPL_* enum values
optional
uint32
dl_cyclic_prefix_length
=
14
;
// One of the
PR
DCPL_* enum values
optional
uint32
ul_cyclic_prefix_length
=
13
;
// One of the
FL
UCPL_* enum values
optional
uint32
dl_cyclic_prefix_length
=
14
;
// One of the
FL
DCPL_* enum values
optional
uint32
antenna_ports_count
=
15
;
// Number of cell specific antenna ports
optional
uint32
duplex_mode
=
16
;
// One of the
PR
DM_* enum values
optional
uint32
duplex_mode
=
16
;
// One of the
FL
DM_* enum values
optional
uint32
subframe_assignment
=
17
;
// DL/UL subframe assignment. TDD only
optional
uint32
special_subframe_patterns
=
18
;
// TDD only. See TS 36.211, table 4.2.1
repeated
uint32
mbsfn_subframe_config_rfperiod
=
19
;
// The MBSFN radio frame period (Optional)
...
...
@@ -36,30 +36,30 @@ message prp_cell_config {
optional
uint32
srs_subframe_config
=
30
;
// See TS 36.211, table 5.5.3.3-1 and 2
optional
uint32
srs_bw_config
=
31
;
// See TS 36.211, section 5.5.3.2
optional
uint32
srs_mac_up_pts
=
32
;
// Boolean value. See TS 36.211, section 5.5.3.2. TDD only
optional
uint32
enable_64QAM
=
33
;
// One of the
PR
EQ_* enum values
optional
uint32
enable_64QAM
=
33
;
// One of the
FL
EQ_* enum values
optional
uint32
carrier_index
=
34
;
// Carrier component index
}
message
prp
_ue_config
{
message
flex
_ue_config
{
optional
uint32
rnti
=
1
;
optional
prp
_drx_config
drx_config
=
2
;
// The DRX configuration (Optional)
optional
flex
_drx_config
drx_config
=
2
;
// The DRX configuration (Optional)
optional
uint32
time_alignment_timer
=
3
;
// Timer in SF. Control the synchronization
// status of the UE, not the actual advance procedure
// See TS 36.321
optional
uint32
meas_gap_config_pattern
=
4
;
// Measurement gap configuration.
// One of the
PR
MGCP_* enum values
// One of the
FL
MGCP_* enum values
// See TS 36.133
optional
uint32
meas_gap_config_sf_offset
=
5
;
// Measurement gap offset if applicable
optional
prp
_sps_config
sps_config
=
6
;
// The SPS configuration (Optional)
optional
prp
_sr_config
sr_config
=
7
;
// The SR configuration (Optional)
optional
prp
_cqi_config
cqi_config
=
8
;
// The CQI configuration (Optional)
optional
flex
_sps_config
sps_config
=
6
;
// The SPS configuration (Optional)
optional
flex
_sr_config
sr_config
=
7
;
// The SR configuration (Optional)
optional
flex
_cqi_config
cqi_config
=
8
;
// The CQI configuration (Optional)
optional
uint32
transmission_mode
=
9
;
// The UE transmission mode
optional
uint64
ue_aggregated_max_bitrate_UL
=
10
;
// Aggregated bit-rate of non-gbr bearer
// per UE. See TS 36.413
optional
uint64
ue_aggregated_max_bitrate_DL
=
11
;
// Aggregated bit-rate of non-gbr bearer
// per UE. See TS 36.413
optional
prp
_ue_capabilities
capabilities
=
12
;
optional
uint32
ue_transmission_antenna
=
13
;
// One of the
PR
UTA_* enum values
optional
flex
_ue_capabilities
capabilities
=
12
;
optional
uint32
ue_transmission_antenna
=
13
;
// One of the
FL
UTA_* enum values
optional
uint32
tti_bundling
=
14
;
// Boolean value. See TS 36.321
optional
uint32
max_HARQ_tx
=
15
;
// The max HARQ retransmission for UL
optional
uint32
beta_offset_ACK_index
=
16
;
// See TS 36.213
...
...
@@ -67,20 +67,20 @@ message prp_ue_config {
optional
uint32
beta_offset_CQI_index
=
18
;
// See TS 36.213
optional
uint32
ack_nack_simultaneous_trans
=
19
;
// Boolean. See TS 36.213
optional
uint32
simultaneous_ack_nack_cqi
=
20
;
// Boolean. See TS 36.213
optional
uint32
aperiodic_cqi_rep_mode
=
21
;
// One of the
PR
ACRM_* enum values
optional
uint32
tdd_ack_nack_feedback
=
22
;
// One of the
PR
TANFM_* enum values
optional
uint32
aperiodic_cqi_rep_mode
=
21
;
// One of the
FL
ACRM_* enum values
optional
uint32
tdd_ack_nack_feedback
=
22
;
// One of the
FL
TANFM_* enum values
optional
uint32
ack_nack_repetition_factor
=
23
;
// See TS 36.213, section 10.1
optional
uint32
extended_bsr_size
=
24
;
// Boolean for extended BSR size
optional
uint32
ca_support
=
25
;
// Boolean. Support for carrier aggregation
optional
uint32
cross_carrier_sched_support
=
26
;
// Boolean value
optional
uint32
pcell_carrier_index
=
27
;
// Index of primary cell
repeated
prp
_scell_config
scell_config
=
28
;
// Secondary cells configuration
repeated
flex
_scell_config
scell_config
=
28
;
// Secondary cells configuration
optional
uint32
scell_deactivation_timer
=
29
;
// Deactivation timer for secondary cell
}
message
prp
_lc_ue_config
{
message
flex
_lc_ue_config
{
optional
uint32
rnti
=
1
;
repeated
prp
_lc_config
lc_config
=
2
;
// A list of LC configurations for the given UE
repeated
flex
_lc_config
lc_config
=
2
;
// A list of LC configurations for the given UE
}
...
...
openair2/ENB_APP/MESSAGES/V2/control_delegation.proto
View file @
b2181288
//'syntax = "proto2";'
package
protocol
;
enum
prp
_control_delegation_type
{
PR
CDT_MAC_DL_UE_SCHEDULER
=
1
;
// DL UE scheduler delegation
enum
flex
_control_delegation_type
{
FL
CDT_MAC_DL_UE_SCHEDULER
=
1
;
// DL UE scheduler delegation
}
\ No newline at end of file
openair2/ENB_APP/MESSAGES/V2/controller_commands.proto
View file @
b2181288
...
...
@@ -6,11 +6,11 @@ import "mac_primitives.proto";
// Body of UE DL MAC scheduling configuration info
//
message
prp
_dl_data
{
message
flex
_dl_data
{
optional
uint32
rnti
=
1
;
optional
prp
_dl_dci
dl_dci
=
2
;
optional
flex
_dl_dci
dl_dci
=
2
;
repeated
uint32
ce_bitmap
=
3
;
// list of 2 MAC CEs, one for each TB
repeated
prp
_rlc_pdu
rlc_pdu
=
4
;
// list of parameters for the creation of RLC PDUs. One for each lcid
repeated
flex
_rlc_pdu
rlc_pdu
=
4
;
// list of parameters for the creation of RLC PDUs. One for each lcid
optional
uint32
serv_cell_index
=
5
;
optional
uint32
act_deact_ce
=
6
;
//Hex content of MAC CE for Activation/Deactivation in CA
}
...
...
@@ -18,10 +18,10 @@ message prp_dl_data {
//
// Body of the RAR scheduler configuration
//
message
prp
_dl_rar
{
message
flex
_dl_rar
{
optional
uint32
rnti
=
1
;
optional
uint32
grant
=
2
;
// The 20-bit UL grant. TS 36.213, sec 6.2
optional
prp
_dl_dci
rar_dci
=
3
;
optional
flex
_dl_dci
rar_dci
=
3
;
optional
uint32
carrier_index
=
4
;
// The carrier index for the RAR
}
...
...
@@ -29,13 +29,13 @@ message prp_dl_rar {
// Body of the paging/broadcast configuration message
//
message
prp
_dl_broadcast
{
optional
uint32
type
=
1
;
// The
PR
BT_* values
message
flex
_dl_broadcast
{
optional
uint32
type
=
1
;
// The
FL
BT_* values
optional
uint32
index
=
2
;
// Index of the broadcast message:
// 0 - SIB1,
// 1..31 - Six,
// 32..63 - PCCH (PCCH index obtained from
prp
_paging_info)
optional
prp
_dl_dci
broad_dci
=
3
;
// 32..63 - PCCH (PCCH index obtained from
flex
_paging_info)
optional
flex
_dl_dci
broad_dci
=
3
;
optional
uint32
carrier_index
=
4
;
// Index of the carrier for broadcast
}
...
...
@@ -43,7 +43,7 @@ message prp_dl_broadcast {
// Body of the OFDM symbol count message
//
message
prp
_pdcch_ofdm_sym_count
{
message
flex
_pdcch_ofdm_sym_count
{
optional
uint32
carrier_index
=
1
;
optional
uint32
num_pdcch_ofdm_symbols
=
2
;
}
...
...
@@ -52,7 +52,7 @@ message prp_pdcch_ofdm_sym_count {
// Types of commands related enums
//
enum
prp
_broadcast_type
{
PR
BT_BCCH
=
0
;
PR
BT_PCCH
=
1
;
enum
flex
_broadcast_type
{
FL
BT_BCCH
=
0
;
FL
BT_PCCH
=
1
;
}
\ No newline at end of file
openair2/ENB_APP/MESSAGES/V2/
prog
ran.proto
→
openair2/ENB_APP/MESSAGES/V2/
flex
ran.proto
View file @
b2181288
...
...
@@ -8,30 +8,30 @@ import "config_messages.proto";
import
"controller_commands.proto"
;
import
"control_delegation.proto"
;
message
prog
ran_message
{
optional
prog
ran_direction
msg_dir
=
100
;
message
flex
ran_message
{
optional
flex
ran_direction
msg_dir
=
100
;
oneof
msg
{
prp
_hello
hello_msg
=
1
;
prp
_echo_request
echo_request_msg
=
2
;
prp
_echo_reply
echo_reply_msg
=
3
;
prp
_stats_request
stats_request_msg
=
4
;
prp
_stats_reply
stats_reply_msg
=
5
;
prp
_sf_trigger
sf_trigger_msg
=
6
;
prp
_ul_sr_info
ul_sr_info_msg
=
7
;
prp
_enb_config_request
enb_config_request_msg
=
8
;
prp
_enb_config_reply
enb_config_reply_msg
=
9
;
prp
_ue_config_request
ue_config_request_msg
=
10
;
prp
_ue_config_reply
ue_config_reply_msg
=
11
;
prp
_lc_config_request
lc_config_request_msg
=
12
;
prp
_lc_config_reply
lc_config_reply_msg
=
13
;
prp
_dl_mac_config
dl_mac_config_msg
=
14
;
prp
_ue_state_change
ue_state_change_msg
=
15
;
prp
_control_delegation
control_delegation_msg
=
16
;
prp
_agent_reconfiguration
agent_reconfiguration_msg
=
17
;
flex
_hello
hello_msg
=
1
;
flex
_echo_request
echo_request_msg
=
2
;
flex
_echo_reply
echo_reply_msg
=
3
;
flex
_stats_request
stats_request_msg
=
4
;
flex
_stats_reply
stats_reply_msg
=
5
;
flex
_sf_trigger
sf_trigger_msg
=
6
;
flex
_ul_sr_info
ul_sr_info_msg
=
7
;
flex
_enb_config_request
enb_config_request_msg
=
8
;
flex
_enb_config_reply
enb_config_reply_msg
=
9
;
flex
_ue_config_request
ue_config_request_msg
=
10
;
flex
_ue_config_reply
ue_config_reply_msg
=
11
;
flex
_lc_config_request
lc_config_request_msg
=
12
;
flex
_lc_config_reply
lc_config_reply_msg
=
13
;
flex
_dl_mac_config
dl_mac_config_msg
=
14
;
flex
_ue_state_change
ue_state_change_msg
=
15
;
flex
_control_delegation
control_delegation_msg
=
16
;
flex
_agent_reconfiguration
agent_reconfiguration_msg
=
17
;
}
}
enum
prog
ran_direction
{
enum
flex
ran_direction
{
//option allow_alias = true;
NOT_SET
=
0
;
INITIATING_MESSAGE
=
1
;
...
...
@@ -39,7 +39,7 @@ enum progran_direction {
UNSUCCESSFUL_OUTCOME
=
3
;
}
enum
prog
ran_err
{
enum
flex
ran_err
{