diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2011-01-17 22:51:14 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2011-01-17 22:51:14 -0800 |
| commit | 330a014dfc32b34a7fe5555d3ae2d87a25dc2466 (patch) | |
| tree | 5b744b8cdb13eda776028a046cf4e15dba0a668d /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | caa911aa270ee4aef7244f3159b9fd402a454069 (diff) | |
| download | uhd-330a014dfc32b34a7fe5555d3ae2d87a25dc2466.tar.gz uhd-330a014dfc32b34a7fe5555d3ae2d87a25dc2466.tar.bz2 uhd-330a014dfc32b34a7fe5555d3ae2d87a25dc2466.zip | |
next: generalized the GPS interface to any USRP device. just give it a function to write/read strings to UART.
not sure if i'm happy with the interface; maybe inheriting is cleaner. this works though.
gps interface for usrp2 is disabled right now in mboard_impl.
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index d0f5ecf37..ad95b2a4a 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -21,7 +21,7 @@ #include "usrp2_iface.hpp" #include "clock_ctrl.hpp" #include "codec_ctrl.hpp" -#include "gps_ctrl.hpp" +#include <uhd/usrp/gps_ctrl.hpp> #include <uhd/device.hpp> #include <uhd/utils/pimpl.hpp> #include <uhd/types/dict.hpp> @@ -106,7 +106,7 @@ private: usrp2_iface::sptr _iface; usrp2_clock_ctrl::sptr _clock_ctrl; usrp2_codec_ctrl::sptr _codec_ctrl; - usrp2_gps_ctrl::sptr _gps_ctrl; + gps_ctrl::sptr _gps_ctrl; //properties for this mboard void get(const wax::obj &, wax::obj &); |