diff options
Diffstat (limited to 'usrp2')
| -rwxr-xr-x | usrp2/host/apps/stdin_int32_fft.py | 4 | ||||
| -rw-r--r-- | usrp2/host/lib/usrp2_impl.cc | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/usrp2/host/apps/stdin_int32_fft.py b/usrp2/host/apps/stdin_int32_fft.py index 5391863a5..1596fa00d 100755 --- a/usrp2/host/apps/stdin_int32_fft.py +++ b/usrp2/host/apps/stdin_int32_fft.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc. +# Copyright 2004,2005,2007,2008,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -152,7 +152,7 @@ class app_top_block(stdgui2.std_top_block): if True: self.myform['freq'].set_value(target_freq) # update displayed value if not self.options.waterfall and not self.options.oscilloscope: - self.scope.win.set_baseband_freq(target_freq) + self.scope.set_baseband_freq(target_freq) return True return False diff --git a/usrp2/host/lib/usrp2_impl.cc b/usrp2/host/lib/usrp2_impl.cc index a74707634..b19c6ecf1 100644 --- a/usrp2/host/lib/usrp2_impl.cc +++ b/usrp2/host/lib/usrp2_impl.cc @@ -705,6 +705,7 @@ namespace usrp2 { cmd.eop.opcode = OP_EOP; cmd.eop.len = sizeof(cmd.eop); + d_dont_enqueue = false; bool success = false; pending_reply p(cmd.op.rid, &reply, sizeof(reply)); success = transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT); @@ -712,6 +713,8 @@ namespace usrp2 { if (success) d_channel_rings[channel] = ring_sptr(new ring(d_eth_buf->max_frames())); + else + d_dont_enqueue = true; return success; } @@ -759,6 +762,7 @@ namespace usrp2 { cmd.eop.opcode = OP_EOP; cmd.eop.len = sizeof(cmd.eop); + d_dont_enqueue = false; bool success = false; pending_reply p(cmd.sync_op.rid, &reply, sizeof(reply)); success = transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT); @@ -766,6 +770,8 @@ namespace usrp2 { if (success) d_channel_rings[channel] = ring_sptr(new ring(d_eth_buf->max_frames())); + else + d_dont_enqueue = true; return success; } |