From 8979083cd32897b7fc258d071b17d19fae0cc9d1 Mon Sep 17 00:00:00 2001
From: eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Wed, 24 Sep 2008 00:07:57 +0000
Subject: 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
---
gr-usrp2/src/rx_16sc_handler.h | 2 +-
gr-usrp2/src/rx_32fc_handler.h | 2 +-
gr-usrp2/src/usrp2_sink_16sc.cc | 4 ++--
gr-usrp2/src/usrp2_sink_32fc.cc | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'gr-usrp2/src')
diff --git a/gr-usrp2/src/rx_16sc_handler.h b/gr-usrp2/src/rx_16sc_handler.h
index cb83d860f8..d9a9e72e41 100644
--- a/gr-usrp2/src/rx_16sc_handler.h
+++ b/gr-usrp2/src/rx_16sc_handler.h
@@ -56,7 +56,7 @@ public:
printf("rx_16sc_handler: called with items=%zu ", nitems);
// Copy/reformat/endian swap USRP2 data to destination buffer
- usrp2::copy_u2_complex_16_to_host_complex_16(nitems, items, d_dest);
+ usrp2::copy_u2_16sc_to_host_16sc(nitems, items, d_dest);
d_dest += nitems;
// FIXME: do something with metadata
diff --git a/gr-usrp2/src/rx_32fc_handler.h b/gr-usrp2/src/rx_32fc_handler.h
index 875027968e..028dfadabd 100644
--- a/gr-usrp2/src/rx_32fc_handler.h
+++ b/gr-usrp2/src/rx_32fc_handler.h
@@ -57,7 +57,7 @@ public:
printf("rx_32fc_handler: called with items=%zu ", nitems);
// Copy/reformat/endian swap USRP2 data to destination buffer
- usrp2::copy_u2_complex_16_to_host_complex_float(nitems, items, d_dest);
+ usrp2::copy_u2_16sc_to_host_32fc(nitems, items, d_dest);
d_dest += nitems;
// FIXME: do something with metadata
diff --git a/gr-usrp2/src/usrp2_sink_16sc.cc b/gr-usrp2/src/usrp2_sink_16sc.cc
index fd87ea8689..bbd85563c8 100644
--- a/gr-usrp2/src/usrp2_sink_16sc.cc
+++ b/gr-usrp2/src/usrp2_sink_16sc.cc
@@ -62,8 +62,8 @@ usrp2_sink_16sc::work(int noutput_items,
metadata.send_now = 1;
metadata.start_of_burst = 1;
- bool ok = d_u2->tx_complex_int16(0, // FIXME: someday, streams will have channel numbers
- in, noutput_items, &metadata);
+ bool ok = d_u2->tx_16sc(0, // FIXME: someday, streams will have channel numbers
+ in, noutput_items, &metadata);
if (!ok)
std::cerr << "usrp2_sink_16sc: tx_complex_int16 failed" << std::endl;
diff --git a/gr-usrp2/src/usrp2_sink_32fc.cc b/gr-usrp2/src/usrp2_sink_32fc.cc
index acbba7abae..fbb56e7070 100644
--- a/gr-usrp2/src/usrp2_sink_32fc.cc
+++ b/gr-usrp2/src/usrp2_sink_32fc.cc
@@ -62,10 +62,10 @@ usrp2_sink_32fc::work(int noutput_items,
metadata.send_now = 1;
metadata.start_of_burst = 1;
- bool ok = d_u2->tx_complex_float(0, // FIXME: someday, streams will have channel numbers
- in, noutput_items, &metadata);
+ bool ok = d_u2->tx_32fc(0, // FIXME: someday, streams will have channel numbers
+ in, noutput_items, &metadata);
if (!ok)
- std::cerr << "usrp2_sink_32fc: tx_complex_float failed" << std::endl;
+ std::cerr << "usrp2_sink_32fc: tx_32fc failed" << std::endl;
return noutput_items;
}
--
cgit v1.2.3