diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-19 22:23:46 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-19 22:23:46 -0800 |
| commit | 9239878b0b81c3a368bf11cfc2fe48bfb05ff902 (patch) | |
| tree | f41a5e58eac89b35cb99537a0a0b64662384a9f2 /host/lib/usrp/usrp1/usrp1_impl.hpp | |
| parent | fc138381ee4bd8d191795230b7447071a85e1f28 (diff) | |
| parent | 7d918c5f6acc9a5d2c8ae03e2e67b403f7efd5ff (diff) | |
| download | uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.tar.gz uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.tar.bz2 uhd-9239878b0b81c3a368bf11cfc2fe48bfb05ff902.zip | |
Merge branch 'next'
Conflicts:
host/lib/usrp/usrp2/codec_impl.cpp
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.hpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp index ff4d40762..057725394 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.hpp +++ b/host/lib/usrp/usrp1/usrp1_impl.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010 Ettus Research LLC +// Copyright 2010-2011 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include "usrp1_ctrl.hpp" #include "clock_ctrl.hpp" #include "codec_ctrl.hpp" +#include "soft_time_ctrl.hpp" #include <uhd/device.hpp> #include <uhd/utils/pimpl.hpp> #include <uhd/types/dict.hpp> @@ -114,13 +115,17 @@ private: const uhd::usrp::dboard_id_t &rx_dboard_id ); + //soft time control emulation + uhd::usrp::soft_time_ctrl::sptr _soft_time_ctrl; + //interface to ioctls and file descriptor usrp1_iface::sptr _iface; //handle io stuff UHD_PIMPL_DECL(io_impl) _io_impl; void io_init(void); - void issue_stream_cmd(const uhd::stream_cmd_t &stream_cmd); + void rx_stream_on_off(bool); + void tx_stream_on_off(bool); void handle_overrun(size_t); //underrun and overrun poll intervals |