aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorpiotr <Piotr Krysik pkrysik@elka.pw.edu.pl>2014-04-24 11:58:52 +0200
committerpiotr <Piotr Krysik pkrysik@elka.pw.edu.pl>2014-04-24 11:58:52 +0200
commitd73f0bb850ae072598933357a67795acf8a0adb4 (patch)
tree3be55b3a914a4dbaacc613b117ae13c03f63241d /lib
parentda8a06668734fdbfb7d0b3c906c8d88efd256895 (diff)
Removed get_ccch_bursts block
Diffstat (limited to 'lib')
-rw-r--r--lib/CMakeLists.txt4
-rw-r--r--lib/get_ccch_bursts_impl.cc96
-rw-r--r--lib/get_ccch_bursts_impl.h44
3 files changed, 1 insertions, 143 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 38539da..99207d8 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -24,15 +24,13 @@ include(GrPlatform) #define LIB_SUFFIX
include_directories(${Boost_INCLUDE_DIR})
link_directories(${Boost_LIBRARY_DIRS})
-
list(APPEND gsm_sources
receiver_impl.cc
receiver_config.cc
viterbi_detector.cc
sch.c
bursts_printer_impl.cc
- get_ccch_bursts_impl.cc
-)
+ )
add_library(gnuradio-gsm SHARED ${gsm_sources})
target_link_libraries(gnuradio-gsm ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES}
diff --git a/lib/get_ccch_bursts_impl.cc b/lib/get_ccch_bursts_impl.cc
deleted file mode 100644
index 066382b..0000000
--- a/lib/get_ccch_bursts_impl.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2014 <perper@o2.pl>.
- *
- * This 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.
- *
- * This software 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 this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gnuradio/io_signature.h>
-#include "get_ccch_bursts_impl.h"
-#include <gsmtap.h>
-
-namespace gr {
- namespace gsm {
-
- void get_ccch_bursts_impl::filter_ccch(pmt::pmt_t msg)
- {
- pmt::pmt_t header_blob = pmt::car(msg);
- pmt::pmt_t content = pmt::cdr(msg);
- gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_blob);
- uint32_t frame_nr = header->frame_number;
- uint32_t frame_numbers[4];
- uint32_t fn_mod51 = header->frame_number % 51;
-
- if(header->timeslot==0){
- if(fn_mod51>=2 && fn_mod51<=5){
- uint32_t ii = fn_mod51-2;
- frame_numbers[ii]=header->frame_number;
- d_msgs[ii] = msg;
- }
-
- if(fn_mod51==5){
- //check for a situation where some BCCH bursts were lost
- //in this situation frame numbers won't be consecutive
- bool frames_are_consecutive = true;
- for(int jj=1; jj<4; jj++){
- if((frame_numbers[jj]-frame_numbers[jj-1])!=1){
- frames_are_consecutive = false;
- }
- }
- if(frames_are_consecutive){
- //send bursts to the output
- for(int jj=0; jj<4; jj++){
- message_port_pub(pmt::mp("bursts_out"), d_msgs[jj]);
- }
- }
- }
- }
- }
-
- get_ccch_bursts::sptr
- get_ccch_bursts::make()
- {
- return gnuradio::get_initial_sptr
- (new get_ccch_bursts_impl());
- }
-
- /*
- * The private constructor
- */
- get_ccch_bursts_impl::get_ccch_bursts_impl()
- : gr::block("get_ccch_bursts",
- gr::io_signature::make(0, 0, 0),
- gr::io_signature::make(0, 0, 0))
- {
- message_port_register_in(pmt::mp("bursts_in"));
- set_msg_handler(pmt::mp("bursts_in"), boost::bind(&get_ccch_bursts_impl::filter_ccch, this, _1));
- message_port_register_out(pmt::mp("bursts_out"));
- }
-
- /*
- * Our virtual destructor.
- */
- get_ccch_bursts_impl::~get_ccch_bursts_impl()
- {
- }
-
- } /* namespace gsm */
-} /* namespace gr */
-
diff --git a/lib/get_ccch_bursts_impl.h b/lib/get_ccch_bursts_impl.h
deleted file mode 100644
index c0e7dd9..0000000
--- a/lib/get_ccch_bursts_impl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2014 <+YOU OR YOUR COMPANY+>.
- *
- * This 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.
- *
- * This software 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 this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GSM_GET_CCCH_BURSTS_IMPL_H
-#define INCLUDED_GSM_GET_CCCH_BURSTS_IMPL_H
-
-#include <gsm/get_ccch_bursts.h>
-#include <receiver_config.h>
-
-namespace gr {
- namespace gsm {
-
- class get_ccch_bursts_impl : public get_ccch_bursts
- {
- private:
- pmt::pmt_t d_bursts[4];
- public:
- get_ccch_bursts_impl();
- ~get_ccch_bursts_impl();
- void filter_ccch(pmt::pmt_t msg);
- };
-
- } // namespace gsm
-} // namespace gr
-
-#endif /* INCLUDED_GSM_GET_CCCH_BURSTS_IMPL_H */
-