BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

salae: Only terminate session after all transfers have been aborted

This commit is contained in:
Joel Holdsworth 2012-03-25 18:53:54 +01:00
parent 3e6292b296
commit ec888f62fe
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hardware/saleae-logic/saleae-logic.c
View File

@ -674,14 +674,24 @@ static int receive_data(int fd, int revents, void *cb_data)
static void abort_acquisition(struct context *ctx) static void abort_acquisition(struct context *ctx)
{ {
struct sr_datafeed_packet packet; ctx->num_samples = -1;
}
static void finish_acquisition(struct context *ctx)
{
struct sr_datafeed_packet packet;
int i;
/* Terminate session */
packet.type = SR_DF_END; packet.type = SR_DF_END;
sr_session_send(ctx->session_dev_id, &packet); sr_session_send(ctx->session_dev_id, &packet);
ctx->num_samples = -1; /* Remove fds from polling */
const struct libusb_pollfd **const lupfd =
/* TODO: Need to cancel and free any queued up transfers. */ libusb_get_pollfds(usb_context);
for (i = 0; lupfd[i]; i++)
sr_source_remove(lupfd[i]->fd);
free(lupfd); /* NOT g_free()! */
} }
static void receive_transfer(struct libusb_transfer *transfer) static void receive_transfer(struct libusb_transfer *transfer)
@ -701,6 +711,11 @@ static void receive_transfer(struct libusb_transfer *transfer)
if (ctx->num_samples == -1) { if (ctx->num_samples == -1) {
if (transfer) if (transfer)
libusb_free_transfer(transfer); libusb_free_transfer(transfer);
ctx->submitted_transfers--;
if (ctx->submitted_transfers == 0)
finish_acquisition(ctx);
return; return;
} }
@ -861,6 +876,8 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
g_free(buf); g_free(buf);
return SR_ERR; return SR_ERR;
} }
ctx->submitted_transfers++;
size = 4096; size = 4096;
} }

2
hardware/saleae-logic/saleae-logic.h
View File

@ -66,6 +66,8 @@ struct context {
int trigger_stage; int trigger_stage;
uint8_t trigger_buffer[NUM_TRIGGER_STAGES]; uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
int num_samples; int num_samples;
int submitted_transfers;
/* /*
* opaque session data passed in by the frontend, will be passed back * opaque session data passed in by the frontend, will be passed back
* on the session bus along with samples. * on the session bus along with samples.