X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fprotocol.c;h=ba9b84f96ffd119b061aebdcbf067b47ee75500a;hb=566007e15e8ec0a23b064ba8ea44baae305508b5;hp=2584e8b09830015b5b22940712d4baeb06cb1c8e;hpb=9e9dba7b41bdd87d4ce442bc9bf6507518e97000;p=libsigrok.git

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index 2584e8b0..ba9b84f9 100644
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -27,7 +27,7 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-extern struct sr_dev_driver lascar_el_usb_driver_info;
+extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 struct sr_dev_driver *di = &lascar_el_usb_driver_info;
 
 static const struct elusb_profile profiles[] = {
@@ -354,12 +354,16 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
 	struct libusb_device **devlist;
 	libusb_device_handle *dev_hdl;
 	int dummy, i;
+	int ret;
 	unsigned char config[MAX_CONFIGBLOCK_SIZE];
 
 	drvc = di->context;
 	sdi = NULL;
 
-	libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
+	ret = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
+	if (ret < 0)
+		return NULL;
+
 	for (i = 0; devlist[i]; i++) {
 		if (libusb_get_bus_number(devlist[i]) != bus ||
 				libusb_get_device_address(devlist[i]) != address)
@@ -374,6 +378,7 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
 		libusb_close(dev_hdl);
 		sdi = lascar_identify(config);
 	}
+	libusb_free_device_list(devlist, 1);
 
 	return sdi;
 }
@@ -430,7 +435,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 			else
 				analog.unit = SR_UNIT_CELSIUS;
 			analog.data = temp;
-			sr_session_send(devc->cb_data, &packet);
+			sr_session_send(sdi, &packet);
 			g_slist_free(analog.channels);
 		}
 
@@ -440,7 +445,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 			analog.mq = SR_MQ_RELATIVE_HUMIDITY;
 			analog.unit = SR_UNIT_PERCENTAGE;
 			analog.data = rh;
-			sr_session_send(devc->cb_data, &packet);
+			sr_session_send(sdi, &packet);
 			g_slist_free(analog.channels);
 		}
 
@@ -463,7 +468,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 			if (analog.data[i] < 0.0)
 				analog.data[i] = 0.0;
 		}
-		sr_session_send(devc->cb_data, &packet);
+		sr_session_send(sdi, &packet);
 		g_free(analog.data);
 		break;
 	default:
@@ -477,7 +482,6 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
 {
 	struct drv_context *drvc = di->context;
-	struct sr_datafeed_packet packet;
 	struct sr_dev_inst *sdi;
 	struct timeval tv;
 
@@ -488,9 +492,7 @@ SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
 
 	if (sdi->status == SR_ST_STOPPING) {
 		usb_source_remove(sdi->session, drvc->sr_ctx);
-
-		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));
@@ -514,7 +516,7 @@ SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *
 	switch (transfer->status) {
 	case LIBUSB_TRANSFER_NO_DEVICE:
 		/* USB device was unplugged. */
-		dev_acquisition_stop(sdi, sdi);
+		dev_acquisition_stop(sdi);
 		return;
 	case LIBUSB_TRANSFER_COMPLETED:
 	case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */
@@ -533,7 +535,7 @@ SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *
 				devc->rcvd_bytes, devc->log_size,
 				devc->rcvd_samples, devc->logged_samples);
 		if (devc->rcvd_bytes >= devc->log_size)
-			dev_acquisition_stop(sdi, sdi);
+			dev_acquisition_stop(sdi);
 	}
 
 	if (sdi->status == SR_ST_ACTIVE) {
@@ -543,7 +545,7 @@ SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *
 			       libusb_error_name(ret));
 			g_free(transfer->buffer);
 			libusb_free_transfer(transfer);
-			dev_acquisition_stop(sdi, sdi);
+			dev_acquisition_stop(sdi);
 		}
 	} else {
 		/* This was the last transfer we're going to receive, so