diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-04 12:16:09 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-04 12:16:09 -0700 |
| commit | f2b560d5f8d19bf6bbd86802e03f061ecede78ec (patch) | |
| tree | 4e0d99411b2b1ebee38ef7bbe2fb26be87b39e05 /host/lib/usrp/usrp2/usrp2_impl.cpp | |
| parent | dbc65d928362b983d8f6113319db87841a5b159d (diff) | |
| download | uhd-f2b560d5f8d19bf6bbd86802e03f061ecede78ec.tar.gz uhd-f2b560d5f8d19bf6bbd86802e03f061ecede78ec.tar.bz2 uhd-f2b560d5f8d19bf6bbd86802e03f061ecede78ec.zip | |
Prepend usrp2 onto the helper classes in usrp2 impl to avoid symbol conflicts.
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index 1e6e02dd1..58f0696b5 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -148,9 +148,9 @@ usrp2_impl::usrp2_impl( //make a new interface for usrp2 stuff _iface = usrp2_iface::make(ctrl_transport); - _clock_ctrl = clock_ctrl::make(_iface); - _codec_ctrl = codec_ctrl::make(_iface); - _serdes_ctrl = serdes_ctrl::make(_iface); + _clock_ctrl = usrp2_clock_ctrl::make(_iface); + _codec_ctrl = usrp2_codec_ctrl::make(_iface); + _serdes_ctrl = usrp2_serdes_ctrl::make(_iface); //load the allowed decim/interp rates //_USRP2_RATES = range(4, 128+1, 1) + range(130, 256+1, 2) + range(260, 512+1, 4) |