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.
This commit is contained in:
Jon Szymaniak 2013-08-23 01:44:13 -04:00
commit 792894c228
7 changed files with 58 additions and 44 deletions

View file

@ -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) */

View file

@ -6,7 +6,7 @@
#include <stdio.h>
#include <stdbool.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
#include <bladeRF.h>
#include <libusb-1.0/libusb.h>
@ -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;

View file

@ -7,6 +7,7 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
#include <sys/time.h>
#include <dirent.h>
@ -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;

View file

@ -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;
}

View file

@ -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);

View file

@ -1,6 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <string.h>
#include <errno.h>
#include <libbladeRF.h>

View file

@ -5,6 +5,7 @@
#include <unistd.h>
#include <errno.h>
#include <limits.h>
#include <sys/types.h>
#include <libbladeRF.h>
#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)