X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flascar-el-usb%2Fapi.c;h=aa506fa66b475d4813a3f13986a24d19b1cb5e33;hb=851d5b2274f138d58be42adbbe584d9a4c4dfe01;hp=628252490a67adb6037d2238e78dbaf8978306bf;hpb=402704445e081ef7737081885496169f91af7ab9;p=libsigrok.git

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index 62825249..aa506fa6 100644
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -18,12 +18,33 @@
  */
 
 #include <glib.h>
+#include <libusb.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
+SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address);
 SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 static struct sr_dev_driver *di = &lascar_el_usb_driver_info;
+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 hwopts[] = {
+	SR_HWOPT_CONN,
+	0,
+};
+
+static const int hwcaps[] = {
+	SR_HWCAP_THERMOMETER,
+	SR_HWCAP_HYGROMETER,
+	SR_HWCAP_LIMIT_SAMPLES,
+	0
+};
+
+static const char *probe_names[] = {
+	"P1",
+};
+
 
 /* Properly close and free all devices. */
 static int clear_instances(void)
@@ -42,8 +63,8 @@ static int clear_instances(void)
 		if (!(devc = sdi->priv))
 			continue;
 
-		/* TODO */
-
+		hw_dev_close(sdi);
+		sr_usb_dev_inst_free(devc->usb);
 		sr_dev_inst_free(sdi);
 	}
 
@@ -53,7 +74,7 @@ static int clear_instances(void)
 	return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
 	struct drv_context *drvc;
 
@@ -62,8 +83,7 @@ static int hw_init(void)
 		return SR_ERR_MALLOC;
 	}
 
-	/* TODO */
-
+	drvc->sr_ctx = sr_ctx;
 	di->priv = drvc;
 
 	return SR_OK;
@@ -72,15 +92,62 @@ static int hw_init(void)
 static GSList *hw_scan(GSList *options)
 {
 	struct drv_context *drvc;
-	GSList *devices;
+	struct dev_context *devc;
+	struct sr_dev_inst *sdi;
+	struct sr_usb_dev_inst *usb;
+	struct sr_probe *probe;
+	struct sr_hwopt *opt;
+	GSList *usb_devices, *devices, *l;
+	const char *conn;
 
 	(void)options;
 
-	devices = NULL;
-	drvc = di->priv;
-	drvc->instances = NULL;
+	if (!(drvc = di->priv)) {
+		sr_err("Driver was not initialized.");
+		return NULL;
+	}
 
-	/* TODO */
+	/* USB scan is always authoritative. */
+	clear_instances();
+
+	conn = NULL;
+	for (l = options; l; l = l->next) {
+		opt = l->data;
+		switch (opt->hwopt) {
+		case SR_HWOPT_CONN:
+			conn = opt->value;
+			break;
+		}
+	}
+	if (!conn)
+		return NULL;
+
+	devices = NULL;
+	if ((usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn))) {
+		/* We have a list of sr_usb_dev_inst matching the connection
+		 * string. Wrap them in sr_dev_inst and we're done. */
+		for (l = usb_devices; l; l = l->next) {
+			usb = l->data;
+			if (!(sdi = lascar_scan(usb->bus, usb->address))) {
+				/* Not a Lascar EL-USB. */
+				g_free(usb);
+				continue;
+			}
+			if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+				sr_err("Device context malloc failed.");
+				return NULL;
+			}
+			devc->usb = usb;
+			sdi->priv = devc;
+			if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+				return NULL;
+			sdi->probes = g_slist_append(sdi->probes, probe);
+			drvc->instances = g_slist_append(drvc->instances, sdi);
+			devices = g_slist_append(devices, sdi);
+		}
+		g_slist_free(usb_devices);
+	} else
+		g_slist_free_full(usb_devices, g_free);
 
 	return devices;
 }
@@ -118,7 +185,7 @@ static int hw_cleanup(void)
 }
 
 static int hw_info_get(int info_id, const void **data,
-		       const struct sr_dev_inst *sdi)
+		const struct sr_dev_inst *sdi)
 {
 	switch (info_id) {
 	/* TODO */
@@ -131,7 +198,7 @@ static int hw_info_get(int info_id, const void **data,
 }
 
 static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-			     const void *value)
+		const void *value)
 {
 	int ret;
 
@@ -152,15 +219,14 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 }
 
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
-				    void *cb_data)
+		void *cb_data)
 {
 	/* TODO */
 
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-				   void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	(void)cb_data;