From: Bdale Garbee <bdale@gag.com>
Date: Mon, 10 Aug 2009 18:26:46 +0000 (-0600)
Subject: Merge commit 'upstream/3.2.2'
X-Git-Tag: debian/3.2.2-1~13
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=ec25c36bd231996ff0cc394ae4c5c037b54ff4ee;p=debian%2Fgnuradio

Merge commit 'upstream/3.2.2'

Conflicts:
	usrp/doc/Makefile.am
	usrp/doc/Makefile.in
---

ec25c36bd231996ff0cc394ae4c5c037b54ff4ee
diff --cc gnuradio-examples/python/digital/transmit_path.py
index 33a41870,9badcdc0..0567701b
--- a/gnuradio-examples/python/digital/transmit_path.py
+++ b/gnuradio-examples/python/digital/transmit_path.py
@@@ -1,6 -1,5 +1,6 @@@
 +#!/usr/bin/env python
  #
- # Copyright 2005,2006 Free Software Foundation, Inc.
+ # Copyright 2005, 2006, 2007 Free Software Foundation, Inc.
  # 
  # This file is part of GNU Radio
  # 
diff --cc gnuradio-examples/python/ofdm/fusb_options.py
index 00000000,153e06be..d537a2fe
mode 000000,100644..100644
--- a/gnuradio-examples/python/ofdm/fusb_options.py
+++ b/gnuradio-examples/python/ofdm/fusb_options.py
@@@ -1,0 -1,31 +1,32 @@@
++#!/usr/bin/env python
+ #
+ # 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 GNU Radio; see the file COPYING.  If not, write to
+ # the Free Software Foundation, Inc., 51 Franklin Street,
+ # Boston, MA 02110-1301, USA.
+ # 
+ 
+ def add_options(parser):
+     """
+     Add Fast USB specifc options to command line parser.
+     
+     @param parser: instance of OptionParser
+     """
+     parser.add_option("-B", "--fusb-block-size", type="int", default=0,
+                       help="specify fast usb block size [default=%default]")
+     parser.add_option("-N", "--fusb-nblocks", type="int", default=0,
+                       help="specify number of fast usb blocks [default=%default]")