X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftesto%2Fapi.c;h=691ba8f5e85ae66bbddf47c43c5ff5023b9b9a54;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=de3faf04334198e4d882d3a46ba25b3e41659bde;hpb=55462b8ba9f48931de9b9a7bfbc182a1d113b3b5;p=libsigrok.git

diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c
index de3faf04..691ba8f5 100644
--- a/src/hardware/testo/api.c
+++ b/src/hardware/testo/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include "protocol.h"
 
@@ -63,7 +64,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	char manufacturer[64], product[64], connection_id[64];
 
 	devices = NULL;
-	drvc = di->priv;
+	drvc = di->context;
 	drvc->instances = NULL;
 
 	conn_devices = NULL;
@@ -91,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;
@@ -151,7 +148,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
@@ -162,13 +159,13 @@ static int dev_clear(const struct sr_dev_driver *di)
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct sr_dev_driver *di = sdi->driver;
-	struct drv_context *drvc = di->priv;
+	struct drv_context *drvc = di->context;
 	struct sr_usb_dev_inst *usb;
 	libusb_device **devlist;
 	int ret, i;
 	char connection_id[64];
 
-	if (!di->priv) {
+	if (!di->context) {
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
 	}
@@ -215,7 +212,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 	struct sr_dev_driver *di = sdi->driver;
 	struct sr_usb_dev_inst *usb;
 
-	if (!di->priv) {
+	if (!di->context) {
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
 	}
@@ -238,7 +235,7 @@ static int cleanup(const struct sr_dev_driver *di)
 	int ret;
 	struct drv_context *drvc;
 
-	if (!(drvc = di->priv))
+	if (!(drvc = di->context))
 		return SR_OK;
 
 	ret = dev_clear(di);
@@ -283,7 +280,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	if (!di->priv) {
+	if (!di->context) {
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
 	}
@@ -416,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;
@@ -427,7 +423,7 @@ static int handle_events(int fd, int revents, void *cb_data)
 	sdi = cb_data;
 	devc = sdi->priv;
 	di = sdi->driver;
-	drvc = di->priv;
+	drvc = di->context;
 
 	if (devc->limit_msec) {
 		now = g_get_monotonic_time() / 1000;
@@ -437,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));
@@ -461,11 +454,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	int ret;
 	unsigned char *buf;
 
-	drvc = di->priv;
+	drvc = di->context;
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	if (!di->priv) {
+	if (!di->context) {
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
 	}
@@ -477,7 +470,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	devc->num_samples = 0;
 	devc->reply_size = 0;
 
-	/* 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,
@@ -510,7 +502,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	struct sr_dev_driver *di = sdi->driver;
 	(void)cb_data;
 
-	if (!di->priv) {
+	if (!di->context) {
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
 	}
@@ -539,5 +531,5 @@ SR_PRIV struct sr_dev_driver testo_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };