X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fvictor-dmm%2Fapi.c;h=53178b2a35ace216ce3cdbeab350321a1bd86f23;hb=41bad9283d5bf869cfdf3d54373bec4dc51eaf16;hp=a389b0794799932f62ee0aeb803ff286b603faa0;hpb=d4abb463a749cd3d614e98c7fe7f5d28ad69475d;p=libsigrok.git

diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c
index a389b079..53178b2a 100644
--- a/hardware/victor-dmm/api.c
+++ b/hardware/victor-dmm/api.c
@@ -37,17 +37,13 @@ static int hw_dev_close(struct sr_dev_inst *sdi);
 static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
 static const int hwcaps[] = {
-	SR_HWCAP_MULTIMETER,
-	SR_HWCAP_LIMIT_MSEC,
-	SR_HWCAP_LIMIT_SAMPLES,
-	SR_HWCAP_CONTINUOUS,
+	SR_CONF_MULTIMETER,
+	SR_CONF_LIMIT_MSEC,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_CONTINUOUS,
 	0
 };
 
-static const char *probe_names[] = {
-	"P1",
-};
-
 /* Properly close and free all devices. */
 static int clear_instances(void)
 {
@@ -194,8 +190,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 	/* The device reports as HID class, so the kernel would have
 	 * claimed it. */
 	if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) {
-		if (libusb_detach_kernel_driver(devc->usb->devhdl, 0) < 0) {
-			sr_err("Failed to detach kernel driver.");
+		if ((ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0)) < 0) {
+			sr_err("Failed to detach kernel driver: %s.",
+			       libusb_error_name(ret));
 			return SR_ERR;
 		}
 	}
@@ -247,31 +244,7 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-		       const struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	switch (info_id) {
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
-		break;
-	default:
-		sr_err("Unknown info_id: %d.", info_id);
-		return SR_ERR_ARG;
-	}
-
-	return SR_OK;
-}
-
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-			     const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	gint64 now;
@@ -289,27 +262,43 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 
 	devc = sdi->priv;
 	ret = SR_OK;
-	switch (hwcap) {
-	case SR_HWCAP_LIMIT_MSEC:
+	switch (id) {
+	case SR_CONF_LIMIT_MSEC:
 		devc->limit_msec = *(const int64_t *)value;
 		now = g_get_monotonic_time() / 1000;
 		devc->end_time = now + devc->limit_msec;
 		sr_dbg("Setting time limit to %" PRIu64 "ms.",
 		       devc->limit_msec);
 		break;
-	case SR_HWCAP_LIMIT_SAMPLES:
+	case SR_CONF_LIMIT_SAMPLES:
 		devc->limit_samples = *(const uint64_t *)value;
 		sr_dbg("Setting sample limit to %" PRIu64 ".",
 		       devc->limit_samples);
 		break;
 	default:
-		sr_err("Unknown hardware capability: %d.", hwcap);
+		sr_err("Unknown hardware capability: %d.", id);
 		ret = SR_ERR_ARG;
 	}
 
 	return ret;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 static void receive_transfer(struct libusb_transfer *transfer)
 {
 	struct dev_context *devc;
@@ -339,15 +328,15 @@ static void receive_transfer(struct libusb_transfer *transfer)
 		if ((ret = libusb_submit_transfer(transfer) != 0)) {
 			sr_err("Unable to resubmit transfer: %s.",
 			       libusb_error_name(ret));
-			libusb_free_transfer(transfer);
 			g_free(transfer->buffer);
+			libusb_free_transfer(transfer);
 			hw_dev_acquisition_stop(sdi, sdi);
 		}
 	} else {
 		/* This was the last transfer we're going to receive, so
 		 * clean up now. */
-		libusb_free_transfer(transfer);
 		g_free(transfer->buffer);
+		libusb_free_transfer(transfer);
 	}
 }
 
@@ -395,7 +384,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
-	struct sr_datafeed_meta_analog meta;
 	struct dev_context *devc;
 	struct drv_context *drvc = di->priv;
 	const struct libusb_pollfd **pfd;
@@ -420,12 +408,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	header.feed_version = 1;
 	sr_session_send(devc->cb_data, &packet);
 
-	/* Send metadata about the SR_DF_ANALOG packets to come. */
-	packet.type = SR_DF_META_ANALOG;
-	packet.payload = &meta;
-	meta.num_probes = 1;
-	sr_session_send(devc->cb_data, &packet);
-
 	pfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
 	for (i = 0; pfd[i]; i++) {
 		/* Handle USB events every 100ms, for decent latency. */
@@ -483,10 +465,10 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,