aboutsummaryrefslogtreecommitdiffstats
path: root/lib/receiver
diff options
context:
space:
mode:
authorptrkrysik <ptrkrysik@gmail.com>2014-11-19 11:27:34 +0100
committerptrkrysik <ptrkrysik@gmail.com>2014-11-19 11:27:34 +0100
commit7a7b9b0a3a446e83703f53bea11389f030c68fde (patch)
treecc8f8ac2c40f64408979390fab1c692ebeac6e78 /lib/receiver
parentd85d460c6276a5ff598d72b93c0121c076cea584 (diff)
Changed cell allocation elements type from float to int
Diffstat (limited to 'lib/receiver')
-rw-r--r--lib/receiver/receiver_impl.cc6
-rw-r--r--lib/receiver/receiver_impl.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/receiver/receiver_impl.cc b/lib/receiver/receiver_impl.cc
index dcef9bb..e5fa136 100644
--- a/lib/receiver/receiver_impl.cc
+++ b/lib/receiver/receiver_impl.cc
@@ -56,7 +56,7 @@ typedef std::vector<float> vector_float;
typedef boost::circular_buffer<float> circular_buffer_float;
receiver::sptr
-receiver::make(int osr, const std::vector<float> &cell_allocation, const std::vector<int> &tseq_nums)
+receiver::make(int osr, const std::vector<int> &cell_allocation, const std::vector<int> &tseq_nums)
{
return gnuradio::get_initial_sptr
(new receiver_impl(osr, cell_allocation, tseq_nums));
@@ -65,7 +65,7 @@ receiver::make(int osr, const std::vector<float> &cell_allocation, const std::ve
/*
* The private constructor
*/
-receiver_impl::receiver_impl(int osr, const std::vector<float> &cell_allocation, const std::vector<int> &tseq_nums)
+receiver_impl::receiver_impl(int osr, const std::vector<int> &cell_allocation, const std::vector<int> &tseq_nums)
: gr::sync_block("receiver",
gr::io_signature::make(1, -1, sizeof(gr_complex)),
gr::io_signature::make(0, 0, 0)),
@@ -865,7 +865,7 @@ void receiver_impl::configure_receiver()
d_channel_conf.set_burst_types(TIMESLOT7, TEST51, sizeof(TEST51) / sizeof(unsigned), dummy_or_normal);
}
-void receiver_impl::set_cell_allocation(const std::vector<float> &cell_allocation)
+void receiver_impl::set_cell_allocation(const std::vector<int> &cell_allocation)
{
d_cell_allocation = cell_allocation;
}
diff --git a/lib/receiver/receiver_impl.h b/lib/receiver/receiver_impl.h
index 22d92ab..2b7e9cf 100644
--- a/lib/receiver/receiver_impl.h
+++ b/lib/receiver/receiver_impl.h
@@ -42,7 +42,7 @@ namespace gr {
const int d_chan_imp_length; ///< channel impulse length
float d_signal_dbm;
std::vector<int> d_tseq_nums; ///< stores training sequence numbers for channels different than C0
- std::vector<float> d_cell_allocation; ///< stores cell allocation - absolute rf channel numbers (ARFCNs) assigned to the given cell. The variable should at least contain C0 channel number.
+ std::vector<int> d_cell_allocation; ///< stores cell allocation - absolute rf channel numbers (ARFCNs) assigned to the given cell. The variable should at least contain C0 channel number.
//@}
gr_complex d_sch_training_seq[N_SYNC_BITS]; ///<encoded training sequence of a SCH burst
@@ -201,11 +201,11 @@ namespace gr {
public:
- receiver_impl(int osr, const std::vector<float> &cell_allocation, const std::vector<int> &tseq_nums);
+ receiver_impl(int osr, const std::vector<int> &cell_allocation, const std::vector<int> &tseq_nums);
~receiver_impl();
int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
- virtual void set_cell_allocation(const std::vector<float> &cell_allocation);
+ virtual void set_cell_allocation(const std::vector<int> &cell_allocation);
virtual void set_tseq_nums(const std::vector<int> & tseq_nums);
virtual void reset();
};