diff options
Diffstat (limited to 'gnuradio-core/src/lib/io')
81 files changed, 481 insertions, 613 deletions
diff --git a/gnuradio-core/src/lib/io/.gitignore b/gnuradio-core/src/lib/io/.gitignore deleted file mode 100644 index a02b6ff73..000000000 --- a/gnuradio-core/src/lib/io/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/Makefile -/Makefile.in -/.la -/.lo -/.deps -/.libs -/*.la -/*.lo diff --git a/gnuradio-core/src/lib/io/Makefile.am b/gnuradio-core/src/lib/io/Makefile.am deleted file mode 100644 index 442d5e3a9..000000000 --- a/gnuradio-core/src/lib/io/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -# -# Copyright 2001,2003,2004,2006,2007,2008 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio 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. -# -# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - - -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES) - -noinst_LTLIBRARIES = libio.la - - -libio_la_SOURCES = \ - gr_file_sink.cc \ - gr_file_sink_base.cc \ - gr_file_source.cc \ - gr_file_descriptor_sink.cc \ - gr_file_descriptor_source.cc \ - gr_histo_sink_f.cc \ - gr_message_sink.cc \ - gr_message_source.cc \ - gr_oscope_guts.cc \ - gr_oscope_sink_f.cc \ - gr_oscope_sink_x.cc \ - i2c.cc \ - i2c_bitbang.cc \ - i2c_bbio.cc \ - i2c_bbio_pp.cc \ - microtune_4702.cc \ - microtune_4937.cc \ - microtune_4702_eval_board.cc \ - microtune_4937_eval_board.cc \ - microtune_xxxx.cc \ - microtune_xxxx_eval_board.cc \ - ppio.cc \ - ppio_ppdev.cc \ - sdr_1000.cc \ - gr_udp_sink.cc \ - gr_udp_source.cc \ - gr_wavfile_sink.cc \ - gr_wavfile_source.cc \ - gri_wavfile.cc \ - gr_tagged_file_sink.cc - -grinclude_HEADERS = \ - gr_file_sink.h \ - gr_file_sink_base.h \ - gr_file_source.h \ - gr_file_descriptor_sink.h \ - gr_file_descriptor_source.h \ - gr_histo_sink_f.h \ - gr_message_sink.h \ - gr_message_source.h \ - gr_oscope_guts.h \ - gr_oscope_sink_f.h \ - gr_oscope_sink_x.h \ - gr_trigger_mode.h \ - i2c.h \ - i2c_bitbang.h \ - i2c_bbio.h \ - i2c_bbio_pp.h \ - microtune_4702.h \ - microtune_4937.h \ - microtune_4702_eval_board.h \ - microtune_4937_eval_board.h \ - microtune_eval_board_defs.h \ - microtune_xxxx.h \ - microtune_xxxx_eval_board.h \ - ppio.h \ - ppio_ppdev.h \ - sdr_1000.h \ - gr_udp_sink.h \ - gr_udp_source.h \ - gr_wavfile_source.h \ - gr_wavfile_sink.h \ - gri_wavfile.h \ - gr_tagged_file_sink.h - -swiginclude_HEADERS = \ - io.i \ - gr_file_sink.i \ - gr_file_sink_base.i \ - gr_file_source.i \ - gr_file_descriptor_sink.i \ - gr_file_descriptor_source.i \ - gr_histo_sink.i \ - gr_message_sink.i \ - gr_message_source.i \ - gr_oscope_sink.i \ - microtune_xxxx_eval_board.i \ - microtune_4702_eval_board.i \ - microtune_4937_eval_board.i \ - ppio.i \ - sdr_1000.i \ - gr_udp_sink.i \ - gr_udp_source.i \ - gr_wavfile_source.i \ - gr_wavfile_sink.i \ - gr_tagged_file_sink.i diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc index 11e0a8eb9..099d46dbd 100644 --- a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc +++ b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -57,7 +57,7 @@ gr_file_descriptor_sink::~gr_file_descriptor_sink () close (d_fd); } -int +int gr_file_descriptor_sink::work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.h b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.h index 5e4cc6505..3b1c1167f 100644 --- a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.h +++ b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.i b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.i index 14c37f68e..2c256e44d 100644 --- a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.i +++ b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -22,7 +22,7 @@ GR_SWIG_BLOCK_MAGIC(gr,file_descriptor_sink) -gr_file_descriptor_sink_sptr +gr_file_descriptor_sink_sptr gr_make_file_descriptor_sink (size_t itemsize, int fd); class gr_file_descriptor_sink : public gr_sync_block diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc index 334a57848..a63abf96b 100644 --- a/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc +++ b/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2005 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -133,9 +133,9 @@ gr_file_descriptor_source::read_items (char *buf, int nitems) if (r == 0) // block until we get something return read_items (buf, nitems); - + return r; -} +} int gr_file_descriptor_source::handle_residue (char *buf, int nbytes_read) diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_source.h b/gnuradio-core/src/lib/io/gr_file_descriptor_source.h index fa513fd25..ebabd81ed 100644 --- a/gnuradio-core/src/lib/io/gr_file_descriptor_source.h +++ b/gnuradio-core/src/lib/io/gr_file_descriptor_source.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_source.i b/gnuradio-core/src/lib/io/gr_file_descriptor_source.i index cee0b5765..3ca082522 100644 --- a/gnuradio-core/src/lib/io/gr_file_descriptor_source.i +++ b/gnuradio-core/src/lib/io/gr_file_descriptor_source.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -22,7 +22,7 @@ GR_SWIG_BLOCK_MAGIC(gr,file_descriptor_source) -gr_file_descriptor_source_sptr +gr_file_descriptor_source_sptr gr_make_file_descriptor_source (size_t itemsize, int fd, bool repeat=false); class gr_file_descriptor_source : public gr_sync_block diff --git a/gnuradio-core/src/lib/io/gr_file_sink.cc b/gnuradio-core/src/lib/io/gr_file_sink.cc index aab0158e7..5d147fcfe 100644 --- a/gnuradio-core/src/lib/io/gr_file_sink.cc +++ b/gnuradio-core/src/lib/io/gr_file_sink.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2006,2007,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -50,7 +50,7 @@ gr_file_sink::~gr_file_sink () { } -int +int gr_file_sink::work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -59,7 +59,7 @@ gr_file_sink::work (int noutput_items, int nwritten = 0; do_update(); // update d_fp is reqd - + if (!d_fp) return noutput_items; // drop output on the floor @@ -72,6 +72,6 @@ gr_file_sink::work (int noutput_items, } if (d_unbuffered) fflush (d_fp); - + return nwritten; } diff --git a/gnuradio-core/src/lib/io/gr_file_sink.h b/gnuradio-core/src/lib/io/gr_file_sink.h index 180cbef2a..e40ec9ab8 100644 --- a/gnuradio-core/src/lib/io/gr_file_sink.h +++ b/gnuradio-core/src/lib/io/gr_file_sink.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2007 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_file_sink.i b/gnuradio-core/src/lib/io/gr_file_sink.i index 64260392c..47ab9e964 100644 --- a/gnuradio-core/src/lib/io/gr_file_sink.i +++ b/gnuradio-core/src/lib/io/gr_file_sink.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -22,7 +22,7 @@ GR_SWIG_BLOCK_MAGIC(gr,file_sink) -gr_file_sink_sptr +gr_file_sink_sptr gr_make_file_sink (size_t itemsize, const char *filename); class gr_file_sink : public gr_sync_block, public gr_file_sink_base @@ -33,7 +33,7 @@ class gr_file_sink : public gr_sync_block, public gr_file_sink_base public: ~gr_file_sink (); - /*! + /*! * \brief open filename and begin output to it. */ bool open(const char *filename); diff --git a/gnuradio-core/src/lib/io/gr_file_sink_base.cc b/gnuradio-core/src/lib/io/gr_file_sink_base.cc index c43304b0d..b2dcc1be5 100644 --- a/gnuradio-core/src/lib/io/gr_file_sink_base.cc +++ b/gnuradio-core/src/lib/io/gr_file_sink_base.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2006,2007,2009 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -117,7 +117,7 @@ gr_file_sink_base::do_update() d_new_fp = 0; d_updated = false; } -} +} void gr_file_sink_base::set_unbuffered(bool unbuffered) diff --git a/gnuradio-core/src/lib/io/gr_file_sink_base.h b/gnuradio-core/src/lib/io/gr_file_sink_base.h index 6765dbad8..8a70cee76 100644 --- a/gnuradio-core/src/lib/io/gr_file_sink_base.h +++ b/gnuradio-core/src/lib/io/gr_file_sink_base.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2007,2008 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -46,7 +46,7 @@ class GR_CORE_API gr_file_sink_base public: ~gr_file_sink_base(); - /*! + /*! * \brief Open filename and begin output to it. */ bool open(const char *filename); @@ -63,8 +63,8 @@ class GR_CORE_API gr_file_sink_base * \brief if we've had an update, do it now. */ void do_update(); - - + + /*! * \brief turn on unbuffered writes for slower outputs */ diff --git a/gnuradio-core/src/lib/io/gr_file_sink_base.i b/gnuradio-core/src/lib/io/gr_file_sink_base.i index ed4342482..993dba277 100644 --- a/gnuradio-core/src/lib/io/gr_file_sink_base.i +++ b/gnuradio-core/src/lib/io/gr_file_sink_base.i @@ -1,24 +1,24 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -class gr_file_sink_base +class gr_file_sink_base { protected: gr_file_sink_base(const char *filename, bool is_binary); @@ -26,7 +26,7 @@ class gr_file_sink_base public: ~gr_file_sink_base(); - /*! + /*! * \brief Open filename and begin output to it. */ bool open(const char *filename); diff --git a/gnuradio-core/src/lib/io/gr_file_source.cc b/gnuradio-core/src/lib/io/gr_file_source.cc index d045e26b3..3f06a8244 100644 --- a/gnuradio-core/src/lib/io/gr_file_source.cc +++ b/gnuradio-core/src/lib/io/gr_file_source.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -56,7 +56,7 @@ gr_file_source::gr_file_source (size_t itemsize, const char *filename, bool repe d_itemsize (itemsize), d_fp (0), d_repeat (repeat) { // we use "open" to use to the O_LARGEFILE flag - + int fd; if ((fd = open (filename, O_RDONLY | OUR_O_LARGEFILE | OUR_O_BINARY)) < 0){ perror (filename); @@ -82,7 +82,7 @@ gr_file_source::~gr_file_source () fclose ((FILE *) d_fp); } -int +int gr_file_source::work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -93,7 +93,7 @@ gr_file_source::work (int noutput_items, while (size) { i = fread(o, d_itemsize, size, (FILE *) d_fp); - + size -= i; o += i * d_itemsize; diff --git a/gnuradio-core/src/lib/io/gr_file_source.h b/gnuradio-core/src/lib/io/gr_file_source.h index 6e8fc4074..1cc44a3b1 100644 --- a/gnuradio-core/src/lib/io/gr_file_source.h +++ b/gnuradio-core/src/lib/io/gr_file_source.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_file_source.i b/gnuradio-core/src/lib/io/gr_file_source.i index f538ea3ae..9bf44691d 100644 --- a/gnuradio-core/src/lib/io/gr_file_source.i +++ b/gnuradio-core/src/lib/io/gr_file_source.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -28,7 +28,7 @@ GR_SWIG_BLOCK_MAGIC(gr,file_source) -gr_file_source_sptr +gr_file_source_sptr gr_make_file_source (size_t itemsize, const char *filename, bool repeat=false); class gr_file_source : public gr_sync_block diff --git a/gnuradio-core/src/lib/io/gr_histo_sink.i b/gnuradio-core/src/lib/io/gr_histo_sink.i index 544d772fb..14079e190 100644 --- a/gnuradio-core/src/lib/io/gr_histo_sink.i +++ b/gnuradio-core/src/lib/io/gr_histo_sink.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2009 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_message_sink.cc b/gnuradio-core/src/lib/io/gr_message_sink.cc index 8881e97f4..ae0b5c764 100644 --- a/gnuradio-core/src/lib/io/gr_message_sink.cc +++ b/gnuradio-core/src/lib/io/gr_message_sink.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2005,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ // public constructor that returns a shared_ptr -gr_message_sink_sptr +gr_message_sink_sptr gr_make_message_sink (size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block) { return gnuradio::get_initial_sptr(new gr_message_sink(itemsize, msgq, dont_block)); diff --git a/gnuradio-core/src/lib/io/gr_message_sink.h b/gnuradio-core/src/lib/io/gr_message_sink.h index 180055261..84005694a 100644 --- a/gnuradio-core/src/lib/io/gr_message_sink.h +++ b/gnuradio-core/src/lib/io/gr_message_sink.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2005 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_message_sink.i b/gnuradio-core/src/lib/io/gr_message_sink.i index a42cb7eca..8415cbd66 100644 --- a/gnuradio-core/src/lib/io/gr_message_sink.i +++ b/gnuradio-core/src/lib/io/gr_message_sink.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2005 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_message_source.cc b/gnuradio-core/src/lib/io/gr_message_source.cc index 0fa24f2f9..fb3da89a8 100644 --- a/gnuradio-core/src/lib/io/gr_message_source.cc +++ b/gnuradio-core/src/lib/io/gr_message_source.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2005,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_message_source.h b/gnuradio-core/src/lib/io/gr_message_source.h index 16a0f4474..c510d1775 100644 --- a/gnuradio-core/src/lib/io/gr_message_source.h +++ b/gnuradio-core/src/lib/io/gr_message_source.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2005 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_message_source.i b/gnuradio-core/src/lib/io/gr_message_source.i index e4e2016d0..9ee9157e8 100644 --- a/gnuradio-core/src/lib/io/gr_message_source.i +++ b/gnuradio-core/src/lib/io/gr_message_source.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2005 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -22,14 +22,6 @@ GR_SWIG_BLOCK_MAGIC(gr,message_source); -#ifdef SWIGGUILE -// Rename these. Without this, the primitive bindings are OK, but the -// goops bindings try to create a bogus generic-function... -// See core.scm for the second part of the workaround. -%rename(message_source_limit_ctor) gr_make_message_source(size_t itemsize, int msgq_limit); -%rename(message_source_msgq_ctor) gr_make_message_source(size_t itemsize, gr_msg_queue_sptr msgq); -#endif - gr_message_source_sptr gr_make_message_source (size_t itemsize, int msgq_limit=0); gr_message_source_sptr gr_make_message_source (size_t itemsize, gr_msg_queue_sptr msgq); diff --git a/gnuradio-core/src/lib/io/gr_oscope_guts.cc b/gnuradio-core/src/lib/io/gr_oscope_guts.cc index 8b0d1e632..a5ea3002a 100644 --- a/gnuradio-core/src/lib/io/gr_oscope_guts.cc +++ b/gnuradio-core/src/lib/io/gr_oscope_guts.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003,2005 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -65,7 +65,7 @@ decr_bi (int buffer_index, int mx) // decrement buffer index gr_oscope_guts::gr_oscope_guts (double sample_rate, gr_msg_queue_sptr msgq) : d_nchannels (1), - d_msgq (msgq), + d_msgq (msgq), d_trigger_mode (gr_TRIG_MODE_AUTO), d_trigger_slope (gr_TRIG_SLOPE_POS), d_trigger_channel (0), @@ -115,7 +115,7 @@ gr_oscope_guts::process_sample (const float *channel_data) return; d_decimator_count = d_decimator_count_init; - + if (d_trigger_mode != gr_TRIG_MODE_STRIPCHART) { for (int i = 0; i < d_nchannels; i++) @@ -198,7 +198,7 @@ gr_oscope_guts::found_trigger () { int mx = d_trigger_mode == gr_TRIG_MODE_STRIPCHART ? OUTPUT_RECORD_SIZE*SCHART_MULT : OUTPUT_RECORD_SIZE; - + float prev_sample = d_buffer[d_trigger_channel][decr_bi(d_obi, mx)]; float new_sample = d_buffer[d_trigger_channel][d_obi]; @@ -241,15 +241,15 @@ void gr_oscope_guts::write_output_records () { int mx; - - mx = d_trigger_mode == gr_TRIG_MODE_STRIPCHART ? + + mx = d_trigger_mode == gr_TRIG_MODE_STRIPCHART ? OUTPUT_RECORD_SIZE*SCHART_MULT : OUTPUT_RECORD_SIZE; - + // if the output queue if full, drop the data like its hot. if (d_msgq->full_p()) return; // Build a message to hold the output records - gr_message_sptr msg = + gr_message_sptr msg = gr_make_message(0, // msg type d_nchannels, // arg1 for other side mx, // arg2 for other side @@ -427,7 +427,7 @@ int gr_oscope_guts::get_samples_per_output_record () const { int mx; - + mx = OUTPUT_RECORD_SIZE; if (d_trigger_mode == gr_TRIG_MODE_STRIPCHART) { diff --git a/gnuradio-core/src/lib/io/gr_oscope_guts.h b/gnuradio-core/src/lib/io/gr_oscope_guts.h index 3223d4e38..bc9513c7e 100644 --- a/gnuradio-core/src/lib/io/gr_oscope_guts.h +++ b/gnuradio-core/src/lib/io/gr_oscope_guts.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003,2005 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -56,7 +56,7 @@ private: double d_update_rate; // approx freq to produce an output record (Hz) double d_trigger_level; - int d_obi; // output buffer index + int d_obi; // output buffer index float *d_buffer[MAX_CHANNELS]; scope_state d_state; diff --git a/gnuradio-core/src/lib/io/gr_oscope_sink.i b/gnuradio-core/src/lib/io/gr_oscope_sink.i index 9d634193b..3d7072ed4 100644 --- a/gnuradio-core/src/lib/io/gr_oscope_sink.i +++ b/gnuradio-core/src/lib/io/gr_oscope_sink.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_oscope_sink_f.cc b/gnuradio-core/src/lib/io/gr_oscope_sink_f.cc index eca0f6dc6..493a25e81 100644 --- a/gnuradio-core/src/lib/io/gr_oscope_sink_f.cc +++ b/gnuradio-core/src/lib/io/gr_oscope_sink_f.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003,2004,2005,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -68,7 +68,7 @@ gr_oscope_sink_f::work (int noutput_items, for (int i = 0; i < noutput_items; i++){ // FIXME for now, copy the data. Fix later if reqd - for (int ch = 0; ch < ni; ch++) + for (int ch = 0; ch < ni; ch++) tmp[ch] = ((const float *) input_items[ch])[i]; d_guts->process_sample (tmp); diff --git a/gnuradio-core/src/lib/io/gr_oscope_sink_f.h b/gnuradio-core/src/lib/io/gr_oscope_sink_f.h index e3d1f65e5..8d434d2bc 100644 --- a/gnuradio-core/src/lib/io/gr_oscope_sink_f.h +++ b/gnuradio-core/src/lib/io/gr_oscope_sink_f.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003,2004,2005 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc b/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc index 2bbd57463..9580dbf6a 100644 --- a/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc +++ b/gnuradio-core/src/lib/io/gr_oscope_sink_x.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_oscope_sink_x.h b/gnuradio-core/src/lib/io/gr_oscope_sink_x.h index aaff5870b..153d0937a 100644 --- a/gnuradio-core/src/lib/io/gr_oscope_sink_x.h +++ b/gnuradio-core/src/lib/io/gr_oscope_sink_x.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -40,7 +40,7 @@ class GR_CORE_API gr_oscope_sink_x : public gr_sync_block protected: double d_sampling_rate; gr_oscope_guts *d_guts; - + gr_oscope_sink_x (const std::string name, gr_io_signature_sptr input_sig, double sampling_rate); @@ -71,7 +71,7 @@ public: // # of samples written to each output record. int get_samples_per_output_record () const; - + }; #endif /* INCLUDED_GR_OSCOPE_SINK_X_H */ diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc index 4ac8c3512..d69892762 100644 --- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc +++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -72,7 +72,7 @@ gr_tagged_file_sink::~gr_tagged_file_sink () { } -int +int gr_tagged_file_sink::work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -112,7 +112,7 @@ gr_tagged_file_sink::work (int noutput_items, pmt::pmt_string_to_symbol("time")); if(time_tags.size() > 0) { const gr_tag_t tag = time_tags[time_tags.size()-1]; - + uint64_t time_nitems = tag.offset; // Get time based on last time tag from USRP @@ -139,13 +139,13 @@ gr_tagged_file_sink::work (int noutput_items, //std::cout << " time: " << d_timeval << std::endl; } d_last_N = N; - + std::stringstream filename; filename.setf(std::ios::fixed, std::ios::floatfield); filename.precision(8); filename << "file" << d_n << "_" << d_timeval << ".dat"; d_n++; - + int fd; if ((fd = ::open (filename.str().c_str(), O_WRONLY|O_CREAT|O_TRUNC|OUR_O_LARGEFILE|OUR_O_BINARY, @@ -153,7 +153,7 @@ gr_tagged_file_sink::work (int noutput_items, perror (filename.str().c_str()); return -1; } - + // FIXME: //if ((d_handle = fdopen (fd, d_is_binary ? "wb" : "w")) == NULL){ if ((d_handle = fdopen (fd, "wb")) == NULL){ @@ -166,7 +166,7 @@ gr_tagged_file_sink::work (int noutput_items, d_state = IN_BURST; break; } - + vitr++; } if(d_state == NOT_IN_BURST) diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.h b/gnuradio-core/src/lib/io/gr_tagged_file_sink.h index da12dca78..d6f931a67 100644 --- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.h +++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.i b/gnuradio-core/src/lib/io/gr_tagged_file_sink.i index 1408adfc1..2f2596e12 100644 --- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.i +++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -22,7 +22,7 @@ GR_SWIG_BLOCK_MAGIC(gr,tagged_file_sink) -gr_tagged_file_sink_sptr +gr_tagged_file_sink_sptr gr_make_tagged_file_sink (size_t itemsize, double samp_rate); class gr_tagged_file_sink : public gr_sync_block diff --git a/gnuradio-core/src/lib/io/gr_trigger_mode.h b/gnuradio-core/src/lib/io/gr_trigger_mode.h index 8e1222856..be131686b 100644 --- a/gnuradio-core/src/lib/io/gr_trigger_mode.h +++ b/gnuradio-core/src/lib/io/gr_trigger_mode.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.cc b/gnuradio-core/src/lib/io/gr_udp_sink.cc index 9fc4da0ae..6b1d34ef7 100644 --- a/gnuradio-core/src/lib/io/gr_udp_sink.cc +++ b/gnuradio-core/src/lib/io/gr_udp_sink.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2007,2008,2009,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -92,7 +92,7 @@ static void report_error( const char *msg1, const char *msg2 ) return; } -gr_udp_sink::gr_udp_sink (size_t itemsize, +gr_udp_sink::gr_udp_sink (size_t itemsize, const char *host, unsigned short port, int payload_size, bool eof) : gr_sync_block ("udp_sink", @@ -133,11 +133,11 @@ gr_udp_sink::gr_udp_sink (size_t itemsize, // public constructor that returns a shared_ptr gr_udp_sink_sptr -gr_make_udp_sink (size_t itemsize, +gr_make_udp_sink (size_t itemsize, const char *host, unsigned short port, int payload_size, bool eof) { - return gnuradio::get_initial_sptr(new gr_udp_sink (itemsize, + return gnuradio::get_initial_sptr(new gr_udp_sink (itemsize, host, port, payload_size, eof)); } @@ -163,7 +163,7 @@ gr_udp_sink::~gr_udp_sink () #endif } -int +int gr_udp_sink::work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -180,7 +180,7 @@ gr_udp_sink::work (int noutput_items, while(bytes_sent < total_size) { bytes_to_send = std::min((ssize_t)d_payload_size, (total_size-bytes_sent)); - + if(d_connected) { r = send(d_socket, (in+bytes_sent), bytes_to_send, 0); if(r == -1) { // error on send command @@ -195,7 +195,7 @@ gr_udp_sink::work (int noutput_items, else r = bytes_to_send; // discarded for lack of connection bytes_sent += r; - + #if SNK_VERBOSE printf("\tbyte sent: %d bytes\n", r); #endif diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.h b/gnuradio-core/src/lib/io/gr_udp_sink.h index e9d4f8c73..bf042a6d1 100644 --- a/gnuradio-core/src/lib/io/gr_udp_sink.h +++ b/gnuradio-core/src/lib/io/gr_udp_sink.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2007,2008,2009,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -31,14 +31,14 @@ class gr_udp_sink; typedef boost::shared_ptr<gr_udp_sink> gr_udp_sink_sptr; GR_CORE_API gr_udp_sink_sptr -gr_make_udp_sink (size_t itemsize, +gr_make_udp_sink (size_t itemsize, const char *host, unsigned short port, int payload_size=1472, bool eof=true); /*! * \brief Write stream to an UDP socket. * \ingroup sink_blk - * + * * \param itemsize The size (in bytes) of the item datatype * \param host The name or IP address of the receiving host; use * NULL or None for no connection @@ -50,7 +50,7 @@ gr_make_udp_sink (size_t itemsize, class GR_CORE_API gr_udp_sink : public gr_sync_block { - friend GR_CORE_API gr_udp_sink_sptr gr_make_udp_sink (size_t itemsize, + friend GR_CORE_API gr_udp_sink_sptr gr_make_udp_sink (size_t itemsize, const char *host, unsigned short port, int payload_size, bool eof); @@ -66,16 +66,16 @@ class GR_CORE_API gr_udp_sink : public gr_sync_block protected: /*! * \brief UDP Sink Constructor - * + * * \param itemsize The size (in bytes) of the item datatype * \param host The name or IP address of the receiving host; use * NULL or None for no connection * \param port Destination port to connect to on receiving host - * \param payload_size UDP payload size by default set to + * \param payload_size UDP payload size by default set to * 1472 = (1500 MTU - (8 byte UDP header) - (20 byte IP header)) * \param eof Send zero-length packet on disconnect */ - gr_udp_sink (size_t itemsize, + gr_udp_sink (size_t itemsize, const char *host, unsigned short port, int payload_size, bool eof); diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.i b/gnuradio-core/src/lib/io/gr_udp_sink.i index a71006ae0..ba7043937 100644 --- a/gnuradio-core/src/lib/io/gr_udp_sink.i +++ b/gnuradio-core/src/lib/io/gr_udp_sink.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2007,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -23,17 +23,17 @@ GR_SWIG_BLOCK_MAGIC(gr,udp_sink) -gr_udp_sink_sptr -gr_make_udp_sink (size_t itemsize, +gr_udp_sink_sptr +gr_make_udp_sink (size_t itemsize, const char *host, unsigned short port, int payload_size=1472, bool eof=true) throw (std::runtime_error); class gr_udp_sink : public gr_sync_block { protected: - gr_udp_sink (size_t itemsize, + gr_udp_sink (size_t itemsize, const char *host, unsigned short port, - int payload_size, bool eof) + int payload_size, bool eof) throw (std::runtime_error); public: diff --git a/gnuradio-core/src/lib/io/gr_udp_source.cc b/gnuradio-core/src/lib/io/gr_udp_source.cc index ca31233de..af41159ee 100644 --- a/gnuradio-core/src/lib/io/gr_udp_source.cc +++ b/gnuradio-core/src/lib/io/gr_udp_source.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2007,2008,2009,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -97,7 +97,7 @@ static void report_error( const char *msg1, const char *msg2 ) return; } -gr_udp_source::gr_udp_source(size_t itemsize, const char *host, +gr_udp_source::gr_udp_source(size_t itemsize, const char *host, unsigned short port, int payload_size, bool eof, bool wait) : gr_sync_block ("udp_source", @@ -116,7 +116,7 @@ gr_udp_source::gr_udp_source(size_t itemsize, const char *host, report_error( "gr_udp_source WSAStartup", "can't open socket" ); } #endif - + // Set up the address stucture for the source address and port numbers // Get the source IP address from the host name struct addrinfo *ip_src; // store the source IP address to use @@ -186,10 +186,10 @@ gr_udp_source::gr_udp_source(size_t itemsize, const char *host, } gr_udp_source_sptr -gr_make_udp_source (size_t itemsize, const char *ipaddr, +gr_make_udp_source (size_t itemsize, const char *ipaddr, unsigned short port, int payload_size, bool eof, bool wait) { - return gnuradio::get_initial_sptr(new gr_udp_source (itemsize, ipaddr, + return gnuradio::get_initial_sptr(new gr_udp_source (itemsize, ipaddr, port, payload_size, eof, wait)); } @@ -213,7 +213,7 @@ gr_udp_source::~gr_udp_source () #endif } -int +int gr_udp_source::work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) @@ -233,13 +233,13 @@ gr_udp_source::work (int noutput_items, bytes_received = nbytes; #if SRC_VERBOSE - printf("\tTemp buff size: %d offset: %d (bytes_received: %d) (noutput_items: %d)\n", + printf("\tTemp buff size: %d offset: %d (bytes_received: %d) (noutput_items: %d)\n", d_residual, d_temp_offset, bytes_received, noutput_items); #endif // Increment pointer out += bytes_received; - + // Update indexing of amount of bytes left in the buffer d_residual -= nbytes; d_temp_offset += nbytes; @@ -280,7 +280,7 @@ gr_udp_source::work (int noutput_items, // This is a non-blocking call with a timeout set in the constructor r = recv(d_socket, d_temp_buff, d_payload_size, 0); // get the entire payload or the what's available - // If r > 0, round it down to a multiple of d_itemsize + // If r > 0, round it down to a multiple of d_itemsize // (If sender is broken, don't propagate problem) if (r > 0) r = (r/d_itemsize) * d_itemsize; @@ -289,7 +289,7 @@ gr_udp_source::work (int noutput_items, if(r == -1) { if( is_error(EAGAIN) ) { // handle non-blocking call timeout #if SRC_VERBOSE - printf("UDP receive timed out\n"); + printf("UDP receive timed out\n"); #endif if( d_wait ) { @@ -324,12 +324,12 @@ gr_udp_source::work (int noutput_items, else { // Calculate the number of bytes we can take from the buffer in this call nbytes = std::min(r, total_bytes-bytes_received); - + // adjust the total number of bytes we have to round down to nearest integer of an itemsize - nbytes -= ((bytes_received+nbytes) % d_itemsize); + nbytes -= ((bytes_received+nbytes) % d_itemsize); // copy the number of bytes we want to look at here - memcpy(out, d_temp_buff, nbytes); + memcpy(out, d_temp_buff, nbytes); d_residual = r - nbytes; // save the number of bytes stored d_temp_offset=nbytes; // reset buffer index @@ -350,7 +350,7 @@ gr_udp_source::work (int noutput_items, } #if SRC_VERBOSE - printf("Total Bytes Received: %d (bytes_received / noutput_items = %d / %d)\n", + printf("Total Bytes Received: %d (bytes_received / noutput_items = %d / %d)\n", bytes_received, bytes_received, noutput_items); #endif diff --git a/gnuradio-core/src/lib/io/gr_udp_source.h b/gnuradio-core/src/lib/io/gr_udp_source.h index e2898981d..56dcb3c0a 100644 --- a/gnuradio-core/src/lib/io/gr_udp_source.h +++ b/gnuradio-core/src/lib/io/gr_udp_source.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2007,2008,2009,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -30,12 +30,12 @@ class gr_udp_source; typedef boost::shared_ptr<gr_udp_source> gr_udp_source_sptr; -GR_CORE_API gr_udp_source_sptr gr_make_udp_source(size_t itemsize, const char *host, +GR_CORE_API gr_udp_source_sptr gr_make_udp_source(size_t itemsize, const char *host, unsigned short port, int payload_size=1472, bool eof=true, bool wait=true); -/*! +/*! * \brief Read stream from an UDP socket. * \ingroup source_blk * @@ -56,7 +56,7 @@ GR_CORE_API gr_udp_source_sptr gr_make_udp_source(size_t itemsize, const char *h class GR_CORE_API gr_udp_source : public gr_sync_block { friend GR_CORE_API gr_udp_source_sptr gr_make_udp_source(size_t itemsize, - const char *host, + const char *host, unsigned short port, int payload_size, bool eof, bool wait); @@ -74,7 +74,7 @@ class GR_CORE_API gr_udp_source : public gr_sync_block protected: /*! * \brief UDP Source Constructor - * + * * \param itemsize The size (in bytes) of the item datatype * \param host The name or IP address of the receiving host; can be * NULL, None, or "0.0.0.0" to allow reading from any diff --git a/gnuradio-core/src/lib/io/gr_udp_source.i b/gnuradio-core/src/lib/io/gr_udp_source.i index 2001f33e9..18823a356 100644 --- a/gnuradio-core/src/lib/io/gr_udp_source.i +++ b/gnuradio-core/src/lib/io/gr_udp_source.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2007,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -22,15 +22,15 @@ GR_SWIG_BLOCK_MAGIC(gr,udp_source) -gr_udp_source_sptr -gr_make_udp_source (size_t itemsize, const char *host, +gr_udp_source_sptr +gr_make_udp_source (size_t itemsize, const char *host, unsigned short port, int payload_size=1472, bool eof=true, bool wait=true) throw (std::runtime_error); class gr_udp_source : public gr_sync_block { protected: - gr_udp_source (size_t itemsize, const char *host, + gr_udp_source (size_t itemsize, const char *host, unsigned short port, int payload_size, bool eof, bool wait) throw (std::runtime_error); public: diff --git a/gnuradio-core/src/lib/io/gr_wavfile_sink.cc b/gnuradio-core/src/lib/io/gr_wavfile_sink.cc index a96aadc72..8526032f6 100644 --- a/gnuradio-core/src/lib/io/gr_wavfile_sink.cc +++ b/gnuradio-core/src/lib/io/gr_wavfile_sink.cc @@ -80,7 +80,7 @@ gr_wavfile_sink::gr_wavfile_sink(const char *filename, } d_bytes_per_sample = bits_per_sample / 8; d_bytes_per_sample_new = d_bytes_per_sample; - + if (!open(filename)) { throw std::runtime_error ("can't open file"); } @@ -106,7 +106,7 @@ bool gr_wavfile_sink::open(const char* filename) { gruel::scoped_lock guard(d_mutex); - + // we use the open system call to get access to the O_LARGEFILE flag. int fd; if ((fd = ::open (filename, @@ -120,14 +120,14 @@ gr_wavfile_sink::open(const char* filename) fclose(d_new_fp); d_new_fp = 0; } - + if ((d_new_fp = fdopen (fd, "wb")) == NULL) { perror (filename); ::close(fd); // don't leak file descriptor if fdopen fails. return false; } d_updated = true; - + if (!gri_wavheader_write(d_new_fp, d_sample_rate, d_nchans, @@ -135,7 +135,7 @@ gr_wavfile_sink::open(const char* filename) fprintf(stderr, "[%s] could not write to WAV file\n", __FILE__); exit(-1); } - + return true; } @@ -144,19 +144,19 @@ void gr_wavfile_sink::close() { gruel::scoped_lock guard(d_mutex); - + if (!d_fp) return; - + close_wav(); } void gr_wavfile_sink::close_wav() { unsigned int byte_count = d_sample_count * d_bytes_per_sample; - + gri_wavheader_complete(d_fp, byte_count); - + fclose(d_fp); d_fp = NULL; } @@ -179,28 +179,29 @@ gr_wavfile_sink::work (int noutput_items, { float **in = (float **) &input_items[0]; int n_in_chans = input_items.size(); - + short int sample_buf_s; - + int nwritten; - + + gruel::scoped_lock guard(d_mutex); // hold mutex for duration of this block do_update(); // update: d_fp is reqd if (!d_fp) // drop output on the floor return noutput_items; - + for (nwritten = 0; nwritten < noutput_items; nwritten++) { for (int chan = 0; chan < d_nchans; chan++) { // Write zeros to channels which are in the WAV file // but don't have any inputs here if (chan < n_in_chans) { - sample_buf_s = + sample_buf_s = convert_to_short(in[chan][nwritten]); } else { sample_buf_s = 0; } - + gri_wav_write_sample(d_fp, sample_buf_s, d_bytes_per_sample); - + if (feof(d_fp) || ferror(d_fp)) { fprintf(stderr, "[%s] file i/o error\n", __FILE__); close(); @@ -209,7 +210,7 @@ gr_wavfile_sink::work (int noutput_items, d_sample_count++; } } - + return nwritten; } @@ -224,7 +225,7 @@ gr_wavfile_sink::convert_to_short(float sample) } else if (sample < d_min_sample_val) { sample = d_min_sample_val; } - + return (short int) boost::math::iround(sample); } @@ -253,8 +254,7 @@ gr_wavfile_sink::do_update() if (!d_updated) { return; } - - gruel::scoped_lock guard(d_mutex); // hold mutex for duration of this block + if (d_fp) { close_wav(); } @@ -275,6 +275,6 @@ gr_wavfile_sink::do_update() d_normalize_fac = d_max_sample_val; d_normalize_shift = 0; } - + d_updated = false; } diff --git a/gnuradio-core/src/lib/io/gr_wavfile_sink.h b/gnuradio-core/src/lib/io/gr_wavfile_sink.h index 348f789ae..162151b7a 100644 --- a/gnuradio-core/src/lib/io/gr_wavfile_sink.h +++ b/gnuradio-core/src/lib/io/gr_wavfile_sink.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2008,2009 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -78,7 +78,7 @@ private: FILE *d_new_fp; bool d_updated; boost::mutex d_mutex; - + /*! * \brief Convert a sample value within [-1;+1] to a corresponding * short integer value @@ -86,6 +86,13 @@ private: short convert_to_short(float sample); /*! + * \brief If any file changes have occurred, update now. This is called + * internally by work() and thus doesn't usually need to be called by + * hand. + */ + void do_update(); + + /*! * \brief Writes information to the WAV header which is not available * a-priori (chunk size etc.) and closes the file. Not thread-safe and * assumes d_fp is a valid file pointer, should thus only be called by @@ -108,31 +115,24 @@ public: void close(); /*! - * \brief If any file changes have occurred, update now. This is called - * internally by work() and thus doesn't usually need to be called by - * hand. - */ - void do_update(); - - /*! * \brief Set the sample rate. This will not affect the WAV file * currently opened. Any following open() calls will use this new * sample rate. */ void set_sample_rate(unsigned int sample_rate); - + /*! * \brief Set bits per sample. This will not affect the WAV file * currently opened (see set_sample_rate()). If the value is neither * 8 nor 16, the call is ignored and the current value is kept. */ void set_bits_per_sample(int bits_per_sample); - - + + int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); - + }; #endif /* INCLUDED_GR_WAVFILE_SINK_H */ diff --git a/gnuradio-core/src/lib/io/gr_wavfile_sink.i b/gnuradio-core/src/lib/io/gr_wavfile_sink.i index 7ccad1978..48d1130bd 100644 --- a/gnuradio-core/src/lib/io/gr_wavfile_sink.i +++ b/gnuradio-core/src/lib/io/gr_wavfile_sink.i @@ -36,7 +36,7 @@ protected: int n_channels, unsigned int sample_rate, int bits_per_sample) throw (std::runtime_error); - + public: ~gr_wavfile_sink (); bool open(const char* filename); diff --git a/gnuradio-core/src/lib/io/gr_wavfile_source.cc b/gnuradio-core/src/lib/io/gr_wavfile_source.cc index 136e52611..c8372868b 100644 --- a/gnuradio-core/src/lib/io/gr_wavfile_source.cc +++ b/gnuradio-core/src/lib/io/gr_wavfile_source.cc @@ -85,7 +85,7 @@ gr_wavfile_source::gr_wavfile_source (const char *filename, bool repeat) d_samples_per_chan)) { throw std::runtime_error("is not a valid wav file"); } - + if (d_samples_per_chan == 0) { throw std::runtime_error("WAV file does not contain any samples"); } @@ -134,7 +134,7 @@ gr_wavfile_source::work(int noutput_items, d_sample_idx = 0; } - + for (int chan = 0; chan < d_nchans; chan++) { sample = gri_wav_read_sample(d_fp, d_bytes_per_sample); @@ -144,7 +144,7 @@ gr_wavfile_source::work(int noutput_items, } d_sample_idx++; - + // OK, EOF is not necessarily an error. But we're not going to // deal with handling corrupt wav files, so if they give us any // trouble they won't be processed. Serves them bloody right. @@ -156,7 +156,7 @@ gr_wavfile_source::work(int noutput_items, return i; } } - + return noutput_items; } diff --git a/gnuradio-core/src/lib/io/gr_wavfile_source.h b/gnuradio-core/src/lib/io/gr_wavfile_source.h index b300f2808..02e6e3678 100644 --- a/gnuradio-core/src/lib/io/gr_wavfile_source.h +++ b/gnuradio-core/src/lib/io/gr_wavfile_source.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2008 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -51,7 +51,7 @@ private: FILE *d_fp; bool d_repeat; - + unsigned d_sample_rate; int d_nchans; int d_bytes_per_sample; @@ -60,7 +60,7 @@ private: unsigned d_sample_idx; int d_normalize_shift; int d_normalize_fac; - + /*! * \brief Convert an integer sample value to a float value within [-1;1] */ @@ -68,7 +68,7 @@ private: public: ~gr_wavfile_source (); - + int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); @@ -83,7 +83,7 @@ public: * file header. Only 8 or 16 bit are supported here. */ int bits_per_sample() const { return d_bytes_per_sample * 8; }; - + /*! * \brief Return the number of channels in the wav file as specified in * the wav file header. This is also the max number of outputs you can diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc index 8f1c6a2bb..e316a0825 100644 --- a/gnuradio-core/src/lib/io/gri_wavfile.cc +++ b/gnuradio-core/src/lib/io/gri_wavfile.cc @@ -142,7 +142,7 @@ gri_wavheader_parse(FILE *fp, { // _o variables take return values char str_buf[8] = {0}; - + uint32_t file_size; uint32_t fmt_hdr_skip; uint16_t compression_type; @@ -152,52 +152,52 @@ gri_wavheader_parse(FILE *fp, uint16_t block_align; uint16_t bits_per_sample; uint32_t chunk_size; - + size_t fresult; fresult = fread(str_buf, 1, 4, fp); if (fresult != 4 || strncmp(str_buf, "RIFF", 4) || feof(fp)) { return false; } - + fresult = fread(&file_size, 1, 4, fp); - + fresult = fread(str_buf, 1, 8, fp); if (fresult != 8 || strncmp(str_buf, "WAVEfmt ", 8) || feof(fp)) { return false; } - + fresult = fread(&fmt_hdr_skip, 1, 4, fp); - + fresult = fread(&compression_type, 1, 2, fp); if (wav_to_host(compression_type) != VALID_COMPRESSION_TYPE) { return false; } - + fresult = fread(&nchans, 1, 2, fp); fresult = fread(&sample_rate, 1, 4, fp); fresult = fread(&avg_bytes_per_sec, 1, 4, fp); fresult = fread(&block_align, 1, 2, fp); fresult = fread(&bits_per_sample, 1, 2, fp); - + if (ferror(fp)) { return false; } - + fmt_hdr_skip = wav_to_host(fmt_hdr_skip); nchans = wav_to_host(nchans); sample_rate = wav_to_host(sample_rate); bits_per_sample = wav_to_host(bits_per_sample); - + if (bits_per_sample != 8 && bits_per_sample != 16) { return false; } - + fmt_hdr_skip -= 16; if (fmt_hdr_skip) { fseek(fp, fmt_hdr_skip, SEEK_CUR); } - + // data chunk fresult = fread(str_buf, 1, 4, fp); if (strncmp(str_buf, "data", 4)) { @@ -208,10 +208,10 @@ gri_wavheader_parse(FILE *fp, if (ferror(fp)) { return false; } - + // More byte swapping chunk_size = wav_to_host(chunk_size); - + // Output values sample_rate_o = (unsigned) sample_rate; nchans_o = (int) nchans; @@ -229,7 +229,7 @@ gri_wav_read_sample(FILE *fp, int bytes_per_sample) size_t fresult; fresult = fread(&buf, bytes_per_sample, 1, fp); - + return (short) wav_to_host(buf); } @@ -247,13 +247,13 @@ gri_wavheader_write(FILE *fp, uint16_t block_align = bytes_per_sample * nchans; uint32_t avg_bytes = sample_rate * block_align; uint16_t bits_per_sample = bytes_per_sample * 8; - + nchans_f = host_to_wav(nchans_f); sample_rate_f = host_to_wav(sample_rate_f); block_align = host_to_wav(block_align); avg_bytes = host_to_wav(avg_bytes); bits_per_sample = host_to_wav(bits_per_sample); - + wav_hdr[16] = 0x10; // no extra bytes wav_hdr[20] = 0x01; // no compression memcpy((void *) (wav_hdr + 22), (void *) &nchans_f, 2); @@ -261,12 +261,12 @@ gri_wavheader_write(FILE *fp, memcpy((void *) (wav_hdr + 28), (void *) &avg_bytes, 4); memcpy((void *) (wav_hdr + 32), (void *) &block_align, 2); memcpy((void *) (wav_hdr + 34), (void *) &bits_per_sample, 2); - + fwrite(&wav_hdr, 1, header_len, fp); if (ferror(fp)) { return false; } - + return true; } @@ -277,7 +277,7 @@ gri_wav_write_sample(FILE *fp, short int sample, int bytes_per_sample) void *data_ptr; unsigned char buf_8bit; int16_t buf_16bit; - + if (bytes_per_sample == 1) { buf_8bit = (unsigned char) sample; data_ptr = (void *) &buf_8bit; @@ -285,7 +285,7 @@ gri_wav_write_sample(FILE *fp, short int sample, int bytes_per_sample) buf_16bit = host_to_wav((int16_t) sample); data_ptr = (void *) &buf_16bit; } - + fwrite(data_ptr, 1, bytes_per_sample, fp); } @@ -295,19 +295,19 @@ gri_wavheader_complete(FILE *fp, unsigned int byte_count) { uint32_t chunk_size = (uint32_t) byte_count; chunk_size = host_to_wav(chunk_size); - + fseek(fp, 40, SEEK_SET); fwrite(&chunk_size, 1, 4, fp); - + chunk_size = (uint32_t) byte_count + 36; // fmt chunk and data header chunk_size = host_to_wav(chunk_size); fseek(fp, 4, SEEK_SET); - + fwrite(&chunk_size, 1, 4, fp); - + if (ferror(fp)) { return false; } - + return true; } diff --git a/gnuradio-core/src/lib/io/gri_wavfile.h b/gnuradio-core/src/lib/io/gri_wavfile.h index 2268474fb..c757be26b 100644 --- a/gnuradio-core/src/lib/io/gri_wavfile.h +++ b/gnuradio-core/src/lib/io/gri_wavfile.h @@ -91,7 +91,7 @@ gri_wav_write_sample(FILE *fp, short int sample, int bytes_per_sample); * * Note: The stream position is changed during this function. If anything * needs to be written to the WAV file after calling this function (which - * shouldn't happen), you need to fseek() to the end of the file (or + * shouldn't happen), you need to fseek() to the end of the file (or * whereever). * * \p fp File pointer to an open WAV file with a blank header diff --git a/gnuradio-core/src/lib/io/i2c.cc b/gnuradio-core/src/lib/io/i2c.cc index 65d426f7f..02dd47b53 100644 --- a/gnuradio-core/src/lib/io/i2c.cc +++ b/gnuradio-core/src/lib/io/i2c.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/i2c.h b/gnuradio-core/src/lib/io/i2c.h index 7d446dfa3..6b7f25a29 100644 --- a/gnuradio-core/src/lib/io/i2c.h +++ b/gnuradio-core/src/lib/io/i2c.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -34,10 +34,10 @@ typedef boost::shared_ptr<i2c> i2c_sptr; */ class GR_CORE_API i2c { public: - + i2c () {} virtual ~i2c (); - + //! \returns true iff successful virtual bool write (int addr, const unsigned char *buf, int nbytes) = 0; diff --git a/gnuradio-core/src/lib/io/i2c_bbio.cc b/gnuradio-core/src/lib/io/i2c_bbio.cc index 453681d8a..ddd00290d 100644 --- a/gnuradio-core/src/lib/io/i2c_bbio.cc +++ b/gnuradio-core/src/lib/io/i2c_bbio.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/i2c_bbio.h b/gnuradio-core/src/lib/io/i2c_bbio.h index 110a56555..6bf47b9cd 100644 --- a/gnuradio-core/src/lib/io/i2c_bbio.h +++ b/gnuradio-core/src/lib/io/i2c_bbio.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -39,7 +39,7 @@ class GR_CORE_API i2c_bbio { i2c_bbio () {} virtual ~i2c_bbio (); - + virtual void set_scl (bool state) = 0; virtual void set_sda (bool state) = 0; virtual bool get_sda () = 0; diff --git a/gnuradio-core/src/lib/io/i2c_bbio_pp.cc b/gnuradio-core/src/lib/io/i2c_bbio_pp.cc index fda225ec8..382bb6b37 100644 --- a/gnuradio-core/src/lib/io/i2c_bbio_pp.cc +++ b/gnuradio-core/src/lib/io/i2c_bbio_pp.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/i2c_bbio_pp.h b/gnuradio-core/src/lib/io/i2c_bbio_pp.h index 4a311a2c9..2391bc1fc 100644 --- a/gnuradio-core/src/lib/io/i2c_bbio_pp.h +++ b/gnuradio-core/src/lib/io/i2c_bbio_pp.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/i2c_bitbang.cc b/gnuradio-core/src/lib/io/i2c_bitbang.cc index 401c76b0d..eb801c68f 100644 --- a/gnuradio-core/src/lib/io/i2c_bitbang.cc +++ b/gnuradio-core/src/lib/io/i2c_bitbang.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -32,7 +32,7 @@ i2c_bitbang::i2c_bitbang (i2c_bbio_sptr io) d_io->unlock (); } -i2c_sptr +i2c_sptr make_i2c_bitbang (i2c_bbio_sptr io) { return i2c_sptr (new i2c_bitbang (io)); @@ -43,7 +43,7 @@ make_i2c_bitbang (i2c_bbio_sptr io) // entry: SCL = 1, SDA = 1 // exit: SCL = 0, SDA = 0 -void +void i2c_bitbang::start () { set_sda (1); @@ -53,11 +53,11 @@ i2c_bitbang::start () } -// stop: +// stop: // entry: SCL = X, SDA = X // exit: SCL = 1, SDA = 1 -void +void i2c_bitbang::stop () { set_scl (0); @@ -71,7 +71,7 @@ i2c_bitbang::stop () // entry: SCL = 0, SDA = X // exit: SCL = 0, SDA = X -void +void i2c_bitbang::write_bit (bool bit) { set_sda (bit); @@ -114,7 +114,7 @@ bool i2c_bitbang::write (int addr, const unsigned char *buf, int nbytes) { bool ok = true; - + d_io->lock (); start (); ok = write_byte ((addr << 1) | 0); // addr plus "read opcode" diff --git a/gnuradio-core/src/lib/io/i2c_bitbang.h b/gnuradio-core/src/lib/io/i2c_bitbang.h index feb23b787..1d6fe5044 100644 --- a/gnuradio-core/src/lib/io/i2c_bitbang.h +++ b/gnuradio-core/src/lib/io/i2c_bitbang.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ class GR_CORE_API i2c_bitbang : public i2c { public: ~i2c_bitbang () {} - + //! \returns true iff successful bool write (int addr, const unsigned char *buf, int nbytes); @@ -50,7 +50,7 @@ private: void stop (); void write_bit (bool bit); bool write_byte (char byte); - + void set_sda (bool bit) { d_io->set_sda (bit); } void set_scl (bool bit) { d_io->set_scl (bit); } bool get_sda () { return d_io->get_sda (); } diff --git a/gnuradio-core/src/lib/io/io.i b/gnuradio-core/src/lib/io/io.i index 365577cd4..eab1346f1 100644 --- a/gnuradio-core/src/lib/io/io.i +++ b/gnuradio-core/src/lib/io/io.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2007 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/microtune_4702.cc b/gnuradio-core/src/lib/io/microtune_4702.cc index 59c88e26e..3ec072d51 100644 --- a/gnuradio-core/src/lib/io/microtune_4702.cc +++ b/gnuradio-core/src/lib/io/microtune_4702.cc @@ -1,7 +1,7 @@ /* -*- c++-*- */ /* * Copyright 2001,2003,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio * * GNU Radio is free software; you can redistribute it and/or modify @@ -13,7 +13,7 @@ * 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -166,7 +166,7 @@ microtune_4702::set_RF_freq (double target_freq, double *p_actual_freq) /*! * \returns true iff PLL is locked */ -bool +bool microtune_4702::pll_locked_p () { // FIXME diff --git a/gnuradio-core/src/lib/io/microtune_4702.h b/gnuradio-core/src/lib/io/microtune_4702.h index fd8d89305..ccc66db71 100644 --- a/gnuradio-core/src/lib/io/microtune_4702.h +++ b/gnuradio-core/src/lib/io/microtune_4702.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -51,7 +51,7 @@ public: * \returns true iff PLL is locked */ bool pll_locked_p (); - + /*! * \returns the output frequency of the tuner in Hz. */ diff --git a/gnuradio-core/src/lib/io/microtune_4702_eval_board.h b/gnuradio-core/src/lib/io/microtune_4702_eval_board.h index e3c07fdf9..d866a4b94 100644 --- a/gnuradio-core/src/lib/io/microtune_4702_eval_board.h +++ b/gnuradio-core/src/lib/io/microtune_4702_eval_board.h @@ -1,19 +1,19 @@ /* -*- C++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/microtune_4702_eval_board.i b/gnuradio-core/src/lib/io/microtune_4702_eval_board.i index 832a722fa..fc085a975 100644 --- a/gnuradio-core/src/lib/io/microtune_4702_eval_board.i +++ b/gnuradio-core/src/lib/io/microtune_4702_eval_board.i @@ -1,19 +1,19 @@ /* -*- C++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/microtune_4937.cc b/gnuradio-core/src/lib/io/microtune_4937.cc index 1369df514..72ddd4bb6 100644 --- a/gnuradio-core/src/lib/io/microtune_4937.cc +++ b/gnuradio-core/src/lib/io/microtune_4937.cc @@ -1,19 +1,19 @@ /* -*- c++-*- */ /* * Copyright 2001,2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -99,7 +99,7 @@ microtune_4937::set_RF_freq (double target_freq, double *p_actual_freq) unsigned char buf[4]; double target_f_osc = target_freq + first_IF; - + double f_ref = 4e6 / d_reference_divider; // f_osc = f_ref * 8 * divisor @@ -129,7 +129,7 @@ microtune_4937::set_RF_freq (double target_freq, double *p_actual_freq) /*! * \returns true iff PLL is locked */ -bool +bool microtune_4937::pll_locked_p () { // FIXME diff --git a/gnuradio-core/src/lib/io/microtune_4937.h b/gnuradio-core/src/lib/io/microtune_4937.h index bc8a26c64..be8657c95 100644 --- a/gnuradio-core/src/lib/io/microtune_4937.h +++ b/gnuradio-core/src/lib/io/microtune_4937.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -44,12 +44,12 @@ public: * \returns true iff sucessful. */ bool set_RF_freq (double freq, double *actual_freq); - + /*! * \returns true iff PLL is locked */ bool pll_locked_p (); - + /*! * \returns the output frequency (IF center freq) of the tuner in Hz. */ diff --git a/gnuradio-core/src/lib/io/microtune_4937_eval_board.cc b/gnuradio-core/src/lib/io/microtune_4937_eval_board.cc index f7a586075..a25b8addf 100644 --- a/gnuradio-core/src/lib/io/microtune_4937_eval_board.cc +++ b/gnuradio-core/src/lib/io/microtune_4937_eval_board.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/microtune_4937_eval_board.h b/gnuradio-core/src/lib/io/microtune_4937_eval_board.h index 09c00d116..3abd9084e 100644 --- a/gnuradio-core/src/lib/io/microtune_4937_eval_board.h +++ b/gnuradio-core/src/lib/io/microtune_4937_eval_board.h @@ -1,19 +1,19 @@ /* -*- C++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/microtune_4937_eval_board.i b/gnuradio-core/src/lib/io/microtune_4937_eval_board.i index 1fe92c0f0..e261416f7 100644 --- a/gnuradio-core/src/lib/io/microtune_4937_eval_board.i +++ b/gnuradio-core/src/lib/io/microtune_4937_eval_board.i @@ -1,19 +1,19 @@ /* -*- C++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/microtune_eval_board.i b/gnuradio-core/src/lib/io/microtune_eval_board.i index 3ad7eb61b..f77ef47b4 100644 --- a/gnuradio-core/src/lib/io/microtune_eval_board.i +++ b/gnuradio-core/src/lib/io/microtune_eval_board.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -35,12 +35,12 @@ public: // returns actual freq or 0 if error (easier interface for SWIG) double set_RF_freq (double freq); - + /*! * \returns true iff PLL is locked */ bool pll_locked_p (); - + /*! * \returns the output frequency (IF center freq) of the tuner in Hz. */ diff --git a/gnuradio-core/src/lib/io/microtune_eval_board_defs.h b/gnuradio-core/src/lib/io/microtune_eval_board_defs.h index 5cba50bdf..61c52364f 100644 --- a/gnuradio-core/src/lib/io/microtune_eval_board_defs.h +++ b/gnuradio-core/src/lib/io/microtune_eval_board_defs.h @@ -9,19 +9,19 @@ /* * Copyright 2001 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/microtune_xxxx.cc b/gnuradio-core/src/lib/io/microtune_xxxx.cc index f9ce44b2b..3d55f534a 100644 --- a/gnuradio-core/src/lib/io/microtune_xxxx.cc +++ b/gnuradio-core/src/lib/io/microtune_xxxx.cc @@ -1,19 +1,19 @@ /* -*- c++-*- */ /* * Copyright 2001,2003,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -38,4 +38,4 @@ microtune_xxxx::set_RF_freq (double target_freq) return 0.0; } - + diff --git a/gnuradio-core/src/lib/io/microtune_xxxx.h b/gnuradio-core/src/lib/io/microtune_xxxx.h index 8b6ec25aa..b2646d39f 100644 --- a/gnuradio-core/src/lib/io/microtune_xxxx.h +++ b/gnuradio-core/src/lib/io/microtune_xxxx.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2003,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -47,7 +47,7 @@ public: * \returns true iff sucessful. */ virtual bool set_RF_freq (double freq, double *actual_freq) = 0; - + // returns actual freq or 0 if error (easier interface for SWIG) double set_RF_freq (double freq); @@ -55,7 +55,7 @@ public: * \returns true iff PLL is locked */ virtual bool pll_locked_p () = 0; - + /*! * \returns the output frequency (IF center freq) of the tuner in Hz. */ diff --git a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc index 14f2b8589..35600ff06 100644 --- a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc +++ b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -49,7 +49,7 @@ microtune_xxxx_eval_board::~microtune_xxxx_eval_board () //! is the eval board present? -bool +bool microtune_xxxx_eval_board::board_present_p () { bool result = true; @@ -73,7 +73,7 @@ microtune_xxxx_eval_board::board_present_p () * We're using a MAX518 8-bit 5V dual dac for setting the AGC's * ---------------------------------------------------------------- */ -void +void microtune_xxxx_eval_board::write_dac (int which, int value) { unsigned char cmd[2]; @@ -82,7 +82,7 @@ microtune_xxxx_eval_board::write_dac (int which, int value) d_i2c->write (AGC_DAC_I2C_ADDR, cmd, sizeof (cmd)); } -void +void microtune_xxxx_eval_board::write_both_dacs (int value0, int value1) { unsigned char cmd[4]; @@ -111,7 +111,7 @@ microtune_xxxx_eval_board::set_RF_AGC_voltage (float volts) write_dac (0, scale_volts (volts)); } -void +void microtune_xxxx_eval_board::set_IF_AGC_voltage (float volts) { write_dac (1, scale_volts (volts)); @@ -124,7 +124,7 @@ microtune_xxxx_eval_board::set_RF_freq (double freq, double *actual_freq) { return d_tuner->set_RF_freq (freq, actual_freq); } - + double microtune_xxxx_eval_board::set_RF_freq (double freq) { diff --git a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.h b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.h index 08aa438c0..7fd784ade 100644 --- a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.h +++ b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.h @@ -1,19 +1,19 @@ /* -*- C++ -*- */ /* * Copyright 2001,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -70,7 +70,7 @@ public: * \returns true iff sucessful. */ bool set_RF_freq (double freq, double *actual_freq); - + // returns actual freq or 0 if error (easier interface for SWIG) double set_RF_freq (double freq); @@ -78,7 +78,7 @@ public: * \returns true iff PLL is locked */ bool pll_locked_p (); - + /*! * \returns the output frequency (IF center freq) of the tuner in Hz. */ @@ -88,7 +88,7 @@ public: private: void write_dac (int which, int value); void write_both_dacs (int val0, int val1); - + protected: ppio_sptr d_ppio; i2c_sptr d_i2c; diff --git a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.i b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.i index d6000ea08..8a8a59742 100644 --- a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.i +++ b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -50,7 +50,7 @@ public: * \returns true iff PLL is locked */ bool pll_locked_p (); - + /*! * \returns the output frequency (IF center freq) of the tuner in Hz. */ diff --git a/gnuradio-core/src/lib/io/ppio.cc b/gnuradio-core/src/lib/io/ppio.cc index 9f0ed62de..a5edc539c 100644 --- a/gnuradio-core/src/lib/io/ppio.cc +++ b/gnuradio-core/src/lib/io/ppio.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/ppio.h b/gnuradio-core/src/lib/io/ppio.h index f7d14d52e..d99f7bf79 100644 --- a/gnuradio-core/src/lib/io/ppio.h +++ b/gnuradio-core/src/lib/io/ppio.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -51,7 +51,7 @@ class GR_CORE_API ppio { }; /*! - * \brief Factory method. + * \brief Factory method. * * Split out from class to make life easier for SWIG */ diff --git a/gnuradio-core/src/lib/io/ppio.i b/gnuradio-core/src/lib/io/ppio.i index 8d9571e28..6b95dcf88 100644 --- a/gnuradio-core/src/lib/io/ppio.i +++ b/gnuradio-core/src/lib/io/ppio.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/ppio_ppdev.cc b/gnuradio-core/src/lib/io/ppio_ppdev.cc index 074de1aa1..f52845958 100644 --- a/gnuradio-core/src/lib/io/ppio_ppdev.cc +++ b/gnuradio-core/src/lib/io/ppio_ppdev.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2003,2004,2008 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -94,7 +94,7 @@ ppio_ppdev::~ppio_ppdev () } -void +void ppio_ppdev::write_data (unsigned char v) { if (ioctl (d_fd, PPWDATA, &v) != 0){ @@ -115,7 +115,7 @@ ppio_ppdev::read_data () return v; } -void +void ppio_ppdev::write_control (unsigned char v) { unsigned char ctrl = v ^ CP_ACTIVE_LOW_BITS; @@ -198,7 +198,7 @@ ppio_ppdev::~ppio_ppdev () } -void +void ppio_ppdev::write_data (unsigned char v) { if (ioctl (d_fd, PPISDATA, &v) != 0){ @@ -219,7 +219,7 @@ ppio_ppdev::read_data () return v; } -void +void ppio_ppdev::write_control (unsigned char v) { unsigned char ctrl = v ^ CP_ACTIVE_LOW_BITS; @@ -274,7 +274,7 @@ ppio_ppdev::~ppio_ppdev () { } -void +void ppio_ppdev::write_data (unsigned char v) { } @@ -285,7 +285,7 @@ ppio_ppdev::read_data () return 0; } -void +void ppio_ppdev::write_control (unsigned char v) { } diff --git a/gnuradio-core/src/lib/io/ppio_ppdev.h b/gnuradio-core/src/lib/io/ppio_ppdev.h index 5d082d784..1f86d7e04 100644 --- a/gnuradio-core/src/lib/io/ppio_ppdev.h +++ b/gnuradio-core/src/lib/io/ppio_ppdev.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gnuradio-core/src/lib/io/sdr_1000.cc b/gnuradio-core/src/lib/io/sdr_1000.cc index df26237ef..a8c2555e0 100644 --- a/gnuradio-core/src/lib/io/sdr_1000.cc +++ b/gnuradio-core/src/lib/io/sdr_1000.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -49,13 +49,13 @@ sdr_1000_base::reset () write_latch (L_DDS1, 0x00, 0xff); } - + void sdr_1000_base::write_latch (int which, int value, int mask) { if (!(0 <= which && which <= 3)) return; - + d_ppio->lock (); d_shadow[which] = (d_shadow[which] & ~mask) | (value & mask); d_ppio->write_data (d_shadow[which]); diff --git a/gnuradio-core/src/lib/io/sdr_1000.h b/gnuradio-core/src/lib/io/sdr_1000.h index 6647fbba5..c00608a3a 100644 --- a/gnuradio-core/src/lib/io/sdr_1000.h +++ b/gnuradio-core/src/lib/io/sdr_1000.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003,2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -40,12 +40,12 @@ enum { L_EXT = 0, L_BAND = 1, L_DDS0 = 2, L_DDS1 = 3 }; class GR_CORE_API sdr_1000_base { ppio_sptr d_ppio; int d_shadow[4]; // shadow latches - + public: sdr_1000_base (int which_pp); ~sdr_1000_base (); - + void reset (); void write_latch (int which, int value, int mask); }; diff --git a/gnuradio-core/src/lib/io/sdr_1000.i b/gnuradio-core/src/lib/io/sdr_1000.i index fbdef85e5..c9b1ef560 100644 --- a/gnuradio-core/src/lib/io/sdr_1000.i +++ b/gnuradio-core/src/lib/io/sdr_1000.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio 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. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, |