diff options
author | Martin Braun <martin.braun@ettus.com> | 2017-04-25 17:00:34 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:52 -0800 |
commit | 151ba5fb06dfdb6fcc46ccfdabf5f1e064236981 (patch) | |
tree | fa941b0589b09a22957e8b7e3966679748a9b202 /mpm/lib/xbar_iface.cpp | |
parent | 1262dfb3ccf5a9916685b3399587593174c6583e (diff) | |
download | uhd-151ba5fb06dfdb6fcc46ccfdabf5f1e064236981.tar.gz uhd-151ba5fb06dfdb6fcc46ccfdabf5f1e064236981.tar.bz2 uhd-151ba5fb06dfdb6fcc46ccfdabf5f1e064236981.zip |
mpm: Major refactoring
- Created clean interfaces for SPI and registers
- Severed most links to UHD
- Added a lockable class which allows exposing mutexes into Python
Diffstat (limited to 'mpm/lib/xbar_iface.cpp')
-rw-r--r-- | mpm/lib/xbar_iface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mpm/lib/xbar_iface.cpp b/mpm/lib/xbar_iface.cpp index 8bd89533c..4a86d9ba6 100644 --- a/mpm/lib/xbar_iface.cpp +++ b/mpm/lib/xbar_iface.cpp @@ -16,7 +16,7 @@ // #include "mpm/xbar_iface.hpp" -#include <uhd/exception.hpp> +#include <mpm/exception.hpp> #include <boost/format.hpp> #include <sys/ioctl.h> #include <fcntl.h> @@ -38,7 +38,7 @@ void xbar_iface::set_route(uint8_t dst_addr, uint8_t dst_port) { rfnoc_crossbar_cmd cmd = {.dest_addr = dst_addr, .dest_port = dst_port}; int err = ioctl(_fd, RFNCBWROUTIOC, &cmd); if (err < 0) { - throw uhd::os_error(str(boost::format("setting crossbar route failed! Error: %d") % err)); + throw mpm::os_error(str(boost::format("setting crossbar route failed! Error: %d") % err)); } } @@ -47,7 +47,7 @@ void xbar_iface::del_route(uint8_t dst_addr, uint8_t dst_port){ rfnoc_crossbar_cmd cmd = {.dest_addr = dst_addr, .dest_port = dst_port}; int err = ioctl(_fd, RFNCDELROUTIOC, &cmd); if (err < 0){ - throw uhd::os_error(str(boost::format("deleting crossbar route failed! Error: %d") % err)); + throw mpm::os_error(str(boost::format("deleting crossbar route failed! Error: %d") % err)); } } |