Renamed burst_sink_qa/burst_source_qa to burst_sink/burst_source
diff --git a/lib/qa_utils/burst_sink_qa_impl.cc b/lib/qa_utils/burst_sink_impl.cc
similarity index 80%
rename from lib/qa_utils/burst_sink_qa_impl.cc
rename to lib/qa_utils/burst_sink_impl.cc
index aa9df9d..de26d39 100644
--- a/lib/qa_utils/burst_sink_qa_impl.cc
+++ b/lib/qa_utils/burst_sink_impl.cc
@@ -25,7 +25,7 @@
#endif
#include <gnuradio/io_signature.h>
-#include "burst_sink_qa_impl.h"
+#include "burst_sink_impl.h"
#include <stdio.h>
#include <sstream>
#include <grgsm/gsmtap.h>
@@ -33,29 +33,29 @@
namespace gr {
namespace gsm {
- burst_sink_qa::sptr
- burst_sink_qa::make()
+ burst_sink::sptr
+ burst_sink::make()
{
return gnuradio::get_initial_sptr
- (new burst_sink_qa_impl());
+ (new burst_sink_impl());
}
/*
* The private constructor
*/
- burst_sink_qa_impl::burst_sink_qa_impl()
- : gr::block("burst_sink_qa",
+ burst_sink_impl::burst_sink_impl()
+ : gr::block("burst_sink",
gr::io_signature::make(0, 0, 0),
gr::io_signature::make(0, 0, 0))
{
message_port_register_in(pmt::mp("in"));
- set_msg_handler(pmt::mp("in"), boost::bind(&burst_sink_qa_impl::process_burst, this, _1));
+ set_msg_handler(pmt::mp("in"), boost::bind(&burst_sink_impl::process_burst, this, _1));
}
/*
* Our virtual destructor.
*/
- burst_sink_qa_impl::~burst_sink_qa_impl()
+ burst_sink_impl::~burst_sink_impl()
{
// for (int i=0; i<d_burst_data.size(); i++)
// {
@@ -63,7 +63,7 @@
// }
}
- void burst_sink_qa_impl::process_burst(pmt::pmt_t msg)
+ void burst_sink_impl::process_burst(pmt::pmt_t msg)
{
pmt::pmt_t header_plus_burst = pmt::cdr(msg);
@@ -90,17 +90,17 @@
d_burst_data.push_back(burst_str.str());
}
- std::vector<int> burst_sink_qa_impl::get_framenumbers()
+ std::vector<int> burst_sink_impl::get_framenumbers()
{
return d_framenumbers;
}
- std::vector<int> burst_sink_qa_impl::get_timeslots()
+ std::vector<int> burst_sink_impl::get_timeslots()
{
return d_timeslots;
}
- std::vector<std::string> burst_sink_qa_impl::get_burst_data()
+ std::vector<std::string> burst_sink_impl::get_burst_data()
{
return d_burst_data;
}
diff --git a/lib/qa_utils/burst_sink_qa_impl.h b/lib/qa_utils/burst_sink_impl.h
similarity index 81%
rename from lib/qa_utils/burst_sink_qa_impl.h
rename to lib/qa_utils/burst_sink_impl.h
index 4bd3825..42e1e4a 100644
--- a/lib/qa_utils/burst_sink_qa_impl.h
+++ b/lib/qa_utils/burst_sink_impl.h
@@ -20,24 +20,24 @@
*
*/
-#ifndef INCLUDED_GSM_BURST_SINK_QA_IMPL_H
-#define INCLUDED_GSM_BURST_SINK_QA_IMPL_H
+#ifndef INCLUDED_GSM_BURST_SINK_IMPL_H
+#define INCLUDED_GSM_BURST_SINK_IMPL_H
-#include <grgsm/qa_utils/burst_sink_qa.h>
+#include <grgsm/qa_utils/burst_sink.h>
#include <fstream>
namespace gr {
namespace gsm {
- class burst_sink_qa_impl : public burst_sink_qa
+ class burst_sink_impl : public burst_sink
{
private:
std::vector<int> d_framenumbers;
std::vector<int> d_timeslots;
std::vector<std::string> d_burst_data;
public:
- burst_sink_qa_impl();
- ~burst_sink_qa_impl();
+ burst_sink_impl();
+ ~burst_sink_impl();
void process_burst(pmt::pmt_t msg);
virtual std::vector<int> get_framenumbers();
virtual std::vector<int> get_timeslots();
@@ -47,5 +47,5 @@
} // namespace gsm
} // namespace gr
-#endif /* INCLUDED_GSM_BURST_SINK_QA_IMPL_H */
+#endif /* INCLUDED_GSM_BURST_SINK_IMPL_H */
diff --git a/lib/qa_utils/burst_source_qa_impl.cc b/lib/qa_utils/burst_source_impl.cc
similarity index 82%
rename from lib/qa_utils/burst_source_qa_impl.cc
rename to lib/qa_utils/burst_source_impl.cc
index 7b2d412..7391872 100644
--- a/lib/qa_utils/burst_source_qa_impl.cc
+++ b/lib/qa_utils/burst_source_impl.cc
@@ -25,7 +25,7 @@
#endif
#include <gnuradio/io_signature.h>
-#include "burst_source_qa_impl.h"
+#include "burst_source_impl.h"
#include "stdio.h"
#include <boost/scoped_ptr.hpp>
#include <grgsm/gsmtap.h>
@@ -36,22 +36,22 @@
namespace gr {
namespace gsm {
- burst_source_qa::sptr
- burst_source_qa::make(const std::vector<int> &framenumbers,
+ burst_source::sptr
+ burst_source::make(const std::vector<int> &framenumbers,
const std::vector<int> ×lots,
const std::vector<std::string> &burst_data)
{
return gnuradio::get_initial_sptr
- (new burst_source_qa_impl(framenumbers, timeslots, burst_data));
+ (new burst_source_impl(framenumbers, timeslots, burst_data));
}
/*
* The private constructor
*/
- burst_source_qa_impl::burst_source_qa_impl(const std::vector<int> &framenumbers,
+ burst_source_impl::burst_source_impl(const std::vector<int> &framenumbers,
const std::vector<int> ×lots,
const std::vector<std::string> &burst_data)
- : gr::block("burst_source_qa",
+ : gr::block("burst_source",
gr::io_signature::make(0, 0, 0),
gr::io_signature::make(0, 0, 0)),
d_finished(false)
@@ -65,37 +65,37 @@
/*
* Our virtual destructor.
*/
- burst_source_qa_impl::~burst_source_qa_impl()
+ burst_source_impl::~burst_source_impl()
{
if (d_finished == false){
d_finished = true;
}
}
- void burst_source_qa_impl::set_framenumbers(const std::vector<int> &framenumbers)
+ void burst_source_impl::set_framenumbers(const std::vector<int> &framenumbers)
{
d_framenumbers = framenumbers;
}
- void burst_source_qa_impl::set_timeslots(const std::vector<int> ×lots)
+ void burst_source_impl::set_timeslots(const std::vector<int> ×lots)
{
d_timeslots = timeslots;
}
- void burst_source_qa_impl::set_burst_data(const std::vector<std::string> &burst_data)
+ void burst_source_impl::set_burst_data(const std::vector<std::string> &burst_data)
{
d_burst_data = burst_data;
}
- bool burst_source_qa_impl::start()
+ bool burst_source_impl::start()
{
d_finished = false;
d_thread = boost::shared_ptr<gr::thread::thread>
- (new gr::thread::thread(boost::bind(&burst_source_qa_impl::run, this)));
+ (new gr::thread::thread(boost::bind(&burst_source_impl::run, this)));
return block::start();
}
- bool burst_source_qa_impl::stop()
+ bool burst_source_impl::stop()
{
d_finished = true;
d_thread->interrupt();
@@ -103,12 +103,12 @@
return block::stop();
}
- bool burst_source_qa_impl::finished()
+ bool burst_source_impl::finished()
{
return d_finished;
}
- void burst_source_qa_impl::run()
+ void burst_source_impl::run()
{
char *unserialized = (char*)malloc(sizeof(char) * PMT_SIZE);
diff --git a/lib/qa_utils/burst_source_qa_impl.h b/lib/qa_utils/burst_source_impl.h
similarity index 82%
rename from lib/qa_utils/burst_source_qa_impl.h
rename to lib/qa_utils/burst_source_impl.h
index 3856a90..969faf9 100644
--- a/lib/qa_utils/burst_source_qa_impl.h
+++ b/lib/qa_utils/burst_source_impl.h
@@ -20,19 +20,19 @@
*
*/
-#ifndef INCLUDED_GSM_BURST_SOURCE_QA_IMPL_H
-#define INCLUDED_GSM_BURST_SOURCE_QA_IMPL_H
+#ifndef INCLUDED_GSM_BURST_SOURCE_IMPL_H
+#define INCLUDED_GSM_BURST_SOURCE_IMPL_H
#define BURST_SIZE 148
-#include <grgsm/qa_utils/burst_source_qa.h>
+#include <grgsm/qa_utils/burst_source.h>
#include <fstream>
namespace gr {
namespace gsm {
- class burst_source_qa_impl : public burst_source_qa
+ class burst_source_impl : public burst_source
{
private:
boost::shared_ptr<gr::thread::thread> d_thread;
@@ -42,10 +42,10 @@
bool d_finished;
void run();
public:
- burst_source_qa_impl(const std::vector<int> &framenumbers,
+ burst_source_impl(const std::vector<int> &framenumbers,
const std::vector<int> ×lots,
const std::vector<std::string> &burst_data);
- ~burst_source_qa_impl();
+ ~burst_source_impl();
virtual void set_framenumbers(const std::vector<int> &framenumbers);
virtual void set_timeslots(const std::vector<int> ×lots);
virtual void set_burst_data(const std::vector<std::string> &burst_data);
@@ -56,6 +56,6 @@
} // namespace gsm
} // namespace gr
-#endif /* INCLUDED_GSM_BURST_SOURCE_QA_IMPL_H */
+#endif /* INCLUDED_GSM_BURST_SOURCE_IMPL_H */