diff options
Diffstat (limited to 'gr-digital/lib/glfsr_source_b_impl.cc')
| -rw-r--r-- | gr-digital/lib/glfsr_source_b_impl.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gr-digital/lib/glfsr_source_b_impl.cc b/gr-digital/lib/glfsr_source_b_impl.cc index 260bd45c24..6b1a14900f 100644 --- a/gr-digital/lib/glfsr_source_b_impl.cc +++ b/gr-digital/lib/glfsr_source_b_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007,2010,2012 Free Software Foundation, Inc. + * Copyright 2007,2010,2012,2016 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,25 +32,25 @@ namespace gr { namespace digital { glfsr_source_b::sptr - glfsr_source_b::make(int degree, bool repeat, int mask, int seed) + glfsr_source_b::make(unsigned int degree, bool repeat, uint32_t mask, uint32_t seed) { return gnuradio::get_initial_sptr - (new glfsr_source_b_impl(degree, repeat, mask, seed)); + (new glfsr_source_b_impl(degree, repeat, mask, seed)); } - glfsr_source_b_impl::glfsr_source_b_impl(int degree, bool repeat, - int mask, int seed) + glfsr_source_b_impl::glfsr_source_b_impl(unsigned int degree, bool repeat, + uint32_t mask, uint32_t seed) : sync_block("glfsr_source_b", - io_signature::make(0, 0, 0), - io_signature::make(1, 1, sizeof(unsigned char))), - d_repeat(repeat), d_index(0) + io_signature::make(0, 0, 0), + io_signature::make(1, 1, sizeof(unsigned char))), + d_repeat(repeat), d_index(0), + d_length( ( ((uint32_t)1) << degree) - 1) { if(degree < 1 || degree > 32) - throw std::runtime_error("glfsr_source_b_impl: degree must be between 1 and 32 inclusive"); - d_length = (unsigned int)((1ULL << degree)-1); + throw std::runtime_error("glfsr_source_b_impl: degree must be between 1 and 32 inclusive"); if(mask == 0) - mask = glfsr::glfsr_mask(degree); + mask = glfsr::glfsr_mask(degree); d_glfsr = new glfsr(mask, seed); } @@ -59,7 +59,7 @@ namespace gr { delete d_glfsr; } - int + uint32_t glfsr_source_b_impl::mask() const { return d_glfsr->mask(); @@ -67,19 +67,19 @@ namespace gr { int glfsr_source_b_impl::work(int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) { char *out = (char*)output_items[0]; if((d_index > d_length) && d_repeat == false) - return -1; /* once through the sequence */ + return WORK_DONE; /* once through the sequence */ int i; for(i = 0; i < noutput_items; i++) { - out[i] = d_glfsr->next_bit(); - d_index++; - if(d_index > d_length && d_repeat == false) - break; + out[i] = d_glfsr->next_bit(); + d_index++; + if(d_index > d_length && d_repeat == false) + break; } return i; |