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

hameg-hmo: Send the DF_END packet in acquisition_stop() 

The DF_END packet was send out after all configured frames were fetched, but
devices may stop the acquisition at any point in time and an DF_END will not be
send out in this case.

Send the DF_END packet inside of acquisition_stop() so this can't happen.
This commit is contained in:
poljar (Damir Jelić) 2014-01-16 15:28:52 +01:00 committed by Bert Vermeulen
parent 68e3d07014
commit 66e3219dbd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hardware/hameg-hmo/api.c
View File

@ -882,9 +882,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_scpi_dev_inst *scpi; struct sr_scpi_dev_inst *scpi;
struct sr_datafeed_packet packet;
(void)cb_data; (void)cb_data;
packet.type = SR_DF_END;
packet.payload = NULL;
sr_session_send(sdi, &packet);
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;

2
hardware/hameg-hmo/protocol.c
View File

@ -621,8 +621,6 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
devc->current_probe = devc->current_probe->next; devc->current_probe = devc->current_probe->next;
hmo_request_data(sdi); hmo_request_data(sdi);
} else if (++devc->num_frames == devc->frame_limit) { } else if (++devc->num_frames == devc->frame_limit) {
packet.type = SR_DF_END;
sr_session_send(sdi, &packet);
sdi->driver->dev_acquisition_stop(sdi, cb_data); sdi->driver->dev_acquisition_stop(sdi, cb_data);
} else { } else {
devc->current_probe = devc->enabled_probes; devc->current_probe = devc->enabled_probes;