From 838b93e2de94e62fc3f375d75437d3deb92f9872 Mon Sep 17 00:00:00 2001 From: Florian Kaltenberger Date: Wed, 1 Apr 2015 11:47:48 +0000 Subject: [PATCH] adding mex file for matlab 64bit linux git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6971 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- .../EMOS/LTE/IMPORT_FILTER/cstruct.mexa64 | Bin 0 -> 17639 bytes .../LTE/IMPORT_FILTER/struct_template_new.m | 41 ++++++++++-------- 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100755 openair1/EMOS/LTE/IMPORT_FILTER/cstruct.mexa64 diff --git a/openair1/EMOS/LTE/IMPORT_FILTER/cstruct.mexa64 b/openair1/EMOS/LTE/IMPORT_FILTER/cstruct.mexa64 new file mode 100755 index 0000000000000000000000000000000000000000..1ea42265cf020c52ab324aca5fa6b94a61116cbf GIT binary patch literal 17639 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 WcgD&2u^!SP>x_fzV?}fp`+oqRA0?jv literal 0 HcmV?d00001 diff --git a/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m b/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m index bcd5e90abb..c633cf8c98 100644 --- a/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m +++ b/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m @@ -14,8 +14,8 @@ N_PILOTS_DL_EMOS = 2; % ofdm symbols with pilots per slot N_PILOTS_UL_EMOS = 2; % ofdm symbols with pilots per subframe N_SLOTS_DL_EMOS = 2; % we take slots 10,11 N_SUBFRAMES_UL_EMOS = 1; % we take subframes 3 -NB_ANTENNAS_TX_EMOS = 2; -NB_ANTENNAS_RX_EMOS = 2; +NB_ANTENNAS_TX_EMOS = 2; % antennas at eNB +NB_ANTENNAS_RX_EMOS = 2; % antennas at UE MAX_DCI_PER_FRAME = 20; @@ -27,21 +27,34 @@ NUMBER_OF_eNB_MAX = 3; NUMBER_OF_UE_MAX = 2; NUMBER_OF_SUBBANDS = 13; -NB_ANTENNAS_RX = 2; -NB_ANTENNAS_TX = 2; +NB_ANTENNAS_RX = 2; % maximum number of antennas (for memory allocation only) +%NB_ANTENNAS_TX = 2; MAX_CQI_BITS = 40; MAX_DCI_SIZE_BITS = 45; -%EMOS_CHANNEL = 0; - % enable this line to enable error checking -if isunix - get_dump_size -else - warning('Error checking of sizes only possible in Linux'); +if exist('check_errors','var') && (check_errors==1) + if isunix + get_dump_size + else + warning('Error checking of sizes only possible in Linux'); + end end +if ~exist('align','var') + error('variable align must be specified'); +else + if ((align~=4) && (align~=8)) + error('variable align must be either 4 or 8'); + end +end + +if ~exist('EMOS_CHANNEL','var') + error('variable EMOS_CHANNEL must be specified'); +end + + phy_measurements_struct = struct(... 'rssi', uint32(0),... 'n_adj_cells', int32(0),... @@ -178,12 +191,10 @@ eNb_UE_stats_struct = struct(... 'timing_advance_update',int32(0),... 'UE_mode',uint32(0),... 'sector',uint8(0),... - '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)),... @@ -193,19 +204,15 @@ eNb_UE_stats_struct = struct(... '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_MAC', int32(0),... 'total_TBS', int32(0),... 'total_TBS_last', int32(0),... - 'dlsch_bitrate', uint32(0) - %'total_transmitted_bits', uint32(0) -); + 'dlsch_bitrate', uint32(0)); eNb_UE_stats_struct_a = cstruct(eNb_UE_stats_struct,[],align);