cli+lib: TX/RX interface changes.
This commit is contained in:
parent
5e09b1fc20
commit
14657308d6
6 changed files with 158 additions and 101 deletions
|
|
@ -632,7 +632,13 @@ static void *rx_task(void *arg) {
|
|||
/* Flush out any old samples before recording any data */
|
||||
/*lib_ret = bladerf_read_c16(s->dev, rx->common.buff,
|
||||
rx->common.buff_size / 2);*/
|
||||
lib_ret = rx->common.buff_size/2 ;
|
||||
lib_ret = bladerf_rx(
|
||||
s->dev,
|
||||
FORMAT_SC16,
|
||||
rx->common.buff,
|
||||
rx->common.buff_size/2,
|
||||
NULL
|
||||
);
|
||||
if (lib_ret < 0) {
|
||||
set_last_error(&rx->common.error, ETYPE_BLADERF, lib_ret);
|
||||
state = RXTX_STATE_ERROR;
|
||||
|
|
@ -641,7 +647,13 @@ static void *rx_task(void *arg) {
|
|||
/*lib_ret = bladerf_read_c16(s->dev, rx->common.buff,
|
||||
rx->common.buff_size / 2);*/
|
||||
|
||||
lib_ret = rx->common.buff_size/2 ;
|
||||
lib_ret = bladerf_rx(
|
||||
s->dev,
|
||||
FORMAT_SC16,
|
||||
rx->common.buff,
|
||||
rx->common.buff_size/2,
|
||||
NULL
|
||||
);
|
||||
if (lib_ret < 0) {
|
||||
set_last_error(&rx->common.error, ETYPE_BLADERF, lib_ret);
|
||||
state = RXTX_STATE_ERROR;
|
||||
|
|
@ -758,7 +770,13 @@ static void *tx_task(void *arg) {
|
|||
tx->common.buff,
|
||||
tx->common.buff_size / 2);
|
||||
*/
|
||||
lib_ret = tx->common.buff_size/2 ;
|
||||
lib_ret = bladerf_tx(
|
||||
s->dev,
|
||||
FORMAT_SC16,
|
||||
tx->common.buff,
|
||||
tx->common.buff_size/2,
|
||||
NULL
|
||||
);
|
||||
if (lib_ret < 0) {
|
||||
set_last_error(&tx->common.error,
|
||||
ETYPE_BLADERF, lib_ret);
|
||||
|
|
|
|||
|
|
@ -470,22 +470,6 @@ int bladerf_get_frequency(struct bladerf *dev,
|
|||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* XXX REMOVE
|
||||
*
|
||||
* Send complex, packed 12-bit signed samples
|
||||
*
|
||||
* @param dev Device handle
|
||||
* @param samples Array of samples
|
||||
* @param n Number of sample (IQ pairs) to send
|
||||
*
|
||||
* @note Currently unimplemented. Always returns 0.
|
||||
*
|
||||
* @return number of samples sent or value from \ref RETCODES list on failure
|
||||
*/
|
||||
ssize_t bladerf_send_c12(struct bladerf *dev, int16_t *samples, size_t n);
|
||||
|
||||
|
||||
/**
|
||||
* XXX REMOVE
|
||||
*
|
||||
|
|
@ -509,15 +493,13 @@ ssize_t bladerf_send_c12(struct bladerf *dev, int16_t *samples, size_t n);
|
|||
* @return number of samples sent on success,
|
||||
* value from \ref RETCODES list on failure
|
||||
*/
|
||||
ssize_t bladerf_send_c16(struct bladerf *dev,
|
||||
/*ssize_t bladerf_send_c16(struct bladerf *dev,
|
||||
int16_t *samples, size_t num_samples);
|
||||
*/
|
||||
|
||||
|
||||
#if 0
|
||||
ssize_t bladerf_tx(struct bladerf *dev, bladerf_format_t format,
|
||||
void *samples, size_t num_samples,
|
||||
struct bladerf_metadata *metadata);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* XXX REMOVE
|
||||
|
|
@ -541,14 +523,13 @@ ssize_t bladerf_tx(struct bladerf *dev, bladerf_format_t format,
|
|||
*
|
||||
* @return number of samples read or value from \ref RETCODES list on failure
|
||||
*/
|
||||
ssize_t bladerf_read_c16(struct bladerf *dev,
|
||||
/*ssize_t bladerf_read_c16(struct bladerf *dev,
|
||||
int16_t *samples, size_t num_samples);
|
||||
*/
|
||||
|
||||
#if 0
|
||||
ssize_t bladerf_rx(struct bladerf *dev, bladerf_format_t format,
|
||||
void *samples, size_t num_samples,
|
||||
struct bladerf_metadata *metadata);
|
||||
#endif
|
||||
|
||||
/** @} (End of FN_DATA) */
|
||||
|
||||
|
|
@ -788,6 +769,34 @@ int bladerf_lms_write(struct bladerf *dev, uint8_t address, uint8_t val);
|
|||
*/
|
||||
#define BLADERF_GPIO_LMS_TX_ENABLE (1 << 2)
|
||||
|
||||
/**
|
||||
* Switch to use TX low band (300MHz - 1.5GHz)
|
||||
*
|
||||
* @note This is set using bladerf_set_frequency().
|
||||
*/
|
||||
#define BLADERF_GPIO_TX_LB_ENABLE (2 << 3)
|
||||
|
||||
/**
|
||||
* Switch to use TX high band (1.5GHz - 3.8GHz)
|
||||
*
|
||||
* @note This is set using bladerf_set_frequency().
|
||||
*/
|
||||
#define BLADERF_GPIO_TX_HB_ENABLE (1 << 3)
|
||||
|
||||
/**
|
||||
* Switch to use RX low band (300M - 1.5GHz)
|
||||
*
|
||||
* @note THis is set using bladerf_set_frequency().
|
||||
*/
|
||||
#define BLADERF_GPIO_RX_LB_ENABLE (2 << 5)
|
||||
|
||||
/**
|
||||
* Switch to use RX high band (1.5GHz - 3.8GHz)
|
||||
*
|
||||
* @note This is set using bladerf_set_frequency().
|
||||
*/
|
||||
#define BLADERF_GPIO_RX_HB_ENABLE (1 << 5)
|
||||
|
||||
/**
|
||||
* This GPIO bit configures the FPGA to use smaller DMA
|
||||
* transfers (256 cycles instead of 512). This is required
|
||||
|
|
|
|||
|
|
@ -543,77 +543,90 @@ static int lusb_dac_write(struct bladerf *dev, uint16_t value)
|
|||
return status;
|
||||
}
|
||||
|
||||
static ssize_t lusb_read_samples(struct bladerf *dev, int16_t *samples, size_t n)
|
||||
//static ssize_t lusb_read_samples(struct bladerf *dev, int16_t *samples, size_t n)
|
||||
//{
|
||||
// int status, transferred;
|
||||
// size_t bytes_read;
|
||||
// const size_t bytes_total = c16_samples_to_bytes(n);
|
||||
// struct bladerf_lusb *lusb = dev->backend;
|
||||
//
|
||||
// /* Unexpected overflow */
|
||||
// assert(bytes_total <= (size_t)INT_MAX);
|
||||
//
|
||||
// status = bytes_read = 0;
|
||||
// while (bytes_read < bytes_total) {
|
||||
//
|
||||
// transferred = 0;
|
||||
// status = libusb_bulk_transfer(lusb->handle, EP_IN(1),
|
||||
// (unsigned char *)(samples + bytes_read),
|
||||
// (int)(bytes_total - bytes_read),
|
||||
// &transferred,
|
||||
// BLADERF_LIBUSB_TIMEOUT_MS);
|
||||
//
|
||||
// if(status < 0) {
|
||||
// dbg_printf("error reading samples (%d): %s\n",
|
||||
// status, libusb_error_name(status));
|
||||
//
|
||||
// bladerf_set_error(&dev->error, ETYPE_BACKEND, status);
|
||||
// return BLADERF_ERR_IO;
|
||||
// } else {
|
||||
// assert(transferred > 0);
|
||||
// bytes_read += transferred;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// return bytes_to_c16_samples(bytes_read);
|
||||
//}
|
||||
|
||||
static ssize_t lusb_tx(struct bladerf *dev, bladerf_format_t format, void *samples,
|
||||
size_t n, struct bladerf_metadata *metadata)
|
||||
{
|
||||
int status, transferred;
|
||||
size_t bytes_read;
|
||||
const size_t bytes_total = c16_samples_to_bytes(n);
|
||||
struct bladerf_lusb *lusb = dev->backend;
|
||||
|
||||
/* Unexpected overflow */
|
||||
assert(bytes_total <= (size_t)INT_MAX);
|
||||
|
||||
status = bytes_read = 0;
|
||||
while (bytes_read < bytes_total) {
|
||||
|
||||
transferred = 0;
|
||||
status = libusb_bulk_transfer(lusb->handle, EP_IN(1),
|
||||
(unsigned char *)(samples + bytes_read),
|
||||
(int)(bytes_total - bytes_read),
|
||||
&transferred,
|
||||
BLADERF_LIBUSB_TIMEOUT_MS);
|
||||
|
||||
if(status < 0) {
|
||||
dbg_printf("error reading samples (%d): %s\n",
|
||||
status, libusb_error_name(status));
|
||||
|
||||
bladerf_set_error(&dev->error, ETYPE_BACKEND, status);
|
||||
return BLADERF_ERR_IO;
|
||||
} else {
|
||||
assert(transferred > 0);
|
||||
bytes_read += transferred;
|
||||
}
|
||||
}
|
||||
|
||||
return bytes_to_c16_samples(bytes_read);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t lusb_write_samples(struct bladerf *dev,
|
||||
int16_t *samples, size_t n)
|
||||
static ssize_t lusb_rx(struct bladerf *dev, bladerf_format_t format, void *samples,
|
||||
size_t n, struct bladerf_metadata *metadata)
|
||||
{
|
||||
int status, transferred;
|
||||
size_t bytes_written;
|
||||
const size_t bytes_total = c16_samples_to_bytes(n);
|
||||
struct bladerf_lusb *lusb = dev->backend;
|
||||
|
||||
/* Unexpected overflow */
|
||||
assert(bytes_total <= (size_t)INT_MAX);
|
||||
|
||||
status = bytes_written = 0;
|
||||
while (bytes_written < bytes_total) {
|
||||
|
||||
transferred = 0;
|
||||
status = libusb_bulk_transfer(lusb->handle, EP_OUT(1),
|
||||
(unsigned char *)(samples + bytes_written),
|
||||
(int)(bytes_total - bytes_written),
|
||||
&transferred,
|
||||
BLADERF_LIBUSB_TIMEOUT_MS);
|
||||
|
||||
if(status < 0) {
|
||||
dbg_printf("error writing samples (%d): %s\n",
|
||||
status, libusb_error_name(status));
|
||||
|
||||
bladerf_set_error(&dev->error, ETYPE_BACKEND, status);
|
||||
return BLADERF_ERR_IO;
|
||||
} else {
|
||||
assert(transferred > 0);
|
||||
bytes_written += transferred;
|
||||
}
|
||||
}
|
||||
|
||||
return bytes_to_c16_samples(bytes_written);
|
||||
return 0;
|
||||
}
|
||||
|
||||
//static ssize_t lusb_write_samples(struct bladerf *dev,
|
||||
// int16_t *samples, size_t n)
|
||||
//{
|
||||
// int status, transferred;
|
||||
// size_t bytes_written;
|
||||
// const size_t bytes_total = c16_samples_to_bytes(n);
|
||||
// struct bladerf_lusb *lusb = dev->backend;
|
||||
//
|
||||
// /* Unexpected overflow */
|
||||
// assert(bytes_total <= (size_t)INT_MAX);
|
||||
//
|
||||
// status = bytes_written = 0;
|
||||
// while (bytes_written < bytes_total) {
|
||||
//
|
||||
// transferred = 0;
|
||||
// status = libusb_bulk_transfer(lusb->handle, EP_OUT(1),
|
||||
// (unsigned char *)(samples + bytes_written),
|
||||
// (int)(bytes_total - bytes_written),
|
||||
// &transferred,
|
||||
// BLADERF_LIBUSB_TIMEOUT_MS);
|
||||
//
|
||||
// if(status < 0) {
|
||||
// dbg_printf("error writing samples (%d): %s\n",
|
||||
// status, libusb_error_name(status));
|
||||
//
|
||||
// bladerf_set_error(&dev->error, ETYPE_BACKEND, status);
|
||||
// return BLADERF_ERR_IO;
|
||||
// } else {
|
||||
// assert(transferred > 0);
|
||||
// bytes_written += transferred;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// return bytes_to_c16_samples(bytes_written);
|
||||
//}
|
||||
|
||||
const struct bladerf_fn bladerf_lusb_fn = {
|
||||
.open = lusb_open,
|
||||
.close = lusb_close,
|
||||
|
|
@ -638,7 +651,7 @@ const struct bladerf_fn bladerf_lusb_fn = {
|
|||
|
||||
.dac_write = lusb_dac_write,
|
||||
|
||||
.write_samples = lusb_write_samples,
|
||||
.read_samples = lusb_read_samples,
|
||||
.rx = lusb_rx,
|
||||
.tx = lusb_tx,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -358,16 +358,19 @@ static int linux_dac_write(struct bladerf *dev, uint16_t val)
|
|||
* Data transfer
|
||||
*----------------------------------------------------------------------------*/
|
||||
/* TODO Fail out if n > ssize_t max, as we can't return that. */
|
||||
static ssize_t linux_write_samples(struct bladerf *dev, int16_t *samples, size_t n)
|
||||
static ssize_t linux_tx(struct bladerf *dev, bladerf_format_t format,
|
||||
void *samples, size_t n, struct bladerf_metadata *metadata)
|
||||
//static ssize_t linux_write_samples(struct bladerf *dev, int16_t *samples, size_t n)
|
||||
{
|
||||
ssize_t i, ret = 0;
|
||||
size_t bytes_written = 0;
|
||||
const size_t bytes_total = c16_samples_to_bytes(n);
|
||||
struct bladerf_linux *backend = (struct bladerf_linux *)dev->backend;
|
||||
int8_t *samples8 = (int8_t *)samples;
|
||||
|
||||
while (bytes_written < bytes_total) {
|
||||
|
||||
i = write(backend->fd, samples + bytes_written, bytes_total - bytes_written);
|
||||
i = write(backend->fd, samples8 + bytes_written, bytes_total - bytes_written);
|
||||
|
||||
if (i < 0 && errno != EINTR) {
|
||||
int errno_val = errno;
|
||||
|
|
@ -392,16 +395,19 @@ static ssize_t linux_write_samples(struct bladerf *dev, int16_t *samples, size_t
|
|||
}
|
||||
|
||||
/* TODO Fail out if n > ssize_t max, as we can't return that */
|
||||
static ssize_t linux_read_samples(struct bladerf *dev, int16_t *samples, size_t n)
|
||||
static ssize_t linux_rx(struct bladerf *dev, bladerf_format_t format,
|
||||
void *samples, size_t n, struct bladerf_metadata *metadata)
|
||||
//static ssize_t linux_read_samples(struct bladerf *dev, int16_t *samples, size_t n)
|
||||
{
|
||||
ssize_t i, ret = 0;
|
||||
size_t bytes_read = 0;
|
||||
const size_t bytes_total = c16_samples_to_bytes(n);
|
||||
struct bladerf_linux *backend = (struct bladerf_linux *)dev->backend;
|
||||
int8_t *samples8 = (int8_t *)samples;
|
||||
|
||||
while (bytes_read < bytes_total) {
|
||||
|
||||
i = read(backend->fd, samples + bytes_read, bytes_total - bytes_read);
|
||||
i = read(backend->fd, samples8 + bytes_read, bytes_total - bytes_read);
|
||||
|
||||
if (i < 0 && errno != EINTR) {
|
||||
int errno_val = errno;
|
||||
|
|
@ -552,7 +558,7 @@ const struct bladerf_fn bladerf_linux_fn = {
|
|||
|
||||
.dac_write = linux_dac_write,
|
||||
|
||||
.write_samples = linux_write_samples,
|
||||
.read_samples = linux_read_samples
|
||||
.rx = linux_rx,
|
||||
.tx = linux_tx
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -498,6 +498,18 @@ int bladerf_get_frequency(struct bladerf *dev,
|
|||
return rv;
|
||||
}
|
||||
|
||||
ssize_t bladerf_tx(struct bladerf *dev, bladerf_format_t format, void *samples,
|
||||
size_t num_samples, struct bladerf_metadata *metadata)
|
||||
{
|
||||
return dev->fn->tx(dev, format, samples, num_samples, metadata);
|
||||
}
|
||||
|
||||
ssize_t bladerf_rx(struct bladerf *dev, bladerf_format_t format, void *samples,
|
||||
size_t num_samples, struct bladerf_metadata *metadata)
|
||||
{
|
||||
return dev->fn->rx(dev, format, samples, num_samples, metadata);
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------------------
|
||||
* Device Info
|
||||
*----------------------------------------------------------------------------*/
|
||||
|
|
|
|||
|
|
@ -72,9 +72,8 @@ struct bladerf_fn {
|
|||
int (*dac_write)(struct bladerf *dev, uint16_t value);
|
||||
|
||||
/* Sample stream */
|
||||
/* XXX: Add metadata struct? */
|
||||
ssize_t (*read_samples)(struct bladerf *dev, int16_t *samples, size_t n);
|
||||
ssize_t (*write_samples)(struct bladerf *dev, int16_t *samples, size_t n);
|
||||
ssize_t (*rx)(struct bladerf *dev, bladerf_format_t format, void *samples, size_t n, struct bladerf_metadata *metadata);
|
||||
ssize_t (*tx)(struct bladerf *dev, bladerf_format_t format, void *samples, size_t n, struct bladerf_metadata *metadata);
|
||||
|
||||
/* Gather statistics */
|
||||
int (*stats)(struct bladerf *dev, struct bladerf_stats *stats);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue