Commit 2fbe01e1 authored by Xenofon Foukas's avatar Xenofon Foukas

Added support for timing messages in DL/UL

parent ed7e13c6
...@@ -709,6 +709,7 @@ if (ENB_AGENT_SB_IF) ...@@ -709,6 +709,7 @@ if (ENB_AGENT_SB_IF)
${PRPT_MSG_DIR}/progran.proto ${PRPT_MSG_DIR}/progran.proto
${PRPT_MSG_DIR}/stats_common.proto ${PRPT_MSG_DIR}/stats_common.proto
${PRPT_MSG_DIR}/stats_messages.proto ${PRPT_MSG_DIR}/stats_messages.proto
${PRPT_MSG_DIR}/time_common.proto
) )
set(PRPT_C_DIR ${protobuf_generated_dir}/${PRPTDIR}) set(PRPT_C_DIR ${protobuf_generated_dir}/${PRPTDIR})
...@@ -720,6 +721,7 @@ if (ENB_AGENT_SB_IF) ...@@ -720,6 +721,7 @@ if (ENB_AGENT_SB_IF)
${PRPT_C_DIR}/progran.pb-c.c ${PRPT_C_DIR}/progran.pb-c.c
${PRPT_C_DIR}/stats_common.pb-c.c ${PRPT_C_DIR}/stats_common.pb-c.c
${PRPT_C_DIR}/stats_messages.pb-c.c ${PRPT_C_DIR}/stats_messages.pb-c.c
${PRPT_C_DIR}/time_common.pb-c.c
) )
file(GLOB prpt_h ${PRPT_C_DIR}/*.h) file(GLOB prpt_h ${PRPT_C_DIR}/*.h)
......
...@@ -15,8 +15,12 @@ enum prp_type { ...@@ -15,8 +15,12 @@ enum prp_type {
// Statistics and measurement messages // Statistics and measurement messages
PRPT_STATS_REQUEST = 3; PRPT_STATS_REQUEST = 3;
PRPT_STATS_REPLY = 4; PRPT_STATS_REPLY = 4;
// Time indication messages
PRPT_DL_TRIGGER = 5;
PRPT_UL_TRIGGER = 6;
//Asynchronous messages //Asynchronous messages
PRPT_UL_SR_INFO = 5; PRPT_UL_SR_INFO = 7;
} }
...@@ -3,6 +3,7 @@ package protocol; ...@@ -3,6 +3,7 @@ package protocol;
import "stats_messages.proto"; import "stats_messages.proto";
import "header.proto"; import "header.proto";
import "time_common.proto";
message progran_message { message progran_message {
optional progran_direction msg_dir = 100; optional progran_direction msg_dir = 100;
...@@ -12,7 +13,9 @@ message progran_message { ...@@ -12,7 +13,9 @@ message progran_message {
prp_echo_reply echo_reply_msg = 3; prp_echo_reply echo_reply_msg = 3;
prp_stats_request stats_request_msg = 4; prp_stats_request stats_request_msg = 4;
prp_stats_reply stats_reply_msg = 5; prp_stats_reply stats_reply_msg = 5;
prp_ul_sr_info ul_sr_info_msg = 6; prp_dl_trigger dl_trigger_msg = 6;
prp_ul_trigger ul_trigger_msg = 7;
prp_ul_sr_info ul_sr_info_msg = 8;
} }
} }
...@@ -83,6 +86,22 @@ message prp_stats_reply { ...@@ -83,6 +86,22 @@ message prp_stats_reply {
repeated prp_cell_stats_report cell_report = 3; repeated prp_cell_stats_report cell_report = 3;
} }
//
// Time indication messages
//
message prp_dl_trigger {
optional prp_header header = 1;
optional uint32 sfn_sf = 2;
repeated prp_dl_info dl_info = 3;
}
message prp_ul_trigger {
optional prp_header header = 1;
optional uint32 sfn_sf = 2;
repeated prp_ul_info ul_info = 3;
}
// //
// Asynchronous messages // Asynchronous messages
// //
......
package protocol;
enum prp_harq_status {
PRHS_ACK = 0;
PRHS_NACK = 1;
PRHS_DTX = 2;
}
enum prp_reception_status {
PRRS_OK = 0;
PRRS_NOT_OK = 1;
PRRS_NOT_VALID = 2;
}
message prp_dl_info {
optional uint32 rnti = 1;
optional uint32 harq_process_id = 2;
repeated uint32 harq_status = 3;
optional uint32 serv_cell_index = 4;
}
message prp_ul_info {
optional uint32 rnti = 1;
repeated uint32 ul_reception = 2;
optional uint32 reception_status = 3;
optional uint32 tpc = 4;
optional uint32 serv_cell_index = 5;
}
...@@ -47,6 +47,9 @@ enb_agent_message_decoded_callback messages_callback[][3] = { ...@@ -47,6 +47,9 @@ enb_agent_message_decoded_callback messages_callback[][3] = {
{0, 0, 0}, /*PROTOCOL__PROGRAN_MESSAGE__MSG_ECHO_REPLY_MSG*/ //Must add handler when receiving echo reply {0, 0, 0}, /*PROTOCOL__PROGRAN_MESSAGE__MSG_ECHO_REPLY_MSG*/ //Must add handler when receiving echo reply
{enb_agent_mac_handle_stats, 0, 0}, /*PROTOCOL__PROGRAN_MESSAGE__MSG_STATS_REQUEST_MSG*/ {enb_agent_mac_handle_stats, 0, 0}, /*PROTOCOL__PROGRAN_MESSAGE__MSG_STATS_REQUEST_MSG*/
{0,0,0}, /*PROTOCOL__PROGRAN_MESSAGE__MSG_STATS_REPLY_MSG*/ {0,0,0}, /*PROTOCOL__PROGRAN_MESSAGE__MSG_STATS_REPLY_MSG*/
{0,0,0}, /*DL_TRIGGER*/
{0,0,0}, /*UL_TRIGGER*/
{0,0,0}, /*SR_INFO*/
}; };
...@@ -56,6 +59,8 @@ enb_agent_message_destruction_callback message_destruction_callback[] = { ...@@ -56,6 +59,8 @@ enb_agent_message_destruction_callback message_destruction_callback[] = {
enb_agent_destroy_echo_reply, enb_agent_destroy_echo_reply,
enb_agent_mac_destroy_stats_request, enb_agent_mac_destroy_stats_request,
enb_agent_mac_destroy_stats_reply, enb_agent_mac_destroy_stats_reply,
0,
0,
enb_agent_mac_destroy_sr_info, enb_agent_mac_destroy_sr_info,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment