[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9646 - in gnuradio/branches/developers/eb/u2-wip: gr-
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r9646 - in gnuradio/branches/developers/eb/u2-wip: gr-usrp2/src usrp2/host/apps usrp2/host/include/usrp2 usrp2/host/lib |
|
Date: |
Tue, 23 Sep 2008 18:04:31 -0600 (MDT) |
Author: eb
Date: 2008-09-23 18:04:30 -0600 (Tue, 23 Sep 2008)
New Revision: 9646
Modified:
gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/rx_16sc_handler.h
gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/rx_32fc_handler.h
gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/usrp2_sink_16sc.cc
gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/usrp2_sink_32fc.cc
gnuradio/branches/developers/eb/u2-wip/usrp2/host/apps/rx_streaming_samples.cc
gnuradio/branches/developers/eb/u2-wip/usrp2/host/apps/tx_samples.cc
gnuradio/branches/developers/eb/u2-wip/usrp2/host/include/usrp2/copiers.h
gnuradio/branches/developers/eb/u2-wip/usrp2/host/include/usrp2/usrp2.h
gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/copiers.cc
gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2.cc
gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2_impl.cc
gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2_impl.h
Log:
Renamed identifiers for consistency: s/complex_float/32fc/ s/complex_16/16sc/
Modified: gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/rx_16sc_handler.h
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/rx_16sc_handler.h
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/rx_16sc_handler.h
2008-09-24 00:04:30 UTC (rev 9646)
@@ -56,7 +56,7 @@
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
Modified: gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/rx_32fc_handler.h
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/rx_32fc_handler.h
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/rx_32fc_handler.h
2008-09-24 00:04:30 UTC (rev 9646)
@@ -57,7 +57,7 @@
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
Modified: gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/usrp2_sink_16sc.cc
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/usrp2_sink_16sc.cc
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/usrp2_sink_16sc.cc
2008-09-24 00:04:30 UTC (rev 9646)
@@ -62,8 +62,8 @@
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;
Modified: gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/usrp2_sink_32fc.cc
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/usrp2_sink_32fc.cc
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/gr-usrp2/src/usrp2_sink_32fc.cc
2008-09-24 00:04:30 UTC (rev 9646)
@@ -62,10 +62,10 @@
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;
}
Modified:
gnuradio/branches/developers/eb/u2-wip/usrp2/host/apps/rx_streaming_samples.cc
===================================================================
---
gnuradio/branches/developers/eb/u2-wip/usrp2/host/apps/rx_streaming_samples.cc
2008-09-23 21:59:23 UTC (rev 9645)
+++
gnuradio/branches/developers/eb/u2-wip/usrp2/host/apps/rx_streaming_samples.cc
2008-09-24 00:04:30 UTC (rev 9646)
@@ -62,14 +62,14 @@
// FIXME make this a template
-class complex_16_file_writer : public usrp2::rx_nop_handler
+class file_writer_16sc : public usrp2::rx_nop_handler
{
FILE *d_fp;
std::string d_filename;
public:
- complex_16_file_writer(const std::string &filename, uint64_t max_samples)
+ file_writer_16sc(const std::string &filename, uint64_t max_samples)
: usrp2::rx_nop_handler(max_samples), d_filename(filename)
{
d_fp = fopen(filename.c_str(), "wb");
@@ -79,7 +79,7 @@
}
}
- ~complex_16_file_writer();
+ ~file_writer_16sc();
bool
operator()(const uint32_t *items, size_t nitems, const usrp2::rx_metadata
*metadata)
@@ -89,7 +89,7 @@
size_t host_nitems = nitems;
std::complex<int16_t> host_items[host_nitems];
- usrp2::copy_u2_complex_16_to_host_complex_16(nitems, items, host_items);
+ usrp2::copy_u2_16sc_to_host_16sc(nitems, items, host_items);
size_t n = 0;
while (n < host_nitems){
@@ -107,21 +107,21 @@
}
};
-complex_16_file_writer::~complex_16_file_writer()
+file_writer_16sc::~file_writer_16sc()
{
fclose(d_fp);
}
// ------------------------------------------------------------------------
-class complex_float_file_writer : public usrp2::rx_nop_handler
+class file_writer_32fc : public usrp2::rx_nop_handler
{
FILE *d_fp;
std::string d_filename;
public:
- complex_float_file_writer(const std::string &filename, uint64_t max_samples)
+ file_writer_32fc(const std::string &filename, uint64_t max_samples)
: usrp2::rx_nop_handler(max_samples), d_filename(filename)
{
d_fp = fopen(filename.c_str(), "wb");
@@ -131,7 +131,7 @@
}
}
- ~complex_float_file_writer();
+ ~file_writer_32fc();
bool
operator()(const uint32_t *items, size_t nitems, const usrp2::rx_metadata
*metadata)
@@ -141,7 +141,7 @@
size_t host_nitems = nitems;
std::complex<float> host_items[host_nitems];
- usrp2::copy_u2_complex_16_to_host_complex_float(nitems, items, host_items);
+ usrp2::copy_u2_16sc_to_host_32fc(nitems, items, host_items);
size_t n = 0;
while (n < host_nitems){
@@ -159,7 +159,7 @@
}
};
-complex_float_file_writer::~complex_float_file_writer()
+file_writer_32fc::~file_writer_32fc()
{
fclose(d_fp);
}
@@ -278,9 +278,9 @@
if (output_filename){
if (output_shorts)
- handler = usrp2::rx_nop_handler::sptr(new
complex_16_file_writer(output_filename, nsamples));
+ handler = usrp2::rx_nop_handler::sptr(new
file_writer_16sc(output_filename, nsamples));
else
- handler = usrp2::rx_nop_handler::sptr(new
complex_float_file_writer(output_filename, nsamples));
+ handler = usrp2::rx_nop_handler::sptr(new
file_writer_32fc(output_filename, nsamples));
}
else
handler = usrp2::rx_nop_handler::sptr(new usrp2::rx_nop_handler(nsamples));
Modified: gnuradio/branches/developers/eb/u2-wip/usrp2/host/apps/tx_samples.cc
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/usrp2/host/apps/tx_samples.cc
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/usrp2/host/apps/tx_samples.cc
2008-09-24 00:04:30 UTC (rev 9646)
@@ -253,7 +253,7 @@
// FIXME if r < 9, pad to 9 for minimum packet size constraint
- if (!u2->tx_complex_int16(0, samples, r, &md)){
+ if (!u2->tx_16sc(0, samples, r, &md)){
fprintf(stderr, "tx_complex_int16 failed\n");
break;
}
Modified:
gnuradio/branches/developers/eb/u2-wip/usrp2/host/include/usrp2/copiers.h
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/usrp2/host/include/usrp2/copiers.h
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/usrp2/host/include/usrp2/copiers.h
2008-09-24 00:04:30 UTC (rev 9646)
@@ -33,14 +33,14 @@
*/
void
- copy_u2_complex_16_to_host_complex_16(size_t nitems,
- const uint32_t *items,
- std::complex<int16_t> *host_items);
+ copy_u2_16sc_to_host_16sc(size_t nitems,
+ const uint32_t *items,
+ std::complex<int16_t> *host_items);
void
- copy_u2_complex_16_to_host_complex_float(size_t nitems,
- const uint32_t *items,
- std::complex<float> *host_items);
+ copy_u2_16sc_to_host_32fc(size_t nitems,
+ const uint32_t *items,
+ std::complex<float> *host_items);
/*
* ----------------------------------------------------------------
@@ -49,14 +49,14 @@
*/
void
- copy_host_complex_16_to_u2_complex_16(size_t nitems,
- const std::complex<int16_t> *host_items,
- uint32_t *items);
+ copy_host_16sc_to_u2_16sc(size_t nitems,
+ const std::complex<int16_t> *host_items,
+ uint32_t *items);
void
- copy_host_complex_float_to_u2_complex_16(size_t nitems,
- const std::complex<float>
*host_items,
- uint32_t *items);
+ copy_host_32fc_to_u2_16sc(size_t nitems,
+ const std::complex<float> *host_items,
+ uint32_t *items);
}
Modified:
gnuradio/branches/developers/eb/u2-wip/usrp2/host/include/usrp2/usrp2.h
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/usrp2/host/include/usrp2/usrp2.h
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/usrp2/host/include/usrp2/usrp2.h
2008-09-24 00:04:30 UTC (rev 9646)
@@ -205,14 +205,18 @@
* \brief transmit complex<float> samples to USRP2
*
* \param channel specifies the channel to send them to
- * \param samples are the samples to transmit
+ * \param samples are the samples to transmit. They should be in the
range [-1.0, +1.0]
* \param nsamples is the number of samples to transmit
* \param metadata provides the timestamp and flags
+ *
+ * The complex<float> samples are converted to the appropriate
+ * "on the wire" representation, depending on the current USRP2
+ * configuration. Typically, this is big-endian 16-bit I & Q.
*/
- bool tx_complex_float(unsigned int channel,
- const std::complex<float> *samples,
- size_t nsamples,
- const tx_metadata *metadata);
+ bool tx_32fc(unsigned int channel,
+ const std::complex<float> *samples,
+ size_t nsamples,
+ const tx_metadata *metadata);
/*!
* \brief transmit complex<int16_t> samples to USRP2
@@ -221,11 +225,15 @@
* \param samples are the samples to transmit
* \param nsamples is the number of samples to transmit
* \param metadata provides the timestamp and flags
+ *
+ * The complex<int16_t> samples are converted to the appropriate
+ * "on the wire" representation, depending on the current USRP2
+ * configuration. Typically, this is big-endian 16-bit I & Q.
*/
- bool tx_complex_int16(unsigned int channel,
- const std::complex<int16_t> *samples,
- size_t nsamples,
- const tx_metadata *metadata);
+ bool tx_16sc(unsigned int channel,
+ const std::complex<int16_t> *samples,
+ size_t nsamples,
+ const tx_metadata *metadata);
/*!
* \brief transmit raw uint32_t data items to USRP2
@@ -233,7 +241,7 @@
* The caller is responsible for ensuring that the items are
* formatted appropriately for the USRP2 and its configuration.
* This method is used primarily by the system itself. Users
- * should call tx_complex_float or tx_complex_16 instead.
+ * should call tx_32fc or tx_16sc instead.
*
* \param channel specifies the channel to send them to
* \param items are the data items to transmit
Modified: gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/copiers.cc
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/copiers.cc
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/copiers.cc
2008-09-24 00:04:30 UTC (rev 9646)
@@ -45,9 +45,9 @@
* ----------------------------------------------------------------
*/
void
- copy_u2_complex_16_to_host_complex_16(size_t nitems,
- const uint32_t *items,
- std::complex<int16_t> *host_items)
+ copy_u2_16sc_to_host_16sc(size_t nitems,
+ const uint32_t *items,
+ std::complex<int16_t> *host_items)
{
#ifdef WORDS_BIGENDIAN
@@ -72,9 +72,9 @@
* endian swap if required and map [-32768, 32767] -> [1.0, +1.0)
*/
void
- copy_u2_complex_16_to_host_complex_float(size_t nitems,
- const uint32_t *items,
- std::complex<float> *host_items)
+ copy_u2_16sc_to_host_32fc(size_t nitems,
+ const uint32_t *items,
+ std::complex<float> *host_items)
{
for (size_t i = 0; i < nitems; i++){
uint32_t t = ntohx(items[i]);
@@ -90,9 +90,9 @@
* ----------------------------------------------------------------
*/
void
- copy_host_complex_16_to_u2_complex_16(size_t nitems,
- const std::complex<int16_t> *host_items,
- uint32_t *items)
+ copy_host_16sc_to_u2_16sc(size_t nitems,
+ const std::complex<int16_t> *host_items,
+ uint32_t *items)
{
#ifdef WORDS_BIGENDIAN
@@ -118,9 +118,9 @@
}
void
- copy_host_complex_float_to_u2_complex_16(size_t nitems,
- const std::complex<float>
*host_items,
- uint32_t *items)
+ copy_host_32fc_to_u2_16sc(size_t nitems,
+ const std::complex<float> *host_items,
+ uint32_t *items)
{
for (size_t i = 0; i < nitems; i++){
int16_t re = clip_and_scale(host_items[i].real());
Modified: gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2.cc
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2.cc
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2.cc
2008-09-24 00:04:30 UTC (rev 9646)
@@ -250,21 +250,21 @@
}
bool
- usrp2::tx_complex_float(unsigned int channel,
- const std::complex<float> *samples,
- size_t nsamples,
- const tx_metadata *metadata)
+ usrp2::tx_32fc(unsigned int channel,
+ const std::complex<float> *samples,
+ size_t nsamples,
+ const tx_metadata *metadata)
{
- return d_impl->tx_complex_float(channel, samples, nsamples, metadata);
+ return d_impl->tx_32fc(channel, samples, nsamples, metadata);
}
bool
- usrp2::tx_complex_int16(unsigned int channel,
- const std::complex<int16_t> *samples,
- size_t nsamples,
- const tx_metadata *metadata)
+ usrp2::tx_16sc(unsigned int channel,
+ const std::complex<int16_t> *samples,
+ size_t nsamples,
+ const tx_metadata *metadata)
{
- return d_impl->tx_complex_int16(channel, samples, nsamples, metadata);
+ return d_impl->tx_16sc(channel, samples, nsamples, metadata);
}
bool
Modified: gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2_impl.cc
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2_impl.cc
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2_impl.cc
2008-09-24 00:04:30 UTC (rev 9646)
@@ -773,21 +773,21 @@
}
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 @@
#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
Modified: gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2_impl.h
===================================================================
--- gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2_impl.h
2008-09-23 21:59:23 UTC (rev 9645)
+++ gnuradio/branches/developers/eb/u2-wip/usrp2/host/lib/usrp2_impl.h
2008-09-24 00:04:30 UTC (rev 9646)
@@ -112,15 +112,15 @@
bool set_tx_interp(int interpolation_factor);
bool set_tx_scale_iq(int scale_i, int scale_q);
- bool tx_complex_float(unsigned int channel,
- const std::complex<float> *samples,
- size_t nsamples,
- const tx_metadata *metadata);
+ bool tx_32fc(unsigned int channel,
+ const std::complex<float> *samples,
+ size_t nsamples,
+ const tx_metadata *metadata);
- bool tx_complex_int16(unsigned int channel,
- const std::complex<int16_t> *samples,
- size_t nsamples,
- const tx_metadata *metadata);
+ bool tx_16sc(unsigned int channel,
+ const std::complex<int16_t> *samples,
+ size_t nsamples,
+ const tx_metadata *metadata);
bool tx_raw(unsigned int channel,
const uint32_t *items,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9646 - in gnuradio/branches/developers/eb/u2-wip: gr-usrp2/src usrp2/host/apps usrp2/host/include/usrp2 usrp2/host/lib,
eb <=