X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fchronovu-la8%2Fapi.c;h=9a512f90c786fbd930e4e0c89860a69b6cccf8e6;hb=521a0cd3577db0ec2763493d95d2ffa479568a3a;hp=7ed2032adb73906ea725d2710787a41e5fae0128;hpb=f3a35908ef0d9fd56ec170d7f1bafff50c3432e2;p=libsigrok.git

diff --git a/hardware/chronovu-la8/api.c b/hardware/chronovu-la8/api.c
index 7ed2032a..9a512f90 100644
--- a/hardware/chronovu-la8/api.c
+++ b/hardware/chronovu-la8/api.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "driver.h"
+#include "protocol.h"
 
 SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
 static struct sr_dev_driver *di = &chronovu_la8_driver_info;
@@ -38,8 +38,7 @@ static const uint16_t usb_pids[] = {
 };
 
 /* Function prototypes. */
-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);
 
 static int clear_instances(void)
 {
@@ -69,7 +68,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;
 
@@ -78,6 +77,7 @@ static int hw_init(void)
 		return SR_ERR_MALLOC;
 	}
 
+	drvc->sr_ctx = sr_ctx;
 	di->priv = drvc;
 
 	return SR_OK;
@@ -160,7 +160,7 @@ static GSList *hw_scan(GSList *options)
 	sdi->priv = devc;
 
 	for (i = 0; probe_names[i]; i++) {
-		if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
+		if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE,
 					   probe_names[i])))
 			return NULL;
 		sdi->probes = g_slist_append(sdi->probes, probe);
@@ -279,10 +279,9 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
 
 static int hw_cleanup(void)
 {
-	if (!di->priv) {
-		sr_err("%s: di->priv was NULL.", __func__);
-		return SR_ERR_BUG;
-	}
+	if (!di->priv)
+		/* Can get called on an unused driver, doesn't matter. */
+		return SR_OK;
 
 	clear_instances();
 
@@ -506,8 +505,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	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)
 {
 	struct sr_datafeed_packet packet;