libbladeRF: Fleshed out the TX callback.
Actually made the callback do some calling back in the TX direction. This looks like it keeps up in general. Also fixed up some of the test program so we don't try to transmit samples which are outside the buffer. Currently some memory issues when deallocating transfers.
This commit is contained in:
parent
f0d06b9ea3
commit
15c7a00a89
3 changed files with 39 additions and 14 deletions
|
|
@ -956,16 +956,20 @@ struct lusb_stream_data {
|
|||
struct bladerf_stream *stream ;
|
||||
} ;
|
||||
|
||||
|
||||
|
||||
static void lusb_tx_stream_cb(struct libusb_transfer *transfer)
|
||||
{
|
||||
struct lusb_stream_data *stream_data = (struct lusb_stream_data *)transfer->user_data;
|
||||
/* Check to see if the stream is still valid */
|
||||
if( stream_data->stream->state == BLADERF_STREAM_RUNNING ) {
|
||||
|
||||
/* Call user callback requesting more data to transmit */
|
||||
/* Call user callback requesting more data to transmit */
|
||||
stream_data->stream->cb( stream_data->dev, stream_data->stream, NULL, transfer->buffer, bytes_to_c16_samples(transfer->length) );
|
||||
|
||||
/* Check the stream to make sure we're still valid and submit transfer */
|
||||
libusb_submit_transfer(transfer) ;
|
||||
/* Check the stream to make sure we're still valid and submit transfer */
|
||||
if( stream_data->stream->state == BLADERF_STREAM_RUNNING ) {
|
||||
libusb_submit_transfer(transfer) ;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -1008,7 +1012,7 @@ static int lusb_allocate_transfers( struct lusb_stream_transfer **transfers,
|
|||
} else if ( ret ) {
|
||||
/* Clean up our partially allocated data */
|
||||
for ( i = 0; i < num_transfers; i++ ) {
|
||||
free( ret[i].transfer );
|
||||
libusb_free_transfer( ret[i].transfer );
|
||||
free( ret[i].buffer );
|
||||
}
|
||||
|
||||
|
|
@ -1021,7 +1025,7 @@ static int lusb_allocate_transfers( struct lusb_stream_transfer **transfers,
|
|||
static void lusb_deallocate_transfer( struct lusb_stream_transfer *transfer )
|
||||
{
|
||||
if ( transfer ) {
|
||||
free(transfer->transfer);
|
||||
libusb_free_transfer(transfer->transfer);
|
||||
free(transfer->buffer);
|
||||
|
||||
transfer->transfer = NULL;
|
||||
|
|
@ -1092,7 +1096,7 @@ static int lusb_tx_stream(struct bladerf *dev, bladerf_format_t format,
|
|||
case BLADERF_STREAM_ERRORED:
|
||||
freed_transfers = 0 ;
|
||||
for( i = 0 ; i < stream->buffers_per_stream ; i++ ) {
|
||||
if( transfers[i].transfer->status != LIBUSB_TRANSFER_CANCELLED ) {
|
||||
if( transfers[i].transfer->status != LIBUSB_TRANSFER_COMPLETED ) {
|
||||
libusb_cancel_transfer( transfers[i].transfer );
|
||||
} else if( lusb_transfer_is_allocated( &transfers[i] ) ) {
|
||||
/* Deallocate transfer data and buffer */
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ size_t c16_samples_to_bytes(size_t n_samples)
|
|||
|
||||
int bladerf_init_device(struct bladerf *dev)
|
||||
{
|
||||
unsigned int actual ;
|
||||
|
||||
/* Set the GPIO pins to enable the LMS and select the low band */
|
||||
bladerf_gpio_write( dev, 0x51 );
|
||||
|
||||
|
|
@ -60,6 +62,18 @@ int bladerf_init_device(struct bladerf *dev)
|
|||
/* FPGA workaround: Set IQ polarity for RX */
|
||||
bladerf_lms_write( dev, 0x5a, 0xa0 );
|
||||
|
||||
/* Set a default saplerate */
|
||||
bladerf_set_sample_rate( dev, TX, 1000000, &actual );
|
||||
bladerf_set_sample_rate( dev, RX, 1000000, &actual );
|
||||
|
||||
/* Enable TX and RX */
|
||||
bladerf_enable_module( dev, TX, true );
|
||||
bladerf_enable_module( dev, RX, true );
|
||||
|
||||
/* Set a default frequency of 1GHz */
|
||||
bladerf_set_frequency( dev, TX, 1000000000 );
|
||||
bladerf_set_frequency( dev, RX, 1000000000 );
|
||||
|
||||
/* TODO: Read this return from the SPI calls */
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@ void tx_callback(struct bladerf *dev, struct bladerf_stream *stream,
|
|||
if (shutdown) {
|
||||
stream->state = BLADERF_STREAM_CANCELLING;
|
||||
} else {
|
||||
memcpy(samples, &my_data->data[my_data->idx], n_bytes);
|
||||
my_data->idx += n_bytes;
|
||||
|
||||
if (my_data->idx > my_data->size) {
|
||||
if (my_data->idx >= my_data->size) {
|
||||
my_data->idx = 0;
|
||||
}
|
||||
memcpy(samples, &my_data->data[my_data->idx], n_bytes);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -64,16 +64,20 @@ int populate_test_data(struct test_data *test_data)
|
|||
test_data->size = 0;
|
||||
return -1;
|
||||
}
|
||||
|
||||
size_t i;
|
||||
for(i=0;i<test_data->size;){
|
||||
test_data->data[i++] = 0x7f ;
|
||||
test_data->data[i++] = 0x7f ;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void handler(int signal)
|
||||
{
|
||||
if (signal == SIGTERM) {
|
||||
if (signal == SIGUSR1) {
|
||||
shutdown = true;
|
||||
printf("Caught SIGTERM, canceling transfers\n");
|
||||
printf("Caught SIGUSR1, canceling transfers\n");
|
||||
fflush(stdout);
|
||||
} else {
|
||||
printf("Wrong signal bro\n");
|
||||
|
|
@ -84,6 +88,7 @@ void handler(int signal)
|
|||
int main(int argc, char *argv[])
|
||||
{
|
||||
int status;
|
||||
unsigned int actual;
|
||||
struct bladerf *dev;
|
||||
struct bladerf_stream stream;
|
||||
struct test_data test_data;
|
||||
|
|
@ -111,7 +116,7 @@ int main(int argc, char *argv[])
|
|||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if (signal(SIGTERM, handler) == SIG_ERR) {
|
||||
if (signal(SIGUSR1, handler) == SIG_ERR) {
|
||||
fprintf(stderr, "Failed to set up signal handler\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
|
@ -126,6 +131,8 @@ int main(int argc, char *argv[])
|
|||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
bladerf_set_sample_rate( dev, TX, 40000000, &actual );
|
||||
|
||||
status = bladerf_tx_stream(dev, FORMAT_SC16, &stream);
|
||||
if (status) {
|
||||
fprintf(stderr, "TX Stream error: %s\n", bladerf_strerror(status));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue