diff options
author | Roman Khassraf <roman@khassraf.at> | 2015-08-05 13:02:12 +0200 |
---|---|---|
committer | Roman Khassraf <roman@khassraf.at> | 2015-08-05 13:02:12 +0200 |
commit | 98da635ccc2e0df06a30bda59ee082d8593dc0a8 (patch) | |
tree | 63017e27cdddb6450f105a143f3f9fae62d7e38e /include | |
parent | f163ca5957e1f32d981c5ea3ce9f9b24cb9d3a0a (diff) | |
parent | a1eb188b97d12737d58eed9162102798f440ba43 (diff) |
Merged origin/flow-control-100 into dev, fixed conflicts
Diffstat (limited to 'include')
-rw-r--r-- | include/grgsm/CMakeLists.txt | 1 | ||||
-rw-r--r-- | include/grgsm/flow_control/CMakeLists.txt | 28 | ||||
-rw-r--r-- | include/grgsm/flow_control/burst_fnr_filter.h | 64 | ||||
-rw-r--r-- | include/grgsm/flow_control/burst_sdcch_subslot_splitter.h | 61 | ||||
-rw-r--r-- | include/grgsm/flow_control/burst_timeslot_splitter.h | 55 | ||||
-rw-r--r-- | include/grgsm/flow_control/dummy_burst_filter.h | 55 |
6 files changed, 264 insertions, 0 deletions
diff --git a/include/grgsm/CMakeLists.txt b/include/grgsm/CMakeLists.txt index a16c076..e9f6cc2 100644 --- a/include/grgsm/CMakeLists.txt +++ b/include/grgsm/CMakeLists.txt @@ -33,3 +33,4 @@ add_subdirectory(demapping) add_subdirectory(receiver) add_subdirectory(misc_utils) add_subdirectory(qa_utils) +add_subdirectory(flow_control) diff --git a/include/grgsm/flow_control/CMakeLists.txt b/include/grgsm/flow_control/CMakeLists.txt new file mode 100644 index 0000000..0a1a95a --- /dev/null +++ b/include/grgsm/flow_control/CMakeLists.txt @@ -0,0 +1,28 @@ +# Copyright 2011,2012 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +######################################################################## +# Install public header files +######################################################################## +install(FILES + burst_timeslot_splitter.h + burst_sdcch_subslot_splitter.h + burst_fnr_filter.h + dummy_burst_filter.h DESTINATION include/grgsm/flow_control +) diff --git a/include/grgsm/flow_control/burst_fnr_filter.h b/include/grgsm/flow_control/burst_fnr_filter.h new file mode 100644 index 0000000..9451d58 --- /dev/null +++ b/include/grgsm/flow_control/burst_fnr_filter.h @@ -0,0 +1,64 @@ +/* -*- c++ -*- */ +/* + * @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * Gr-gsm is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + + +#ifndef INCLUDED_GSM_BURST_FNR_FILTER_H +#define INCLUDED_GSM_BURST_FNR_FILTER_H + +#include <grgsm/api.h> +#include <gnuradio/block.h> + +namespace gr { + namespace gsm { + + enum filter_mode + { + FILTER_LESS_OR_EQUAL, + FILTER_GREATER_OR_EQUAL + }; + + /*! + * \brief <+description of block+> + * \ingroup gsm + * + */ + class GSM_API burst_fnr_filter : virtual public gr::block + { + public: + typedef boost::shared_ptr<burst_fnr_filter> sptr; + + /*! + * \brief Return a shared_ptr to a new instance of gsm::burst_fnr_filter. + * + * To avoid accidental use of raw pointers, gsm::burst_fnr_filter's + * constructor is in a private implementation + * class. gsm::burst_fnr_filter::make is the public interface for + * creating new instances. + */ + static sptr make(filter_mode mode, unsigned int fnr); + + }; + + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_BURST_FNR_FILTER_H */ diff --git a/include/grgsm/flow_control/burst_sdcch_subslot_splitter.h b/include/grgsm/flow_control/burst_sdcch_subslot_splitter.h new file mode 100644 index 0000000..aee2a24 --- /dev/null +++ b/include/grgsm/flow_control/burst_sdcch_subslot_splitter.h @@ -0,0 +1,61 @@ +/* -*- c++ -*- */ +/* @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * Gr-gsm is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef INCLUDED_GSM_BURST_SDCCH_SUBSLOT_SPLITTER_H +#define INCLUDED_GSM_BURST_SDCCH_SUBSLOT_SPLITTER_H + +#include <grgsm/api.h> +#include <gnuradio/block.h> + +namespace gr { + namespace gsm { + + enum splitter_mode + { + SPLITTER_SDCCH8, + SPLITTER_SDCCH4 + }; + + /*! + * \brief <+description of block+> + * \ingroup gsm + * + */ + class GSM_API burst_sdcch_subslot_splitter : virtual public gr::block + { + public: + typedef boost::shared_ptr<burst_sdcch_subslot_splitter> sptr; + + /*! + * \brief Return a shared_ptr to a new instance of grgsm::burst_sdcch_subslot_splitter. + * + * To avoid accidental use of raw pointers, grgsm::burst_sdcch_subslot_splitter's + * constructor is in a private implementation + * class. grgsm::burst_sdcch_subslot_splitter::make is the public interface for + * creating new instances. + */ + static sptr make(splitter_mode mode); + }; + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_BURST_SDCCH_SUBSLOT_SPLITTER_H */ diff --git a/include/grgsm/flow_control/burst_timeslot_splitter.h b/include/grgsm/flow_control/burst_timeslot_splitter.h new file mode 100644 index 0000000..ee6298e --- /dev/null +++ b/include/grgsm/flow_control/burst_timeslot_splitter.h @@ -0,0 +1,55 @@ +/* -*- c++ -*- */ +/* @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * Gr-gsm is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef INCLUDED_GSM_BURST_TIMESLOT_SPLITTER_H +#define INCLUDED_GSM_BURST_TIMESLOT_SPLITTER_H + +#include <grgsm/api.h> +#include <gnuradio/block.h> + +namespace gr { + namespace gsm { + + /*! + * \brief <+description of block+> + * \ingroup gsm + * + */ + class GSM_API burst_timeslot_splitter : virtual public gr::block + { + public: + typedef boost::shared_ptr<burst_timeslot_splitter> sptr; + + /*! + * \brief Return a shared_ptr to a new instance of grgsm::burst_timeslot_splitter. + * + * To avoid accidental use of raw pointers, grgsm::burst_timeslot_splitter's + * constructor is in a private implementation + * class. grgsm::burst_timeslot_splitter::make is the public interface for + * creating new instances. + */ + static sptr make(); + }; + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_BURST_TIMESLOT_SPLITTER_H */ diff --git a/include/grgsm/flow_control/dummy_burst_filter.h b/include/grgsm/flow_control/dummy_burst_filter.h new file mode 100644 index 0000000..0922433 --- /dev/null +++ b/include/grgsm/flow_control/dummy_burst_filter.h @@ -0,0 +1,55 @@ +/* -*- c++ -*- */ +/* @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * Gr-gsm is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef INCLUDED_GSM_DUMMY_BURST_FILTER_H +#define INCLUDED_GSM_DUMMY_BURST_FILTER_H + +#include <grgsm/api.h> +#include <gnuradio/block.h> + +namespace gr { + namespace gsm { + + /*! + * \brief <+description of block+> + * \ingroup gsm + * + */ + class GSM_API dummy_burst_filter : virtual public gr::block + { + public: + typedef boost::shared_ptr<dummy_burst_filter> sptr; + + /*! + * \brief Return a shared_ptr to a new instance of grgsm::dummy_burst_filter. + * + * To avoid accidental use of raw pointers, grgsm::dummy_burst_filter's + * constructor is in a private implementation + * class. grgsm::dummy_burst_filter::make is the public interface for + * creating new instances. + */ + static sptr make(); + }; + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_DUMMY_BURST_FILTER_H */ |