From fbcee391070d376b847def931652be12b1b52750 Mon Sep 17 00:00:00 2001 From: Andrew Artyushok Date: Tue, 30 Jan 2018 12:54:07 +0200 Subject: Add HR demapping --- lib/demapping/tch_f_chans_demapper_impl.cc | 10 +++++----- lib/demapping/tch_f_chans_demapper_impl.h | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/demapping') diff --git a/lib/demapping/tch_f_chans_demapper_impl.cc b/lib/demapping/tch_f_chans_demapper_impl.cc index 9865a47..0841fd2 100644 --- a/lib/demapping/tch_f_chans_demapper_impl.cc +++ b/lib/demapping/tch_f_chans_demapper_impl.cc @@ -109,11 +109,11 @@ namespace gr { } } - void tch_f_chans_demapper_impl::sacch_tch_demapper(uint32_t fn_mod13, uint32_t fn_mod26, uint32_t frame_nr, - pmt::pmt_t *d_bursts_sacch, - uint32_t *d_frame_numbers_sacch, pmt::pmt_t d_bursts[3][8], - uint32_t d_frame_numbers[3][8], pmt::pmt_t msg_out) - { +void tch_f_chans_demapper_impl::sacch_tch_demapper(uint32_t fn_mod13, u_int32_t fn_mod26, uint32_t frame_nr, + pmt::pmt_t *d_bursts_sacch, + uint32_t *d_frame_numbers_sacch, pmt::pmt_t d_bursts[3][8], + uint32_t d_frame_numbers[3][8], pmt::pmt_t msg_out) +{ bool frames_are_consecutive = true; if (fn_mod13 == 12) { diff --git a/lib/demapping/tch_f_chans_demapper_impl.h b/lib/demapping/tch_f_chans_demapper_impl.h index bef018d..7a546e7 100644 --- a/lib/demapping/tch_f_chans_demapper_impl.h +++ b/lib/demapping/tch_f_chans_demapper_impl.h @@ -32,6 +32,8 @@ namespace gr { { private: unsigned int d_timeslot; + int d_tch_type; + int d_tch_h_channel; // Downlink uint32_t d_frame_numbers_dl[3][8]; // for checking consecutive frame numbers of tch uint32_t d_frame_numbers_sacch_dl[4]; // for checking consecutive frame numbers of sacch @@ -49,7 +51,7 @@ namespace gr { uint32_t d_frame_numbers[3][8], pmt::pmt_t msg_out); public: - tch_f_chans_demapper_impl(unsigned int timeslot_nr); + tch_f_chans_demapper_impl(unsigned int timeslot_nr, int tch_type, int tch_h_channel); ~tch_f_chans_demapper_impl(); void filter_tch_chans(pmt::pmt_t msg); -- cgit v1.2.3