diff --git a/openair1/EMOS/LTE/IMPORT_FILTER/Makefile b/openair1/EMOS/LTE/IMPORT_FILTER/Makefile index a0484e92ea6637f26df9f6611d7f88cc59bf6364..da66cace6e3685484dcb014426bc4e3eeff640c5 100644 --- a/openair1/EMOS/LTE/IMPORT_FILTER/Makefile +++ b/openair1/EMOS/LTE/IMPORT_FILTER/Makefile @@ -4,7 +4,7 @@ SRC = dump_size.c #CFLAGS = $(shell rtai-config --lxrt-cflags) #LDFLAGS = $(shell rtai-config --lxrt-ldflags) -lpthread -lm -lgps -lforms #-llxrt -CFLAGS += -m32 -I$(OPENAIR1_DIR) -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES +CFLAGS += -m32 -I$(OPENAIR1_DIR) -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES -I$(OPENAIR_HOME)/common/utils -I$(OPENAIR2_DIR) -I$(OPENAIR2_DIR)/COMMON CFLAGS += -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 diff --git a/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m b/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m index dd0a84560a829b34dbb49846d28b08436b9de314..b0800f1f3843dcc71fd4adafe47028b02c027b51 100644 --- a/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m +++ b/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m @@ -25,7 +25,7 @@ PBCH_PDU_SIZE = 6; NUMBER_OF_eNB_MAX = 3; NUMBER_OF_UE_MAX = 2; -NUMBER_OF_SUBBANDS = 7; +NUMBER_OF_SUBBANDS = 13; NB_ANTENNAS_RX = 2; NB_ANTENNAS_TX = 2; @@ -36,14 +36,14 @@ MAX_DCI_SIZE_BITS = 45; % EMOS_CHANNEL = 0; % enable this line to enable error checking -% get_dump_size +get_dump_size phy_measurements_struct = struct(... - 'rssi', int32(0),... - 'n_adj_cells', uint32(0),... + 'rssi', uint32(0),... + 'n_adj_cells', int32(0),... 'n_adj_cells_id', uint32(zeros(1,6)),... - 'rsrq', int32(zeros(1,7)),... - 'rsrp', int32(zeros(1,7)),... + 'rsrq', uint32(zeros(1,7)),... + 'rsrp', uint32(zeros(1,7)),... 'rsrp_filtered', single(zeros(1,7)),... 'rsrq_filtered', single(zeros(1,7)),... 'n0_power', uint32(zeros(1,NB_ANTENNAS_RX)),... @@ -53,7 +53,7 @@ phy_measurements_struct = struct(... 'n0_power_avg', uint32(0),... 'n0_power_avg_dB', uint16(0),... 'n0_power_tot_dBm', int16(0),... - 'rx_spatial_power', uint32(zeros(2,2,NUMBER_OF_eNB_MAX)),... + 'rx_spatial_power', int32(zeros(2,2,NUMBER_OF_eNB_MAX)),... 'rx_spatial_power_dB', uint16(zeros(2,2,NUMBER_OF_eNB_MAX)),... 'rx_power', int32(zeros(NB_ANTENNAS_RX,NUMBER_OF_eNB_MAX)),... 'rx_power_dB', uint16(zeros(NB_ANTENNAS_RX,NUMBER_OF_eNB_MAX)),... @@ -174,27 +174,34 @@ eNb_UE_stats_struct = struct(... 'timing_advance_update',int32(0),... 'UE_mode',uint32(0),... 'sector',uint8(0),... - 'dlsch_sliding_cnt', uint32(0),... - 'dlsch_ACK', uint32(zeros(1,8)),... - 'dlsch_NAK', uint32(zeros(1,8)),... - 'dlsch_l2_errors', uint32(0),... - 'dlsch_trials', uint32(zeros(1,8)),... - 'ulsch_errors', uint32(zeros(1,3)),... - 'ulsch_consecutive_errors', uint32(zeros(1,3)),... - 'ulsch_decoding_attempts', uint32(zeros(8,3)),... - 'ulsch_round_errors', uint32(zeros(8,3)),... - 'ulsch_decoding_attempts_last', uint32(zeros(8,3)),... - 'ulsch_round_errors_last', uint32(zeros(8,3)),... - 'ulsch_round_fer', uint32(zeros(8,3)),... + + 'dlsch_l2_errors', uint32(zeros(1,8)),... + 'dlsch_trials', uint32(zeros(8,8)),... + 'dlsch_ACK', uint32(zeros(8,8)),... + 'dlsch_NAK', uint32(zeros(8,8)),... + + 'ulsch_errors', uint32(zeros(1,8)),... + 'ulsch_consecutive_errors', uint32(0),... + 'ulsch_decoding_attempts', uint32(zeros(8,8)),... + 'ulsch_round_errors', uint32(zeros(8,8)),... + 'ulsch_decoding_attempts_last', uint32(zeros(8,8)),... + 'ulsch_round_errors_last', uint32(zeros(8,8)),... + 'ulsch_round_fer', uint32(zeros(8,8)),... 'sr_received', uint32(0), ... 'sr_total', uint32(0), ... + + 'dlsch_sliding_cnt', uint32(0),... + 'dlsch_NAK_round0', uint32(0),... 'dlsch_mcs_offset', int8(0),... + 'dlsch_mcs1', uint8(0),... 'dlsch_mcs2', uint8(0),... - 'total_TBS', uint32(0),... - 'total_TBS_last', uint32(0),... - 'dlsch_bitrate', uint32(0),... - 'total_transmitted_bits', uint32(0)); + 'total_TBS_MAC', int32(0),... + 'total_TBS', int32(0),... + 'total_TBS_last', int32(0),... + 'dlsch_bitrate', uint32(0) + %'total_transmitted_bits', uint32(0) +); eNb_UE_stats_struct_a = cstruct(eNb_UE_stats_struct,[],4);