diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-09-24 00:07:57 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-09-24 00:07:57 +0000 |
| commit | 8979083cd32897b7fc258d071b17d19fae0cc9d1 (patch) | |
| tree | 0e3b53d8bf3dc05d4511595eebe24655eeda9680 /usrp2/host/lib/usrp2_impl.cc | |
| parent | 801b22a99512ed3dfd2b92bfc597bfc3451ccbc9 (diff) | |
Renamed identifiers for consistency: s/complex_float/32fc/ s/complex_16/16sc/.
Merged eb/u2-wip -r9645:9646 into trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9647 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2/host/lib/usrp2_impl.cc')
| -rw-r--r-- | usrp2/host/lib/usrp2_impl.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usrp2/host/lib/usrp2_impl.cc b/usrp2/host/lib/usrp2_impl.cc index eb52242f88..4b64d06c36 100644 --- a/usrp2/host/lib/usrp2_impl.cc +++ b/usrp2/host/lib/usrp2_impl.cc @@ -773,21 +773,21 @@ namespace usrp2 { } bool - usrp2::impl::tx_complex_float(unsigned int channel, - const std::complex<float> *samples, - size_t nsamples, - const tx_metadata *metadata) + usrp2::impl::tx_32fc(unsigned int channel, + const std::complex<float> *samples, + size_t nsamples, + const tx_metadata *metadata) { uint32_t items[nsamples]; - copy_host_complex_float_to_u2_complex_16(nsamples, samples, items); + copy_host_32fc_to_u2_16sc(nsamples, samples, items); return tx_raw(channel, items, nsamples, metadata); } bool - usrp2::impl::tx_complex_int16(unsigned int channel, - const std::complex<int16_t> *samples, - size_t nsamples, - const tx_metadata *metadata) + usrp2::impl::tx_16sc(unsigned int channel, + const std::complex<int16_t> *samples, + size_t nsamples, + const tx_metadata *metadata) { #ifdef WORDS_BIGENDIAN @@ -800,7 +800,7 @@ namespace usrp2 { #else uint32_t items[nsamples]; - copy_host_complex_16_to_u2_complex_16(nsamples, samples, items); + copy_host_16sc_to_u2_16sc(nsamples, samples, items); return tx_raw(channel, items, nsamples, metadata); #endif |