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

Changed cell allocation elements type from float to int

This commit is contained in:
ptrkrysik 2014-11-19 11:27:34 +01:00
parent d85d460c62
commit 7a7b9b0a3a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/gsm/receiver/receiver.h
View File

@ -48,9 +48,9 @@ namespace gr {
* class. gsm::receiver::make is the public interface for
* creating new instances.
*/
static sptr make(int osr, const std::vector<float> &cell_allocation, const std::vector<int> &seq_nums);
static sptr make(int osr, const std::vector<int> &cell_allocation, const std::vector<int> &seq_nums);
virtual void set_cell_allocation(const std::vector<float> &cell_allocation) = 0;
virtual void set_cell_allocation(const std::vector<int> &cell_allocation) = 0;
virtual void set_tseq_nums(const std::vector<int> & tseq_nums) = 0;
virtual void reset() = 0;
};

6
lib/receiver/receiver_impl.cc
View File

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

6
lib/receiver/receiver_impl.h
View File

@ -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();
};