From 792894c228fc38e7ff4b8cfa48ba101ccc950cd4 Mon Sep 17 00:00:00 2001 From: Jon Szymaniak Date: Fri, 23 Aug 2013 01:44:13 -0400 Subject: [PATCH] libbladeRF: [WIP] Changed API interfaces to use int instead of ssize_t. This is intended to simplify some portability issues, since an int type is sufficient in the few spots where we had ssize_t. We'll need to still add a ssize_t wrapper around the Windows [SSIZE_T](msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx#SSIZE_T) for use inside the library. --- .../libraries/libbladeRF/include/libbladeRF.h | 32 +++++++++---------- .../libraries/libbladeRF/src/backend/libusb.c | 17 +++++----- host/libraries/libbladeRF/src/backend/linux.c | 13 +++----- host/libraries/libbladeRF/src/bladerf.c | 32 ++++++++++++++----- host/libraries/libbladeRF/src/bladerf_priv.h | 4 +-- host/libraries/libbladeRF/src/file_ops.c | 1 + .../libbladeRF/tests/test_async/main.c | 3 +- 7 files changed, 58 insertions(+), 44 deletions(-) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index f4443f2b..bc5c8fc6 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -190,7 +190,7 @@ typedef void *(*bladerf_stream_cb)(struct bladerf *dev, * @return number of items in returned device list, or value from * \ref RETCODES list on failure */ -ssize_t bladerf_get_device_list(struct bladerf_devinfo **devices); + int bladerf_get_device_list(struct bladerf_devinfo **devices); /** * Free device list returned by bladerf_get_device_list() @@ -569,6 +569,15 @@ int bladerf_init_stream(struct bladerf_stream **stream, */ void bladerf_deinit_stream(struct bladerf_stream *stream); +/** + * + * @pre The provided bladerf_stream must have had its callback, + * samples_per_buffer, buffers_per_stream, and (optional) data fields + * initialized prior to this call + */ +int bladerf_stream(struct bladerf *dev, bladerf_module module, + bladerf_format format, struct bladerf_stream *stream); + /** * Transmit IQ samples * @@ -586,9 +595,9 @@ void bladerf_deinit_stream(struct bladerf_stream *stream); * @return number of samples sent on success, * value from \ref RETCODES list on failure */ -ssize_t bladerf_tx(struct bladerf *dev, bladerf_format format, - void *samples, size_t num_samples, - struct bladerf_metadata *metadata); +int bladerf_tx(struct bladerf *dev, bladerf_format format, + void *samples, int num_samples, + struct bladerf_metadata *metadata); /** * Receive IQ samples @@ -610,18 +619,9 @@ ssize_t bladerf_tx(struct bladerf *dev, bladerf_format format, * * @return number of samples read or value from \ref RETCODES list on failure */ -ssize_t bladerf_rx(struct bladerf *dev, bladerf_format format, - void *samples, size_t num_samples, - struct bladerf_metadata *metadata); - -/** - * - * @pre The provided bladerf_stream must have had its callback, - * samples_per_buffer, buffers_per_stream, and (optional) data fields - * initialized prior to this call - */ -int bladerf_stream(struct bladerf *dev, bladerf_module module, - bladerf_format format, struct bladerf_stream *stream); +int bladerf_rx(struct bladerf *dev, bladerf_format format, + void *samples, int num_samples, + struct bladerf_metadata *metadata); /** @} (End of FN_DATA) */ diff --git a/host/libraries/libbladeRF/src/backend/libusb.c b/host/libraries/libbladeRF/src/backend/libusb.c index 572e0d1f..d74c1ec5 100644 --- a/host/libraries/libbladeRF/src/backend/libusb.c +++ b/host/libraries/libbladeRF/src/backend/libusb.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include @@ -385,7 +385,7 @@ static int lusb_load_fpga(struct bladerf *dev, uint8_t *image, size_t image_size } /* Poll FPGA status to determine if programming was a success */ - wait_count = 10; + wait_count = 1000; status = 0; while (wait_count > 0 && status == 0) { @@ -395,7 +395,6 @@ static int lusb_load_fpga(struct bladerf *dev, uint8_t *image, size_t image_size } wait_count--; - usleep(10000); } /* Failed to determine if FPGA is loaded */ @@ -403,7 +402,7 @@ static int lusb_load_fpga(struct bladerf *dev, uint8_t *image, size_t image_size status = error_libusb2bladerf(status); bladerf_set_error(&dev->error, ETYPE_LIBBLADERF, status); return status; - } else if (wait_count == 0) { + } else if (wait_count == 0 && !status) { bladerf_set_error(&dev->error, ETYPE_LIBBLADERF, BLADERF_ERR_TIMEOUT); return BLADERF_ERR_TIMEOUT; } @@ -981,8 +980,8 @@ static int lusb_dac_write(struct bladerf *dev, uint16_t value) return status; } -static ssize_t lusb_tx(struct bladerf *dev, bladerf_format format, void *samples, - size_t n, struct bladerf_metadata *metadata) +static int lusb_tx(struct bladerf *dev, bladerf_format format, void *samples, + int n, struct bladerf_metadata *metadata) { size_t bytes_total, bytes_remaining; struct bladerf_lusb *lusb = (struct bladerf_lusb *)dev->backend; @@ -1017,10 +1016,10 @@ static ssize_t lusb_tx(struct bladerf *dev, bladerf_format format, void *samples return bytes_to_c16_samples(bytes_total - bytes_remaining); } -static ssize_t lusb_rx(struct bladerf *dev, bladerf_format format, void *samples, - size_t n, struct bladerf_metadata *metadata) +static int lusb_rx(struct bladerf *dev, bladerf_format format, void *samples, + int n, struct bladerf_metadata *metadata) { - ssize_t bytes_total, bytes_remaining = c16_samples_to_bytes(n); + int bytes_total, bytes_remaining = c16_samples_to_bytes(n); struct bladerf_lusb *lusb = (struct bladerf_lusb *)dev->backend; uint8_t *samples8 = (uint8_t *)samples; int transferred, status; diff --git a/host/libraries/libbladeRF/src/backend/linux.c b/host/libraries/libbladeRF/src/backend/linux.c index 879d004c..ba30f55a 100644 --- a/host/libraries/libbladeRF/src/backend/linux.c +++ b/host/libraries/libbladeRF/src/backend/linux.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -311,10 +312,8 @@ 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_tx(struct bladerf *dev, bladerf_format 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) +static int linux_tx(struct bladerf *dev, bladerf_format format, + void *samples, int n, struct bladerf_metadata *metadata) { ssize_t i, ret = 0; size_t bytes_written = 0; @@ -348,10 +347,8 @@ static ssize_t linux_tx(struct bladerf *dev, bladerf_format format, } } -/* TODO Fail out if n > ssize_t max, as we can't return that */ -static ssize_t linux_rx(struct bladerf *dev, bladerf_format 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) +static int linux_rx(struct bladerf *dev, bladerf_format format, + void *samples, int n, struct bladerf_metadata *metadata) { ssize_t i, ret = 0; size_t bytes_read = 0; diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 0dff9c8e..1563d564 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -18,9 +18,9 @@ * Device discovery & initialization/deinitialization *----------------------------------------------------------------------------*/ -ssize_t bladerf_get_device_list(struct bladerf_devinfo **devices) +int bladerf_get_device_list(struct bladerf_devinfo **devices) { - ssize_t ret; + int ret; size_t num_devices; struct bladerf_devinfo *devices_local; int status; @@ -30,8 +30,8 @@ ssize_t bladerf_get_device_list(struct bladerf_devinfo **devices) if (status < 0) { ret = status; } else { - assert(num_devices <= SSIZE_MAX); - ret = (ssize_t)num_devices; + assert(num_devices <= INT_MAX); + ret = num_devices; *devices = devices_local; } @@ -355,15 +355,25 @@ int bladerf_get_frequency(struct bladerf *dev, return rv; } -ssize_t bladerf_tx(struct bladerf *dev, bladerf_format format, void *samples, - size_t num_samples, struct bladerf_metadata *metadata) +int bladerf_tx(struct bladerf *dev, bladerf_format format, void *samples, + int num_samples, struct bladerf_metadata *metadata) { + if (num_samples < 1024 || num_samples % 1024 != 0) { + dbg_printf("num_samples must be multiples of 1024\n"); + return BLADERF_ERR_INVAL; + } + return dev->fn->tx(dev, format, samples, num_samples, metadata); } -ssize_t bladerf_rx(struct bladerf *dev, bladerf_format format, void *samples, - size_t num_samples, struct bladerf_metadata *metadata) +int bladerf_rx(struct bladerf *dev, bladerf_format format, void *samples, + int num_samples, struct bladerf_metadata *metadata) { + if (num_samples < 1024 || num_samples % 1024 != 0) { + dbg_printf("num_samples must be multiples of 1024\n"); + return BLADERF_ERR_INVAL; + } + return dev->fn->rx(dev, format, samples, num_samples, metadata); } @@ -384,6 +394,12 @@ int bladerf_init_stream(struct bladerf_stream **stream, int status = 0; if (num_transfers > num_buffers) { + dbg_printf("num_transfers must be <= num_buffers\n"); + return BLADERF_ERR_INVAL; + } + + if (samples_per_buffer < 1024 || samples_per_buffer% 1024 != 0) { + dbg_printf("samples_per_buffer must be multiples of 1024\n"); return BLADERF_ERR_INVAL; } diff --git a/host/libraries/libbladeRF/src/bladerf_priv.h b/host/libraries/libbladeRF/src/bladerf_priv.h index 1636b31f..7f504269 100644 --- a/host/libraries/libbladeRF/src/bladerf_priv.h +++ b/host/libraries/libbladeRF/src/bladerf_priv.h @@ -120,8 +120,8 @@ struct bladerf_fn { int (*dac_write)(struct bladerf *dev, uint16_t value); /* Sample stream */ - ssize_t (*rx)(struct bladerf *dev, bladerf_format format, void *samples, size_t n, struct bladerf_metadata *metadata); - ssize_t (*tx)(struct bladerf *dev, bladerf_format format, void *samples, size_t n, struct bladerf_metadata *metadata); + int (*rx)(struct bladerf *dev, bladerf_format format, void *samples, int n, struct bladerf_metadata *metadata); + int (*tx)(struct bladerf *dev, bladerf_format format, void *samples, int n, struct bladerf_metadata *metadata); int (*stream)(struct bladerf *dev, bladerf_module module, bladerf_format format, struct bladerf_stream *stream); diff --git a/host/libraries/libbladeRF/src/file_ops.c b/host/libraries/libbladeRF/src/file_ops.c index 1a00ec4c..d7b32e58 100644 --- a/host/libraries/libbladeRF/src/file_ops.c +++ b/host/libraries/libbladeRF/src/file_ops.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include diff --git a/host/libraries/libbladeRF/tests/test_async/main.c b/host/libraries/libbladeRF/tests/test_async/main.c index 763274d3..c26244b5 100644 --- a/host/libraries/libbladeRF/tests/test_async/main.c +++ b/host/libraries/libbladeRF/tests/test_async/main.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #ifndef DATA_SOURCE @@ -23,7 +24,7 @@ struct test_data unsigned int idx; /* The next one that needs to go out */ bladerf_module module; /* Direction */ FILE *fout; /* Output file (RX only) */ - ssize_t samples_left; /* Number of samples left */ + int samples_left; /* Number of samples left */ }; int str2int(const char *str, int min, int max, bool *ok)