sdr
/
gr-gsm
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed get_ccch_bursts block

This commit is contained in:
piotr 2014-04-24 11:58:52 +02:00
parent da8a066687
commit d73f0bb850
8 changed files with 2 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grc/CMakeLists.txt
View File

@ -16,9 +16,7 @@
# 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(FILES
gsm_receiver_hier.xml
gsm_get_ccch_bursts.xml
gsm_bursts_printer.xml DESTINATION share/gnuradio/grc/blocks
)

16
grc/gsm_get_ccch_bursts.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0"?>
<block>
<name>get_ccch_bursts</name>
<key>gsm_get_ccch_bursts</key>
<category>GSM</category>
<import>import gsm</import>
<make>gsm.get_ccch_bursts()</make>
<sink>
<name>bursts_in</name>
<type>message</type>
</sink>
<source>
<name>bursts_out</name>
<type>message</type>
</source>
</block>

1
include/gsm/CMakeLists.txt
View File

@ -23,6 +23,5 @@
install(FILES
api.h
receiver.h
get_ccch_bursts.h
bursts_printer.h DESTINATION include/gsm
)

56
include/gsm/get_ccch_bursts.h
View File

@ -1,56 +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_H
#define INCLUDED_GSM_GET_CCCH_BURSTS_H
#include <gsm/api.h>
#include <gnuradio/block.h>
namespace gr {
namespace gsm {
/*!
* \brief <+description of block+>
* \ingroup gsm
*
*/
class GSM_API get_ccch_bursts : virtual public gr::block
{
public:
typedef boost::shared_ptr<get_ccch_bursts> sptr;
/*!
* \brief Return a shared_ptr to a new instance of gsm::get_ccch_bursts.
*
* To avoid accidental use of raw pointers, gsm::get_ccch_bursts's
* constructor is in a private implementation
* class. gsm::get_ccch_bursts::make is the public interface for
* creating new instances.
*/
static sptr make();
};
} // namespace gsm
} // namespace gr
#endif /* INCLUDED_GSM_GET_CCCH_BURSTS_H */

4
lib/CMakeLists.txt
View File

@ -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}

96
lib/get_ccch_bursts_impl.cc
View File

@ -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 */

44
lib/get_ccch_bursts_impl.h
View File

@ -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 */

4
swig/gsm_swig.i
View File

@ -10,7 +10,6 @@
%{
#include "gsm/receiver.h"
#include "gsm/bursts_printer.h"
#include "gsm/get_ccch_bursts.h"
%}
@ -18,5 +17,4 @@
GR_SWIG_BLOCK_MAGIC2(gsm, receiver);
%include "gsm/bursts_printer.h"
GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer);
%include "gsm/get_ccch_bursts.h"
GR_SWIG_BLOCK_MAGIC2(gsm, get_ccch_bursts);