X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fbrymen-bm86x%2Fapi.c;h=9ab60dff8fa90d168bea9d3612ee58e3819dd45d;hb=ecaa89af0e01f9c3f585e82eb849bf616bff22cf;hp=feb877d1f4400cf5c2bfce4220719d934d7e92aa;hpb=8d9c8554a53d3c22305558e6064a6a4873e83fe1;p=libsigrok.git

diff --git a/hardware/brymen-bm86x/api.c b/hardware/brymen-bm86x/api.c
index feb877d1..9ab60dff 100644
--- a/hardware/brymen-bm86x/api.c
+++ b/hardware/brymen-bm86x/api.c
@@ -19,6 +19,19 @@
 
 #include "protocol.h"
 
+#define BRYMEN_BC86X "0820.0001"
+
+static const int32_t hwopts[] = {
+	SR_CONF_CONN,
+};
+
+static const int32_t hwcaps[] = {
+	SR_CONF_MULTIMETER,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_LIMIT_MSEC,
+	SR_CONF_CONTINUOUS,
+};
+
 SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
 static struct sr_dev_driver *di = &brymen_bm86x_driver_info;
 
@@ -29,17 +42,63 @@ static int init(struct sr_context *sr_ctx)
 
 static GSList *scan(GSList *options)
 {
+	GSList *usb_devices, *devices, *l;
 	struct drv_context *drvc;
-	GSList *devices;
-
-	(void)options;
+	struct dev_context *devc;
+	struct sr_dev_inst *sdi;
+	struct sr_usb_dev_inst *usb;
+	struct sr_config *src;
+	struct sr_probe *probe;
+	const char *conn;
 
-	devices = NULL;
 	drvc = di->priv;
 	drvc->instances = NULL;
 
-	/* TODO: scan for devices, either based on a SR_CONF_CONN option
-	 * or on a USB scan. */
+	conn = BRYMEN_BC86X;
+	for (l = options; l; l = l->next) {
+		src = l->data;
+		switch (src->key) {
+		case SR_CONF_CONN:
+			conn = g_variant_get_string(src->data, NULL);
+			break;
+		}
+	}
+
+	devices = NULL;
+	if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn))) {
+		g_slist_free_full(usb_devices, g_free);
+		return NULL;
+	}
+
+	for (l = usb_devices; l; l = l->next) {
+		usb = l->data;
+
+		if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
+		                            "Brymen", "BM869", NULL))) {
+			sr_err("sr_dev_inst_new returned NULL.");
+			return NULL;
+		}
+
+		if (!(devc = g_try_malloc0(sizeof(*devc)))) {
+			sr_err("Device context malloc failed.");
+			return NULL;
+		}
+
+		sdi->priv = devc;
+		sdi->driver = di;
+		if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+			return NULL;
+		sdi->probes = g_slist_append(sdi->probes, probe);
+		if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P2")))
+			return NULL;
+		sdi->probes = g_slist_append(sdi->probes, probe);
+
+		sdi->inst_type = SR_INST_USB;
+		sdi->conn = usb;
+
+		drvc->instances = g_slist_append(drvc->instances, sdi);
+		devices = g_slist_append(devices, sdi);
+	}
 
 	return devices;
 }
@@ -56,117 +115,184 @@ static int dev_clear(void)
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-	(void)sdi;
+	struct drv_context *drvc = di->priv;
+	struct sr_usb_dev_inst *usb;
+	struct dev_context *devc;
+	int ret;
 
-	/* TODO: get handle from sdi->conn and open it. */
+	usb = sdi->conn;
+	devc = sdi->priv;
+
+	if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
+		sdi->status = SR_ST_ACTIVE;
+
+	/* Detach kernel drivers which grabbed this device (if any). */
+	if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
+		ret = libusb_detach_kernel_driver(usb->devhdl, 0);
+		if (ret < 0) {
+			sr_err("Failed to detach kernel driver: %s.",
+			       libusb_error_name(ret));
+			return SR_ERR;
+		}
+		devc->detached_kernel_driver = 1;
+		sr_dbg("Successfully detached kernel driver.");
+	} else {
+		sr_dbg("No need to detach a kernel driver.");
+	}
 
-	sdi->status = SR_ST_ACTIVE;
+	/* Claim interface 0. */
+	if ((ret = libusb_claim_interface(usb->devhdl, 0)) < 0) {
+		sr_err("Failed to claim interface 0: %s.",
+		       libusb_error_name(ret));
+		return SR_ERR;
+	}
+	sr_dbg("Successfully claimed interface 0.");
 
-	return SR_OK;
+	return ret;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-	(void)sdi;
+	struct sr_usb_dev_inst *usb;
+	struct dev_context *devc;
+	int ret;
+
+	usb = sdi->conn;
+	devc = sdi->priv;
+
+	if ((ret = libusb_release_interface(usb->devhdl, 0)))
+		sr_err("Failed to release interface 0: %s.\n", libusb_error_name(ret));
+	else
+		sr_dbg("Successfully released interface 0.\n");
+
+	if (!ret && devc->detached_kernel_driver) {
+		if ((ret = libusb_attach_kernel_driver(usb->devhdl, 0))) {
+			sr_err("Failed to attach kernel driver: %s.\n",
+			       libusb_error_name(ret));
+		} else {
+			devc->detached_kernel_driver = 0;
+			sr_dbg("Successfully attached kernel driver.\n");
+		}
+	}
 
-	/* TODO: get handle from sdi->conn and close it. */
+	libusb_close(usb->devhdl);
 
 	sdi->status = SR_ST_INACTIVE;
 
-	return SR_OK;
+	return ret;
 }
 
 static int cleanup(void)
 {
-	dev_clear();
-
-	/* TODO: free other driver resources, if any. */
-
-	return SR_OK;
+	return dev_clear();
 }
 
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_probe_group *probe_group)
 {
-	int ret;
+	struct dev_context *devc = sdi->priv;
 
-	(void)sdi;
-	(void)data;
 	(void)probe_group;
 
-	ret = SR_OK;
 	switch (key) {
-	/* TODO */
+	case SR_CONF_LIMIT_SAMPLES:
+		*data = g_variant_new_uint64(devc->limit_samples);
+		break;
+	case SR_CONF_LIMIT_MSEC:
+		*data = g_variant_new_uint64(devc->limit_msec);
+		break;
 	default:
 		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_probe_group *probe_group)
 {
-	int ret;
+	struct dev_context *devc;
 
-	(void)data;
 	(void)probe_group;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	ret = SR_OK;
+	if (!(devc = sdi->priv)) {
+		sr_err("sdi->priv was NULL.");
+		return SR_ERR_BUG;
+	}
+
 	switch (key) {
-	/* TODO */
+	case SR_CONF_LIMIT_SAMPLES:
+		devc->limit_samples = g_variant_get_uint64(data);
+		sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples);
+		break;
+	case SR_CONF_LIMIT_MSEC:
+		devc->limit_msec = g_variant_get_uint64(data);
+		sr_dbg("Setting time limit to %" PRIu64 "ms.", devc->limit_msec);
+		break;
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_probe_group *probe_group)
 {
-	int ret;
-
 	(void)sdi;
-	(void)data;
 	(void)probe_group;
 
-	ret = SR_OK;
 	switch (key) {
-	/* TODO */
+	case SR_CONF_SCAN_OPTIONS:
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+				hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t));
+		break;
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+				hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+		break;
 	default:
 		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data)
 {
-	(void)sdi;
-	(void)cb_data;
+	struct dev_context *devc;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	/* TODO: configure hardware, reset acquisition state, set up
-	 * callbacks and send header packet. */
+	devc = sdi->priv;
+	devc->session_cb_data = cb_data;
+	devc->start_time = g_get_monotonic_time();
+
+	/* Send header packet to the session bus. */
+	std_session_send_df_header(cb_data, LOG_PREFIX);
+
+	sr_source_add(0, 0, 10, brymen_bm86x_receive_data, (void *)sdi);
 
 	return SR_OK;
 }
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-	(void)cb_data;
+	struct sr_datafeed_packet packet;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	/* TODO: stop acquisition. */
+	/* Send end packet to the session bus. */
+	packet.type = SR_DF_END;
+	sr_session_send(cb_data, &packet);
+
+	sr_source_remove(0);
 
 	return SR_OK;
 }