diff options
| author | Piotr Krysik <ptrkrysik@gmail.com> | 2016-05-14 19:37:14 +0200 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2016-05-14 19:37:14 +0200 |
| commit | 8630fac60ca3b1609725498348267e66602d2067 (patch) | |
| tree | 7d275e2455ca3efa11e86f90a036d9ff859e5723 /include/grgsm | |
| parent | cdff492ff7f318dc452b6270a4845b8df6d9e025 (diff) | |
| parent | 5d6ae655574947444b713f1d34fab85167554b8c (diff) | |
Merged uplink-decoding branch (with complete support for control channels decoding on uplink)
# Conflicts:
# examples
# lib/demapping/universal_ctrl_chans_demapper_impl.cc
# lib/receiver/receiver_impl.cc
Diffstat (limited to 'include/grgsm')
| -rw-r--r-- | include/grgsm/demapping/universal_ctrl_chans_demapper.h | 2 | ||||
| -rw-r--r-- | include/grgsm/receiver/receiver.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/grgsm/demapping/universal_ctrl_chans_demapper.h b/include/grgsm/demapping/universal_ctrl_chans_demapper.h index d8114f7..9d7240c 100644 --- a/include/grgsm/demapping/universal_ctrl_chans_demapper.h +++ b/include/grgsm/demapping/universal_ctrl_chans_demapper.h @@ -49,7 +49,7 @@ namespace gr { * class. gsm::universal_ctrl_chans_demapper::make is the public interface for * creating new instances. */ - static sptr make(unsigned int timeslot_nr, const std::vector<int> &starts_fn_mod51, const std::vector<int> &channel_types); + static sptr make(unsigned int timeslot_nr, const std::vector<int> &downlink_starts_fn_mod51, const std::vector<int> &downlink_channel_types, const std::vector<int> &uplink_starts_fn_mod51, const std::vector<int> &uplink_channel_types); }; } // namespace gsm diff --git a/include/grgsm/receiver/receiver.h b/include/grgsm/receiver/receiver.h index 80124f7..00e749e 100644 --- a/include/grgsm/receiver/receiver.h +++ b/include/grgsm/receiver/receiver.h @@ -51,7 +51,7 @@ namespace gr { * class. gsm::receiver::make is the public interface for * creating new instances. */ - static sptr make(int osr, const std::vector<int> &cell_allocation, const std::vector<int> &seq_nums); + static sptr make(int osr, const std::vector<int> &cell_allocation, const std::vector<int> &seq_nums, bool process_uplink); virtual void set_cell_allocation(const std::vector<int> &cell_allocation) = 0; virtual void set_tseq_nums(const std::vector<int> & tseq_nums) = 0; |