From 72fcf477ab9640436a1bfa3fe4d6285d987d6d42 Mon Sep 17 00:00:00 2001 From: luckyhacky Date: Mon, 30 Dec 2013 20:32:09 +0100 Subject: [PATCH 01/11] added basic hyperframe support for output --- src/tetra_tdma.c | 3 +-- src/tetra_tdma.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tetra_tdma.c b/src/tetra_tdma.c index 8fffa39..e138f49 100644 --- a/src/tetra_tdma.c +++ b/src/tetra_tdma.c @@ -95,6 +95,5 @@ char *tetra_tdma_time_dump(const struct tetra_tdma_time *tm) uint32_t tetra_tdma_time2fn(struct tetra_tdma_time *tm) { - /* FIXME: add hyperframe number !! */ - return (tm->mn *18) + tm->fn; + return (((tm->hn * 60) + tm->mn) * 18) + tm->fn; } diff --git a/src/tetra_tdma.h b/src/tetra_tdma.h index 86c17af..01519ee 100644 --- a/src/tetra_tdma.h +++ b/src/tetra_tdma.h @@ -4,6 +4,7 @@ #include struct tetra_tdma_time { + uint16_t hn; /* hyperframe number (1 ... 65535) */ uint32_t sn; /* symbol number (1 ... 255) */ uint32_t tn; /* timeslot number (1 .. 4) */ uint32_t fn; /* frame number (1 .. 18) */ From ae6b224cdb985ac5abdf2a0fdc5a1dfeaea9dba8 Mon Sep 17 00:00:00 2001 From: luckyhacky Date: Mon, 30 Dec 2013 20:58:30 +0100 Subject: [PATCH 02/11] set hyperframe number in struct tdma_time --- src/tetra_upper_mac.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tetra_upper_mac.c b/src/tetra_upper_mac.c index e5b9f30..fdc8c73 100644 --- a/src/tetra_upper_mac.c +++ b/src/tetra_upper_mac.c @@ -49,6 +49,7 @@ static void rx_bcast(struct tetra_tmvsap_prim *tmvp, struct tetra_mac_state *tms memset(&sid, 0, sizeof(sid)); macpdu_decode_sysinfo(&sid, msg->l1h); + tmvp->u.unitdata.tdma_time.hn = sid.hyperframe_number; dl_freq = tetra_dl_carrier_hz(sid.freq_band, sid.main_carrier, From 5c69f180ee9667b3efd6dff246558f60d5ec2a43 Mon Sep 17 00:00:00 2001 From: luckyhacky Date: Mon, 30 Dec 2013 23:02:41 +0100 Subject: [PATCH 03/11] fixed typo --- src/tetra_prim.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tetra_prim.h b/src/tetra_prim.h index 9bbb830..8913187 100644 --- a/src/tetra_prim.h +++ b/src/tetra_prim.h @@ -9,7 +9,7 @@ enum tetra_saps { TETRA_SAP_TP, /* between PHY and lower MAC */ - TETRA_SAP_TMV, /* beetween lower and upper MAC */ + TETRA_SAP_TMV, /* between lower and upper MAC */ TETRA_SAP_TMA, TETRA_SAP_TMB, TETRA_SAP_TMD, From 23b7320987a1790d2f40c88aa1c7750faf697054 Mon Sep 17 00:00:00 2001 From: luckyhacky Date: Mon, 30 Dec 2013 23:18:11 +0100 Subject: [PATCH 04/11] align for better readability --- src/tetra_mac_pdu.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/tetra_mac_pdu.c b/src/tetra_mac_pdu.c index 70b5ec9..ec31e4f 100644 --- a/src/tetra_mac_pdu.c +++ b/src/tetra_mac_pdu.c @@ -41,19 +41,19 @@ static void decode_d_mle_sysinfo(struct tetra_mle_si_decoded *msid, const uint8_ void macpdu_decode_sysinfo(struct tetra_si_decoded *sid, const uint8_t *si_bits) { - const uint8_t *cur = si_bits + 4; + const uint8_t *cur = si_bits + 4; - sid->main_carrier = bits_to_uint(cur, 12); cur += 12; - sid->freq_band = bits_to_uint(cur, 4); cur += 4; - sid->freq_offset = bits_to_uint(cur, 2); cur += 2; - sid->duplex_spacing = bits_to_uint(cur, 3); cur += 3; + sid->main_carrier = bits_to_uint(cur, 12); cur += 12; + sid->freq_band = bits_to_uint(cur, 4); cur += 4; + sid->freq_offset = bits_to_uint(cur, 2); cur += 2; + sid->duplex_spacing = bits_to_uint(cur, 3); cur += 3; sid->reverse_operation = *cur++; - sid->num_of_csch = bits_to_uint(cur, 2); cur +=2; - sid->ms_txpwr_max_cell = bits_to_uint(cur, 3); cur += 3; - sid->rxlev_access_min = bits_to_uint(cur, 4); cur += 4; - sid->access_parameter = bits_to_uint(cur, 4); cur += 4; - sid->radio_dl_timeout = bits_to_uint(cur, 4); cur += 4; - sid->cck_valid_no_hf = *cur++; + sid->num_of_csch = bits_to_uint(cur, 2); cur += 2; + sid->ms_txpwr_max_cell = bits_to_uint(cur, 3); cur += 3; + sid->rxlev_access_min = bits_to_uint(cur, 4); cur += 4; + sid->access_parameter = bits_to_uint(cur, 4); cur += 4; + sid->radio_dl_timeout = bits_to_uint(cur, 4); cur += 4; + sid->cck_valid_no_hf = *cur++; if (sid->cck_valid_no_hf) sid->cck_id = bits_to_uint(cur, 16); else From 8cbf131fad4c3a2dc788317fdd80317b8d4bc818 Mon Sep 17 00:00:00 2001 From: luckyhacky Date: Mon, 30 Dec 2013 23:42:36 +0100 Subject: [PATCH 05/11] extended sysinfo as described in section 21.4.4.1 now every transmitted field in sysinfo is analyzed --- src/tetra_mac_pdu.c | 25 +++++++++++++++++++++---- src/tetra_mac_pdu.h | 6 ++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/tetra_mac_pdu.c b/src/tetra_mac_pdu.c index ec31e4f..f1fed10 100644 --- a/src/tetra_mac_pdu.c +++ b/src/tetra_mac_pdu.c @@ -39,9 +39,12 @@ static void decode_d_mle_sysinfo(struct tetra_mle_si_decoded *msid, const uint8_ msid->bs_service_details = bits_to_uint(cur, 12); cur += 12; } +/* see 21.4.4.1 */ void macpdu_decode_sysinfo(struct tetra_si_decoded *sid, const uint8_t *si_bits) { - const uint8_t *cur = si_bits + 4; + const uint8_t *cur = si_bits; + cur += 2; // skip Broadcast PDU header + cur += 2; // skip Sysinfo PDU header sid->main_carrier = bits_to_uint(cur, 12); cur += 12; sid->freq_band = bits_to_uint(cur, 4); cur += 4; @@ -58,9 +61,23 @@ void macpdu_decode_sysinfo(struct tetra_si_decoded *sid, const uint8_t *si_bits) sid->cck_id = bits_to_uint(cur, 16); else sid->hyperframe_number = bits_to_uint(cur, 16); - cur += 16; - /* FIXME: more */ - decode_d_mle_sysinfo(&sid->mle_si, si_bits + 124-42); + + sid->option_field = bits_to_uint(cur, 2); cur += 2; + switch(sid->option_field) + { + case 0x00: // Even multiframe definition for TS mode + case 0x01: // Odd multiframe definition for TS mode + sid->frame_bitmap = bits_to_uint(cur, 20); cur += 20; + break; + case 0x02: // Default definition for access code A + sid->access_code = bits_to_uint(cur, 20); cur += 20; + break; + case 0x04: // Extended services broadcast + sid->ext_service = bits_to_uint(cur, 20); cur += 20; + break; + } + + decode_d_mle_sysinfo(&sid->mle_si, si_bits + 124-42); // could be also cur due to previous fixes } static const uint8_t addr_len_by_type[] = { diff --git a/src/tetra_mac_pdu.h b/src/tetra_mac_pdu.h index 74608a6..b0244ff 100644 --- a/src/tetra_mac_pdu.h +++ b/src/tetra_mac_pdu.h @@ -60,6 +60,12 @@ struct tetra_si_decoded { uint16_t cck_id; uint16_t hyperframe_number; }; + uint8_t option_field; + union { + uint32_t frame_bitmap; + uint32_t access_code; + uint32_t ext_service; + }; struct tetra_mle_si_decoded mle_si; }; From 856ec1c7d1365528cc16024418f7078a8874ee14 Mon Sep 17 00:00:00 2001 From: luckyhacky Date: Mon, 30 Dec 2013 23:58:58 +0100 Subject: [PATCH 06/11] removed hard coded values - exchanged it with enum for better readability --- src/tetra_mac_pdu.c | 8 ++++---- src/tetra_mac_pdu.h | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/tetra_mac_pdu.c b/src/tetra_mac_pdu.c index f1fed10..b395b7c 100644 --- a/src/tetra_mac_pdu.c +++ b/src/tetra_mac_pdu.c @@ -65,14 +65,14 @@ void macpdu_decode_sysinfo(struct tetra_si_decoded *sid, const uint8_t *si_bits) sid->option_field = bits_to_uint(cur, 2); cur += 2; switch(sid->option_field) { - case 0x00: // Even multiframe definition for TS mode - case 0x01: // Odd multiframe definition for TS mode + case TETRA_MAC_OPT_FIELD_EVEN_MULTIFRAME: // Even multiframe definition for TS mode + case TETRA_MAC_OPT_FIELD_ODD_MULTIFRAME: // Odd multiframe definition for TS mode sid->frame_bitmap = bits_to_uint(cur, 20); cur += 20; break; - case 0x02: // Default definition for access code A + case TETRA_MAC_OPT_FIELD_ACCESS_CODE: // Default definition for access code A sid->access_code = bits_to_uint(cur, 20); cur += 20; break; - case 0x04: // Extended services broadcast + case TETRA_MAC_OPT_FIELD_EXT_SERVICES: // Extended services broadcast sid->ext_service = bits_to_uint(cur, 20); cur += 20; break; } diff --git a/src/tetra_mac_pdu.h b/src/tetra_mac_pdu.h index b0244ff..051e47a 100644 --- a/src/tetra_mac_pdu.h +++ b/src/tetra_mac_pdu.h @@ -36,6 +36,13 @@ enum tetra_bs_serv_details { BS_SERVDET_ADV_LINK = (1 << 0), }; +enum tetra_mac_optional_field_flags { + TETRA_MAC_OPT_FIELD_EVEN_MULTIFRAME = 0, + TETRA_MAC_OPT_FIELD_ODD_MULTIFRAME = 1, + TETRA_MAC_OPT_FIELD_ACCESS_CODE = 2, + TETRA_MAC_OPT_FIELD_EXT_SERVICES = 3 +}; + const char *tetra_get_bs_serv_det_name(uint32_t pdu_type); struct tetra_mle_si_decoded { From 5429a1e3abf3e5c1aeadc0253169233faee46cc8 Mon Sep 17 00:00:00 2001 From: Mike Jameson Date: Mon, 25 Aug 2014 14:33:49 +0100 Subject: [PATCH 07/11] updated uhd-tetra_demod.py and cqpsk.py for GNU Radio v3.74 compatibility --- src/demod/python/cqpsk.py | 45 +++++++++++++++-------------- src/demod/python/uhd-tetra_demod.py | 11 +++---- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/demod/python/cqpsk.py b/src/demod/python/cqpsk.py index f9621b1..daf78d9 100644 --- a/src/demod/python/cqpsk.py +++ b/src/demod/python/cqpsk.py @@ -27,7 +27,8 @@ differential PI/4 CQPSK modulation and demodulation. """ -from gnuradio import gr, gru +from gnuradio import gr, gru, blocks, analog, filter, digital +from gnuradio.filter import firdes from math import pi, sqrt #import psk import cmath @@ -110,14 +111,14 @@ class cqpsk_mod(gr.hier_block2): self.chunks2symbols = gr.chunks_to_symbols_bc(psk.constellation[arity]) # pulse shaping filter - self.rrc_taps = gr.firdes.root_raised_cosine( + self.rrc_taps = firdes.root_raised_cosine( self._samples_per_symbol, # gain (sps since we're interpolating by sps) self._samples_per_symbol, # sampling rate 1.0, # symbol rate self._excess_bw, # excess bandwidth (roll-off factor) ntaps) - self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps) + self.rrc_filter = filter.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps) if verbose: self._print_verbage() @@ -145,15 +146,15 @@ class cqpsk_mod(gr.hier_block2): def _setup_logging(self): print "Modulation logging turned on." self.connect(self.bytes2chunks, - gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat")) + blocks.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat")) self.connect(self.symbol_mapper, - gr.file_sink(gr.sizeof_char, "tx_graycoder.dat")) + blocks.file_sink(gr.sizeof_char, "tx_graycoder.dat")) self.connect(self.diffenc, - gr.file_sink(gr.sizeof_char, "tx_diffenc.dat")) + blocks.file_sink(gr.sizeof_char, "tx_diffenc.dat")) self.connect(self.chunks2symbols, - gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat")) + blocks.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat")) self.connect(self.rrc_filter, - gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat")) + blocks.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat")) def add_options(parser): """ @@ -238,19 +239,19 @@ class cqpsk_demod(gr.hier_block2): # Automatic gain control scale = (1.0/16384.0) - self.pre_scaler = gr.multiply_const_cc(scale) # scale the signal from full-range to +-1 + self.pre_scaler = blocks.multiply_const_cc(scale) # scale the signal from full-range to +-1 #self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100) - self.agc = gr.feedforward_agc_cc(16, 2.0) + self.agc = analog.feedforward_agc_cc(16, 2.0) # RRC data filter ntaps = 11 * samples_per_symbol - self.rrc_taps = gr.firdes.root_raised_cosine( + self.rrc_taps = firdes.root_raised_cosine( 1.0, # gain self._samples_per_symbol, # sampling rate 1.0, # symbol rate self._excess_bw, # excess bandwidth (roll-off factor) ntaps) - self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps) + self.rrc_filter=filter.interp_fir_filter_ccf(1, self.rrc_taps) if not self._mm_gain_mu: sbs_to_mm = {2: 0.050, 3: 0.075, 4: 0.11, 5: 0.125, 6: 0.15, 7: 0.15} @@ -281,13 +282,13 @@ class cqpsk_demod(gr.hier_block2): self.receiver.set_beta(self._costas_beta) # Perform Differential decoding on the constellation - self.diffdec = gr.diff_phasor_cc() + self.diffdec = digital.diff_phasor_cc() # take angle of the difference (in radians) - self.to_float = gr.complex_to_arg() + self.to_float = blocks.complex_to_arg() # convert from radians such that signal is in -3/-1/+1/+3 - self.rescale = gr.multiply_const_ff( 1 / (pi / 4) ) + self.rescale = blocks.multiply_const_ff( 1 / (pi / 4) ) if verbose: self._print_verbage() @@ -322,19 +323,19 @@ class cqpsk_demod(gr.hier_block2): def _setup_logging(self): print "Modulation logging turned on." self.connect(self.pre_scaler, - gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat")) + blocks.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat")) self.connect(self.agc, - gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat")) + blocks.file_sink(gr.sizeof_gr_complex, "rx_agc.dat")) self.connect(self.rrc_filter, - gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat")) + blocks.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat")) self.connect(self.receiver, - gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat")) + blocks.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat")) self.connect(self.diffdec, - gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat")) + blocks.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat")) self.connect(self.to_float, - gr.file_sink(gr.sizeof_float, "rx_to_float.dat")) + blocks.file_sink(gr.sizeof_float, "rx_to_float.dat")) self.connect(self.rescale, - gr.file_sink(gr.sizeof_float, "rx_rescale.dat")) + blocks.file_sink(gr.sizeof_float, "rx_rescale.dat")) def add_options(parser): """ diff --git a/src/demod/python/uhd-tetra_demod.py b/src/demod/python/uhd-tetra_demod.py index ac49fb7..6efa40b 100755 --- a/src/demod/python/uhd-tetra_demod.py +++ b/src/demod/python/uhd-tetra_demod.py @@ -2,8 +2,9 @@ import sys import math -from gnuradio import gr, gru, audio, eng_notation, blks2, optfir +from gnuradio import gr, gru, audio, eng_notation, filter, blocks from gnuradio import uhd +from gnuradio.filter import firdes from gnuradio.eng_option import eng_option from optparse import OptionParser @@ -63,9 +64,9 @@ class my_top_block(gr.top_block): sys.stderr.write('Failed to set center frequency\n') raise SystemExit, 1 - channel_taps = gr.firdes.low_pass(1.0, sample_rate, options.low_pass, options.low_pass * 0.1, gr.firdes.WIN_HANN) + channel_taps = firdes.low_pass(1.0, sample_rate, options.low_pass, options.low_pass * 0.1, firdes.WIN_HANN) - FILTER = gr.freq_xlating_fir_filter_ccf(1, channel_taps, options.calibration, sample_rate) + FILTER = filter.freq_xlating_fir_filter_ccf(1, channel_taps, options.calibration, sample_rate) sys.stderr.write("sample rate: %d\n" %(sample_rate)) @@ -78,11 +79,11 @@ class my_top_block(gr.top_block): log=options.log, verbose=options.verbose) - OUT = gr.file_sink(gr.sizeof_float, options.output_file) + OUT = blocks.file_sink(gr.sizeof_float, options.output_file) r = float(sample_rate) / float(new_sample_rate) - INTERPOLATOR = gr.fractional_interpolator_cc(0, r) + INTERPOLATOR = filter.fractional_interpolator_cc(0, r) self.connect(self._u, FILTER, INTERPOLATOR, DEMOD, OUT) From 624a0c15619b0ebbee841bdfcde92133aac28ec8 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 3 Jul 2012 23:43:08 +0200 Subject: [PATCH 08/11] osmosdr-tetra_demod_fft.py: More verbose fine-tuning messages --- src/demod/python/osmosdr-tetra_demod_fft.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/demod/python/osmosdr-tetra_demod_fft.py b/src/demod/python/osmosdr-tetra_demod_fft.py index 648d454..941aad1 100755 --- a/src/demod/python/osmosdr-tetra_demod_fft.py +++ b/src/demod/python/osmosdr-tetra_demod_fft.py @@ -173,8 +173,8 @@ class top_block(grc_wxgui.top_block_gui): if abs(x / (sample_rate / 2)) > 0.9: set_ifreq(self.ifreq + x / 2) else: - sys.stderr.write("coarse tuned to: %d Hz\n" % x) self.offset = -x + sys.stderr.write("coarse tuned to: %d Hz => %d Hz\n" % (self.offset, (self.ifreq + self.offset))) self.tuner.set_center_freq(self.offset) self.scope = fftsink2.fft_sink_c(self.Main.GetPage(0).GetWin(), @@ -195,7 +195,7 @@ class top_block(grc_wxgui.top_block_gui): def fftsink2_callback2(x, y): self.offset = self.offset - (x / 10) - sys.stderr.write("fine tuned to: %d Hz\n" % self.offset) + sys.stderr.write("fine tuned to: %d Hz => %d Hz\n" % (self.offset, (self.ifreq + self.offset))) self.tuner.set_center_freq(self.offset) self.scope2 = fftsink2.fft_sink_c(self.Main.GetPage(1).GetWin(), From 9cac3d56947ee1761b361cbc018ba2fc87eabb80 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 3 Jul 2012 23:43:56 +0200 Subject: [PATCH 09/11] Merged useful extra features osmosdr-tetra_demod_fft.py: Commandline switch -F for frequency offset osmosdr-tetra_demod_fft.py: More verbose fine-tuning messages Conflicts: src/demod/python/osmosdr-tetra_demod_fft.py --- src/demod/python/osmosdr-tetra_demod_fft.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/demod/python/osmosdr-tetra_demod_fft.py b/src/demod/python/osmosdr-tetra_demod_fft.py index 941aad1..6bdd35c 100755 --- a/src/demod/python/osmosdr-tetra_demod_fft.py +++ b/src/demod/python/osmosdr-tetra_demod_fft.py @@ -40,6 +40,7 @@ class top_block(grc_wxgui.top_block_gui): self.ifreq = options.frequency self.rfgain = options.gain + self.offset = options.frequency_offset self.src = osmosdr.source(options.args) self.src.set_center_freq(self.ifreq) @@ -240,6 +241,8 @@ def get_options(): help="set receiver sample rate (default 1800000)") parser.add_option("-f", "--frequency", type="eng_float", default=394.4e6, help="set receiver center frequency") + parser.add_option("-F", "--frequency-offset", type="eng_float", default=0, + help="set receiver offset frequency") parser.add_option("-g", "--gain", type="eng_float", default=None, help="set receiver gain") From d19275b5a86928d46b883f6103a2e6f31ce3562f Mon Sep 17 00:00:00 2001 From: luckyhacky Date: Thu, 13 Nov 2014 20:35:39 +0100 Subject: [PATCH 10/11] fixed warnings from compiler findings - added missing header definition for tun_alloc - added missing switch cases -> fixed by TODO/FIXME comment --- src/conv_enc_test.c | 5 ++++- src/lower_mac/tetra_conv_enc.c | 2 ++ src/phy/tetra_burst.c | 8 ++++++++ src/tetra_llc.c | 15 ++++++++++++++- src/tuntap.h | 8 ++++++++ 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 src/tuntap.h diff --git a/src/conv_enc_test.c b/src/conv_enc_test.c index 303ef31..149c7e7 100644 --- a/src/conv_enc_test.c +++ b/src/conv_enc_test.c @@ -306,8 +306,11 @@ int build_sb() int main(int argc, char **argv) { - int err, i; + int i; +#if 0 + int err; uint16_t out; +#endif uint32_t ret; /* first: run some subsystem tests */ diff --git a/src/lower_mac/tetra_conv_enc.c b/src/lower_mac/tetra_conv_enc.c index c3c3cac..95b4ebf 100644 --- a/src/lower_mac/tetra_conv_enc.c +++ b/src/lower_mac/tetra_conv_enc.c @@ -31,6 +31,7 @@ #include #include +#if 0 static char *dump_state(struct conv_enc_state *ces) { static char pbuf[1024]; @@ -38,6 +39,7 @@ static char *dump_state(struct conv_enc_state *ces) ces->delayed[1], ces->delayed[2], ces->delayed[3]); return pbuf; } +#endif /* Mother code according to Section 8.2.3.1.1 */ static uint8_t conv_enc_in_bit(struct conv_enc_state *ces, uint8_t bit, uint8_t *out) diff --git a/src/phy/tetra_burst.c b/src/phy/tetra_burst.c index 62efb72..e505740 100644 --- a/src/phy/tetra_burst.c +++ b/src/phy/tetra_burst.c @@ -314,6 +314,10 @@ void tetra_burst_rx_cb(const uint8_t *burst, unsigned int len, enum tetra_train_ uint8_t ndbf_buf[2*NDB_BLK_BITS]; switch (type) { + case TETRA_TRAIN_EXT: + // TODO: currently not handled! + // FIXME + break; case TETRA_TRAIN_SYNC: /* Split SB1, SB2 and Broadcast Block */ /* send three parts of the burst via TP-SAP into lower MAC */ @@ -321,6 +325,10 @@ void tetra_burst_rx_cb(const uint8_t *burst, unsigned int len, enum tetra_train_ tp_sap_udata_ind(TPSAP_T_BBK, burst+SB_BBK_OFFSET, SB_BBK_BITS, priv); tp_sap_udata_ind(TPSAP_T_SB2, burst+SB_BLK2_OFFSET, SB_BLK2_BITS, priv); break; + case TETRA_TRAIN_NORM_3: + // TODO: currently not handled! + // FIXME + break; case TETRA_TRAIN_NORM_2: /* re-combine the broadcast block */ memcpy(bbk_buf, burst+NDB_BBK1_OFFSET, NDB_BBK1_BITS); diff --git a/src/tetra_llc.c b/src/tetra_llc.c index 432f5a7..9397bcb 100644 --- a/src/tetra_llc.c +++ b/src/tetra_llc.c @@ -28,6 +28,7 @@ #include #include "tetra_llc_pdu.h" +#include "tuntap.h" static int tun_fd = -1; @@ -78,7 +79,7 @@ static int tllc_defrag_in(struct tllc_state *llcs, return 0; } -static int tllc_defrag_out(struct tllc_state *llcs, +static void tllc_defrag_out(struct tllc_state *llcs, struct tetra_llc_pdu *lpp) { struct tllc_defrag_q_e *dqe; @@ -147,6 +148,18 @@ int rx_tm_sdu(struct msgb *msg, unsigned int len) /* check if the fragment is complete and hand it off*/ tllc_defrag_out(&g_llcs, &lpp); break; + case TLLC_PDUT_DEC_UNKNOWN: + // TODO: currently not handled! + // FIXME + break; + case TLLC_PDUT_DEC_ALX_ACK: + // TODO: currently not handled! + // FIXME + break; + case TLLC_PDUT_DEC_ALX_RNR: + // TODO: currently not handled! + // FIXME + break; } if (lpp.tl_sdu && lpp.ss == 0) { diff --git a/src/tuntap.h b/src/tuntap.h new file mode 100644 index 0000000..6f82d69 --- /dev/null +++ b/src/tuntap.h @@ -0,0 +1,8 @@ +#ifndef TUNTAP_H +#define TUNTAP_H + +/* Allocate a tun interface */ +int tun_alloc(char *dev); + + +#endif /* TUNTAP_H */ From d03677065f91adfdbfc8c8175cb14a4eed300f78 Mon Sep 17 00:00:00 2001 From: luckyhacky Date: Sun, 16 Nov 2014 20:55:14 +0100 Subject: [PATCH 11/11] float2bits migrated to tetra-rx - compatible to old mode - new streaming mode (option -s) - buffer size adjusted --- src/tetra-rx.c | 131 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 110 insertions(+), 21 deletions(-) diff --git a/src/tetra-rx.c b/src/tetra-rx.c index c751772..b5136d8 100644 --- a/src/tetra-rx.c +++ b/src/tetra-rx.c @@ -34,23 +34,79 @@ #include #include "tetra_gsmtap.h" +// size of IO buffers (number of elements) +#define BUF_SIZE 256 + void *tetra_tall_ctx; + +static int process_sym_fl(float fl) +{ + int ret; + + /* very simplistic scheme */ + if (fl > 2) + ret = 3; + else if (fl > 0) + ret = 1; + else if (fl < -2) + ret = -3; + else + ret = -1; + + return ret; +} + +static void sym_int2bits(int sym, uint8_t *ret) +{ + switch (sym) { + case -3: + ret[0] = 1; + ret[1] = 1; + break; + case 1: + ret[0] = 0; + ret[1] = 0; + break; + case 3: + ret[0] = 0; + ret[1] = 1; + break; + case -1: + ret[0] = 1; + ret[1] = 0; + break; + } +} + int main(int argc, char **argv) { int fd; + int opt; + int streaming = 0; + int opt_verbose = 0; + struct tetra_rx_state *trs; struct tetra_mac_state *tms; - if (argc < 2) { - fprintf(stderr, "Usage: %s \n", argv[0]); - exit(1); + while ((opt = getopt(argc, argv, "sv")) != -1) { + switch (opt) { + case 's': + streaming = 1; + break; + case 'v': + opt_verbose = 1; + break; + + default: + exit(2); + } } - fd = open(argv[1], O_RDONLY); - if (fd < 0) { - perror("open"); - exit(2); + if (argc <= optind) { + fprintf(stderr, "Usage: %s -s [-v] \n", argv[0]); + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(1); } tetra_gsmtap_init("localhost", 0); @@ -60,22 +116,55 @@ int main(int argc, char **argv) trs = talloc_zero(tetra_tall_ctx, struct tetra_rx_state); trs->burst_cb_priv = tms; - - while (1) { - uint8_t buf[64]; - int len; - - len = read(fd, buf, sizeof(buf)); - if (len < 0) { - perror("read"); - exit(1); - } else if (len == 0) { - printf("EOF"); - break; - } - tetra_burst_sync_in(trs, buf, len); + + fd = open(argv[optind], O_RDONLY); + if (fd < 0) { + perror("open"); + exit(2); } + // use old mode which uses files with 1 byte per bit + if(streaming == 0) { + while (1) { + uint8_t buf[64]; + int len; + + len = read(fd, buf, sizeof(buf)); + if (len < 0) { + perror("read"); + exit(1); + } else if (len == 0) { + printf("EOF"); + break; + } + tetra_burst_sync_in(trs, buf, len); + } + } + else { // new fast mode - we will decode the incoming file ourself + while (1) { + int rc; + float fl[BUF_SIZE]; + uint8_t bits[2*BUF_SIZE]; + rc = read(fd, fl, sizeof(*fl) * BUF_SIZE); + if (rc < 0) { + perror("read"); + exit(1); + } else if (rc == 0) { + break; + } + rc /= sizeof(*fl); + int i; + for (i = 0; i < rc; ++i) { + int sym = process_sym_fl(fl[i]); + sym_int2bits(sym, bits + i*2); + if (opt_verbose) { + printf("%1u%1u", bits[2*i + 0], bits[2*i + 1]); + } + } + tetra_burst_sync_in(trs, bits, rc * 2); + } + } + talloc_free(trs); talloc_free(tms);