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

ols: remove serial source from session when done

This commit is contained in:
Bert Vermeulen 2012-08-03 01:05:01 +02:00
parent 2cbeb2b7fb
commit 26bf9d56c0
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hardware/openbench-logic-sniffer/ols.c
View File

@ -702,6 +702,22 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
return ret; return ret;
} }
static void abort_acquisition(const struct sr_dev_inst *sdi)
{
struct sr_datafeed_packet packet;
struct dev_context *devc;
devc = sdi->priv;
sr_source_remove(devc->serial->fd);
/* Terminate session */
packet.type = SR_DF_END;
sr_session_send(sdi, &packet);
}
static int receive_data(int fd, int revents, void *cb_data) static int receive_data(int fd, int revents, void *cb_data)
{ {
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
@ -878,8 +894,8 @@ static int receive_data(int fd, int revents, void *cb_data)
serial_flush(fd); serial_flush(fd);
serial_close(fd); serial_close(fd);
packet.type = SR_DF_END;
sr_session_send(cb_data, &packet); abort_acquisition(sdi);
} }
return TRUE; return TRUE;
@ -1045,13 +1061,11 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
void *cb_data) void *cb_data)
{ {
struct sr_datafeed_packet packet;
/* Avoid compiler warnings. */ /* Avoid compiler warnings. */
(void)sdi; (void)cb_data;
packet.type = SR_DF_END; abort_acquisition(sdi);
sr_session_send(cb_data, &packet);
return SR_OK; return SR_OK;
} }