X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Ftesto%2Fapi.c;h=97aa7ac4fc9206b98ee95342a903e86319371729;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=6907ba4ec8023dbfc0b6891730658c6e67933d1c;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c index 6907ba4e..97aa7ac4 100644 --- a/src/hardware/testo/api.c +++ b/src/hardware/testo/api.c @@ -92,11 +92,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) continue; } - if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) { - sr_warn("Failed to get device descriptor: %s.", - libusb_error_name(ret)); - continue; - } + libusb_get_device_descriptor(devlist[i], &des); if ((ret = libusb_open(devlist[i], &hdl)) < 0) continue; @@ -417,7 +413,6 @@ static int handle_events(int fd, int revents, void *cb_data) struct sr_dev_driver *di; struct dev_context *devc; struct drv_context *drvc; - struct sr_datafeed_packet packet; struct sr_dev_inst *sdi; struct timeval tv; gint64 now; @@ -438,11 +433,8 @@ static int handle_events(int fd, int revents, void *cb_data) if (sdi->status == SR_ST_STOPPING) { usb_source_remove(sdi->session, drvc->sr_ctx); - dev_close(sdi); - - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); + std_session_send_df_end(sdi, LOG_PREFIX); } memset(&tv, 0, sizeof(struct timeval));