X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fvictor-dmm%2Fapi.c;h=f94352565c73d59bb41cb15ba55003f5e41cdd2a;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=3970a838bdea51915410ae597cf7fd5c40e8b07d;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git

diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index 3970a838..f9435256 100644
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <libusb.h>
 #include <stdlib.h>
@@ -62,7 +63,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	struct libusb_device_descriptor des;
 	libusb_device **devlist;
 	GSList *devices;
-	int ret, i;
+	int i;
 	char connection_id[64];
 
 	(void)options;
@@ -72,11 +73,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	devices = NULL;
 	libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
 	for (i = 0; devlist[i]; i++) {
-		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 (des.idVendor != VICTOR_VID || des.idProduct != VICTOR_PID)
 			continue;
@@ -92,7 +89,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		sdi->priv = devc;
 
 		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
-
 		sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
 				libusb_get_device_address(devlist[i]), NULL);
 		sdi->inst_type = SR_INST_USB;
@@ -331,7 +327,6 @@ static int handle_events(int fd, int revents, void *cb_data)
 {
 	struct dev_context *devc;
 	struct drv_context *drvc;
-	struct sr_datafeed_packet packet;
 	struct sr_dev_inst *sdi;
 	struct sr_dev_driver *di;
 	struct timeval tv;
@@ -353,11 +348,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(cb_data, &packet);
+		std_session_send_df_end(sdi, LOG_PREFIX);
 	}
 
 	memset(&tv, 0, sizeof(struct timeval));
@@ -389,7 +381,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	usb = sdi->conn;
 	devc->cb_data = cb_data;
 
-	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	usb_source_add(sdi->session, drvc->sr_ctx, 100,