projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New standalone firmware, burn_dbsrx_eeprom, that burns new dbid into
[debian/gnuradio]
/
gr-usrp
/
src
/
usrp.i
diff --git
a/gr-usrp/src/usrp.i
b/gr-usrp/src/usrp.i
index 40fa471b01c9c1da3433976c99f5006663ff2f0d..f5841985dda59543b78f68621f8de8aa75f61bec 100644
(file)
--- a/
gr-usrp/src/usrp.i
+++ b/
gr-usrp/src/usrp.i
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008
,2009
Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
*
* This file is part of GNU Radio
*
@@
-20,14
+20,9
@@
* Boston, MA 02110-1301, USA.
*/
* Boston, MA 02110-1301, USA.
*/
-%feature("autodoc", "1"); // generate python docstrings
-
-%include "exception.i"
-%import "gnuradio.i" // the common stuff
+%include "gnuradio.i" // the common stuff
%{
%{
-#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix
-#include <stdexcept>
#include <vector>
%}
#include <vector>
%}
@@
-53,14
+48,18
@@
def __selected_subdev(self, subdev_spec):
return self._real_selected_subdev(ss)
# Allow subdev_spec to be tuple
return self._real_selected_subdev(ss)
# Allow subdev_spec to be tuple
-def __determine_tx_mux_value(self, subdev_spec):
+def __determine_tx_mux_value(self, subdev_spec
, subdev_spec_=None
):
ss = usrp_subdev_spec(subdev_spec[0], subdev_spec[1])
ss = usrp_subdev_spec(subdev_spec[0], subdev_spec[1])
- return self._real_determine_tx_mux_value(ss)
+ if subdev_spec_ is None: return self._real_determine_tx_mux_value(ss)
+ ss_ = usrp_subdev_spec(subdev_spec_[0], subdev_spec_[1])
+ return self._real_determine_tx_mux_value(ss, ss_)
# Allow subdev_spec to be tuple
# Allow subdev_spec to be tuple
-def __determine_rx_mux_value(self, subdev_spec):
+def __determine_rx_mux_value(self, subdev_spec
, subdev_spec_=None
):
ss = usrp_subdev_spec(subdev_spec[0], subdev_spec[1])
ss = usrp_subdev_spec(subdev_spec[0], subdev_spec[1])
- return self._real_determine_rx_mux_value(ss)
+ if subdev_spec_ is None: return self._real_determine_rx_mux_value(ss)
+ ss_ = usrp_subdev_spec(subdev_spec_[0], subdev_spec_[1])
+ return self._real_determine_rx_mux_value(ss, ss_)
# Allow subdev_spec to be tuple
def __pick_subdev(self, candidates=[]):
# Allow subdev_spec to be tuple
def __pick_subdev(self, candidates=[]):
@@
-91,12
+90,12
@@
def tune(u, chan, subdev, target_freq):
return u.tune(chan, subdev, target_freq)
# Allow to be called as free function
return u.tune(chan, subdev, target_freq)
# Allow to be called as free function
-def determine_tx_mux_value(u, subdev_spec):
- return u.determine_tx_mux_value(subdev_spec)
+def determine_tx_mux_value(u, subdev_spec
, subdev_spec_=None
):
+ return u.determine_tx_mux_value(subdev_spec
, subdev_spec_
)
# Allow to be called as free function
# Allow to be called as free function
-def determine_rx_mux_value(u, subdev_spec):
- return u.determine_rx_mux_value(subdev_spec)
+def determine_rx_mux_value(u, subdev_spec
, subdev_spec_=None
):
+ return u.determine_rx_mux_value(subdev_spec
, subdev_spec_
)
# Allow to be called as free function
def selected_subdev(u, subdev_spec):
# Allow to be called as free function
def selected_subdev(u, subdev_spec):