X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fchronovu-la8%2Fchronovu-la8.c;h=aa4cde25f249283579716e49571acd7d53f61847;hb=ffedd0bf5d3abb1eae86db68e336285eddf41778;hp=981dc8f4ee71514bb66cc53d2869d165ed2e5784;hpb=f4314d7e0611917bdc7713dbffe17559490666d6;p=libsigrok.git

diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c
index 981dc8f4..aa4cde25 100644
--- a/hardware/chronovu-la8/chronovu-la8.c
+++ b/hardware/chronovu-la8/chronovu-la8.c
@@ -19,7 +19,11 @@
  */
 
 #include <ftdi.h>
-#include <sigrok.h>
+#include <glib.h>
+#include <string.h>
+#include <stdlib.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 #define USB_VENDOR_ID			0x0403
 #define USB_PRODUCT_ID			0x6001
@@ -33,7 +37,22 @@
 #define SDRAM_SIZE			(8 * 1024 * 1024)
 #define MIN_NUM_SAMPLES			1
 
-static GSList *device_instances = NULL;
+#define BS				4096 /* Block size */
+#define NUM_BLOCKS			2048 /* Number of blocks */
+
+static GSList *dev_insts = NULL;
+
+static const char *probe_names[NUM_PROBES + 1] = {
+	"0",
+	"1",
+	"2",
+	"3",
+	"4",
+	"5",
+	"6",
+	"7",
+	NULL,
+};
 
 struct la8 {
 	/** FTDI device context (used by libftdi). */
@@ -48,17 +67,14 @@ struct la8 {
 	/** The current sampling limit (in number of samples). */
 	uint64_t limit_samples;
 
-	/** The number of probes. */
-	int num_probes;
-
 	/** TODO */
 	gpointer session_id;
 
 	/**
-	 * An 8MB buffer containing the (mangled) samples from the device.
+	 * A buffer containing some (mangled) samples from the device.
 	 * Format: Pretty mangled-up (due to hardware reasons), see code.
 	 */
-	uint8_t *mangled_buf;
+	uint8_t mangled_buf[BS];
 
 	/**
 	 * An 8MB buffer where we'll store the de-mangled samples.
@@ -82,17 +98,20 @@ struct la8 {
 	/** Time (in seconds) before the trigger times out. */
 	uint64_t trigger_timeout;
 
+	/** Tells us whether an SR_DF_TRIGGER packet was already sent. */
+	int trigger_found;
+
 	/** TODO */
 	time_t done;
 
-	/** Counter/index for the data block (0..2047) to be read. */
+	/** Counter/index for the data block to be read. */
 	int block_counter;
 
 	/** The divcount value (determines the sample period) for the LA8. */
 	uint8_t divcount;
 };
 
-/* This will be initialized via hw_get_device_info()/SR_DI_SAMPLERATES. */
+/* This will be initialized via hw_get_dev_info()/SR_DI_SAMPLERATES. */
 static uint64_t supported_samplerates[255 + 1] = { 0 };
 
 /*
@@ -107,7 +126,7 @@ static struct sr_samplerates samplerates = {
 };
 
 /* Note: Continuous sampling is not supported by the hardware. */
-static int capabilities[] = {
+static int hwcaps[] = {
 	SR_HWCAP_LOGIC_ANALYZER,
 	SR_HWCAP_SAMPLERATE,
 	SR_HWCAP_LIMIT_MSEC, /* TODO: Not yet implemented. */
@@ -117,7 +136,7 @@ static int capabilities[] = {
 
 /* Function prototypes. */
 static int la8_close_usb_reset_sequencer(struct la8 *la8);
-static void hw_stop_acquisition(int device_index, gpointer session_device_id);
+static int hw_stop_acquisition(int dev_index, gpointer session_data);
 static int la8_reset(struct la8 *la8);
 
 static void fill_supported_samplerates_if_needed(void)
@@ -151,8 +170,8 @@ static int is_valid_samplerate(uint64_t samplerate)
 			return 1;
 	}
 
-	g_warning("la8: %s: invalid samplerate (%" PRIu64 "Hz)",
-		  __func__, samplerate);
+	sr_err("la8: %s: invalid samplerate (%" PRIu64 "Hz)",
+	       __func__, samplerate);
 
 	return 0;
 }
@@ -170,13 +189,13 @@ static int is_valid_samplerate(uint64_t samplerate)
 static uint8_t samplerate_to_divcount(uint64_t samplerate)
 {
 	if (samplerate == 0) {
-		g_warning("la8: %s: samplerate was 0", __func__);
+		sr_err("la8: %s: samplerate was 0", __func__);
 		return 0xff;
 	}
 
 	if (!is_valid_samplerate(samplerate)) {
-		g_warning("la8: %s: can't get divcount, samplerate invalid",
-			  __func__);
+		sr_err("la8: %s: can't get divcount, samplerate invalid",
+		       __func__);
 		return 0xff;
 	}
 
@@ -196,34 +215,34 @@ static int la8_write(struct la8 *la8, uint8_t *buf, int size)
 	int bytes_written;
 
 	if (!la8) {
-		g_warning("la8: %s: la8 was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8 was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (!la8->ftdic) {
-		g_warning("la8: %s: la8->ftdic was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8->ftdic was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (!buf) {
-		g_warning("la8: %s: buf was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: buf was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (size < 0) {
-		g_warning("la8: %s: size was < 0", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: size was < 0", __func__);
+		return SR_ERR_ARG;
 	}
 
 	bytes_written = ftdi_write_data(la8->ftdic, buf, size);
 
 	if (bytes_written < 0) {
-		g_warning("la8: %s: ftdi_write_data: (%d) %s", __func__,
-			  bytes_written, ftdi_get_error_string(la8->ftdic));
+		sr_err("la8: %s: ftdi_write_data: (%d) %s", __func__,
+		       bytes_written, ftdi_get_error_string(la8->ftdic));
 		(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
 	} else if (bytes_written != size) {
-		g_warning("la8: %s: bytes to write: %d, bytes written: %d",
-			  __func__, size, bytes_written);
+		sr_err("la8: %s: bytes to write: %d, bytes written: %d",
+		       __func__, size, bytes_written);
 		(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
 	}
 
@@ -243,33 +262,33 @@ static int la8_read(struct la8 *la8, uint8_t *buf, int size)
 	int bytes_read;
 
 	if (!la8) {
-		g_warning("la8: %s: la8 was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8 was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (!la8->ftdic) {
-		g_warning("la8: %s: la8->ftdic was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8->ftdic was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (!buf) {
-		g_warning("la8: %s: buf was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: buf was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (size <= 0) {
-		g_warning("la8: %s: size was <= 0", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: size was <= 0", __func__);
+		return SR_ERR_ARG;
 	}
 
 	bytes_read = ftdi_read_data(la8->ftdic, buf, size);
 
 	if (bytes_read < 0) {
-		g_warning("la8: %s: ftdi_read_data: (%d) %s", __func__,
-			  bytes_read, ftdi_get_error_string(la8->ftdic));
+		sr_err("la8: %s: ftdi_read_data: (%d) %s", __func__,
+		       bytes_read, ftdi_get_error_string(la8->ftdic));
 	} else if (bytes_read != size) {
-		// g_warning("la8: %s: bytes to read: %d, bytes read: %d",
-		//	  __func__, size, bytes_read);
+		// sr_err("la8: %s: bytes to read: %d, bytes read: %d",
+		//        __func__, size, bytes_read);
 	}
 
 	return bytes_read;
@@ -280,18 +299,18 @@ static int la8_close(struct la8 *la8)
 	int ret;
 
 	if (!la8) {
-		g_warning("la8: %s: la8 was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8 was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (!la8->ftdic) {
-		g_warning("la8: %s: la8->ftdic was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8->ftdic was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if ((ret = ftdi_usb_close(la8->ftdic)) < 0) {
-		g_warning("la8: %s: ftdi_usb_close: (%d) %s",
-			  __func__, ret, ftdi_get_error_string(la8->ftdic));
+		sr_err("la8: %s: ftdi_usb_close: (%d) %s",
+		       __func__, ret, ftdi_get_error_string(la8->ftdic));
 	}
 
 	return ret;
@@ -309,39 +328,35 @@ static int la8_close_usb_reset_sequencer(struct la8 *la8)
 	uint8_t buf[8] = {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
 	int ret;
 
-	g_debug("la8: entering %s", __func__);
-
 	if (!la8) {
-		g_warning("la8: %s: la8 was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8 was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (!la8->ftdic) {
-		g_warning("la8: %s: la8->ftdic was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8->ftdic was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (la8->ftdic->usb_dev) {
 		/* Reset the LA8 sequencer logic, then wait 100ms. */
-		g_debug("la8: resetting sequencer logic");
+		sr_dbg("la8: resetting sequencer logic");
 		(void) la8_write(la8, buf, 8); /* Ignore errors. */
 		g_usleep(100 * 1000);
 
 		/* Purge FTDI buffers, then reset and close the FTDI device. */
-		g_debug("la8: purging buffers, resetting+closing FTDI device");
+		sr_dbg("la8: purging buffers, resetting+closing FTDI device");
 
 		/* Log errors, but ignore them (i.e., don't abort). */
 		if ((ret = ftdi_usb_purge_buffers(la8->ftdic)) < 0)
-			g_warning("la8: %s: ftdi_usb_purge_buffers: (%d) %s",
+			sr_err("la8: %s: ftdi_usb_purge_buffers: (%d) %s",
 			    __func__, ret, ftdi_get_error_string(la8->ftdic));
 		if ((ret = ftdi_usb_reset(la8->ftdic)) < 0)
-			g_warning("la8: %s: ftdi_usb_reset: (%d) %s", __func__,
-				  ret, ftdi_get_error_string(la8->ftdic));
+			sr_err("la8: %s: ftdi_usb_reset: (%d) %s", __func__,
+			       ret, ftdi_get_error_string(la8->ftdic));
 		if ((ret = ftdi_usb_close(la8->ftdic)) < 0)
-			g_warning("la8: %s: ftdi_usb_close: (%d) %s", __func__,
-				  ret, ftdi_get_error_string(la8->ftdic));
-	} else {
-		g_debug("la8: %s: usb_dev was NULL, nothing to do", __func__);
+			sr_err("la8: %s: ftdi_usb_close: (%d) %s", __func__,
+			       ret, ftdi_get_error_string(la8->ftdic));
 	}
 
 	ftdi_free(la8->ftdic); /* Returns void. */
@@ -360,21 +375,21 @@ static int la8_close_usb_reset_sequencer(struct la8 *la8)
  */
 static int la8_reset(struct la8 *la8)
 {
-	uint8_t buf[4096];
+	uint8_t buf[BS];
 	time_t done, now;
 	int bytes_read;
 
 	if (!la8) {
-		g_warning("la8: %s: la8 was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8 was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (!la8->ftdic) {
-		g_warning("la8: %s: la8->ftdic was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8->ftdic was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
-	g_debug("la8: resetting the device");
+	sr_dbg("la8: resetting the device");
 
 	/*
 	 * Purge pending read data from the FTDI hardware FIFO until
@@ -383,33 +398,87 @@ static int la8_reset(struct la8 *la8)
 	done = 20 + time(NULL);
 	do {
 		/* TODO: Ignore errors? Check for < 0 at least! */
-		bytes_read = la8_read(la8, (uint8_t *)&buf, 4096);
+		bytes_read = la8_read(la8, (uint8_t *)&buf, BS);
 		now = time(NULL);
 	} while ((done > now) && (bytes_read > 0));
 
 	/* Reset the LA8 sequencer logic and close the USB port. */
 	(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
 
-	g_debug("la8: device reset finished");
+	sr_dbg("la8: device reset finished");
 
 	return SR_OK;
 }
 
-static int hw_init(const char *deviceinfo)
+static int configure_probes(struct la8 *la8, GSList *probes)
+{
+	struct sr_probe *probe;
+	GSList *l;
+	uint8_t probe_bit;
+	char *tc;
+
+	la8->trigger_pattern = 0;
+	la8->trigger_mask = 0; /* Default to "don't care" for all probes. */
+
+	for (l = probes; l; l = l->next) {
+		probe = (struct sr_probe *)l->data;
+
+		if (!probe) {
+			sr_err("la8: %s: probe was NULL", __func__);
+			return SR_ERR;
+		}
+
+		/* Skip disabled probes. */
+		if (!probe->enabled)
+			continue;
+
+		/* Skip (enabled) probes with no configured trigger. */
+		if (!probe->trigger)
+			continue;
+
+		/* Note: Must only be run if probe->trigger != NULL. */
+		if (probe->index < 0 || probe->index > 7) {
+			sr_err("la8: %s: invalid probe index %d, must be "
+			       "between 0 and 7", __func__, probe->index);
+			return SR_ERR;
+		}
+
+		probe_bit = (1 << (probe->index - 1));
+
+		/* Configure the probe's trigger mask and trigger pattern. */
+		for (tc = probe->trigger; tc && *tc; tc++) {
+			la8->trigger_mask |= probe_bit;
+
+			/* Sanity check, LA8 only supports low/high trigger. */
+			if (*tc != '0' && *tc != '1') {
+				sr_err("la8: %s: invalid trigger '%c', only "
+				       "'0'/'1' supported", __func__, *tc);
+				return SR_ERR;
+			}
+
+			if (*tc == '1')
+				la8->trigger_pattern |= probe_bit;
+		}
+	}
+
+	sr_dbg("la8: %s: trigger_mask = 0x%x, trigger_pattern = 0x%x",
+	       __func__, la8->trigger_mask, la8->trigger_pattern);
+
+	return SR_OK;
+}
+
+static int hw_init(const char *devinfo)
 {
 	int ret;
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	struct la8 *la8;
 
-	g_debug("la8: entering %s", __func__);
-
 	/* Avoid compiler errors. */
-	deviceinfo = deviceinfo;
+	(void)devinfo;
 
 	/* Allocate memory for our private driver context. */
-	if (!(la8 = malloc(sizeof(struct la8)))) {
-		g_warning("la8: %s: struct la8 malloc failed", __func__);
-		ret = SR_ERR_MALLOC;
+	if (!(la8 = g_try_malloc(sizeof(struct la8)))) {
+		sr_err("la8: %s: struct la8 malloc failed", __func__);
 		goto err_free_nothing;
 	}
 
@@ -418,130 +487,114 @@ static int hw_init(const char *deviceinfo)
 	la8->cur_samplerate = SR_MHZ(100); /* 100MHz == max. samplerate */
 	la8->limit_msec = 0;
 	la8->limit_samples = 0;
-	la8->num_probes = NUM_PROBES;
 	la8->session_id = NULL;
-	la8->mangled_buf = NULL;
+	memset(la8->mangled_buf, 0, BS);
 	la8->final_buf = NULL;
 	la8->trigger_pattern = 0x00; /* Value irrelevant, see trigger_mask. */
 	la8->trigger_mask = 0x00; /* All probes are "don't care". */
 	la8->trigger_timeout = 10; /* Default to 10s trigger timeout. */
+	la8->trigger_found = 0;
 	la8->done = 0;
 	la8->block_counter = 0;
 	la8->divcount = 0; /* 10ns sample period == 100MHz samplerate */
 
-	/* Allocate memory for the raw (mangled) data from the LA8. */
-	if (!(la8->mangled_buf = malloc(SDRAM_SIZE))) {
-		g_warning("la8: %s: mangled_buf malloc failed", __func__);
-		ret = SR_ERR_MALLOC;
-		goto err_free_la8;
-	}
-
 	/* Allocate memory where we'll store the de-mangled data. */
-	if (!(la8->final_buf = malloc(SDRAM_SIZE))) {
-		g_warning("la8: %s: final_buf malloc failed", __func__);
-		ret = SR_ERR_MALLOC;
-		goto err_free_mangled_buf;
+	if (!(la8->final_buf = g_try_malloc(SDRAM_SIZE))) {
+		sr_err("la8: %s: final_buf malloc failed", __func__);
+		goto err_free_la8;
 	}
 
 	/* Allocate memory for the FTDI context (ftdic) and initialize it. */
 	if (!(la8->ftdic = ftdi_new())) {
-		g_warning("la8: %s: ftdi_new failed", __func__);
-		ret = SR_ERR; /* TODO: More specific error? */
+		sr_err("la8: %s: ftdi_new failed", __func__);
 		goto err_free_final_buf;
 	}
 
 	/* Check for the device and temporarily open it. */
 	if ((ret = ftdi_usb_open_desc(la8->ftdic, USB_VENDOR_ID,
 			USB_PRODUCT_ID, USB_DESCRIPTION, NULL)) < 0) {
-		g_warning("la8: %s: ftdi_usb_open_desc: (%d) %s",
-			  __func__, ret, ftdi_get_error_string(la8->ftdic));
 		(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
-		ret = SR_ERR; /* TODO: More specific error? */
 		goto err_free_ftdic;
 	}
-	g_debug("la8: found device");
+	sr_dbg("la8: found device");
 
 	/* Register the device with libsigrok. */
-	sdi = sr_device_instance_new(0, SR_ST_INITIALIZING,
+	sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING,
 			USB_VENDOR_NAME, USB_MODEL_NAME, USB_MODEL_VERSION);
 	if (!sdi) {
-		g_warning("la8: %s: sr_device_instance_new failed", __func__);
-		ret = SR_ERR; /* TODO: More specific error? */
+		sr_err("la8: %s: sr_dev_inst_new failed", __func__);
 		goto err_close_ftdic;
 	}
 
 	sdi->priv = la8;
 
-	device_instances = g_slist_append(device_instances, sdi);
+	dev_insts = g_slist_append(dev_insts, sdi);
 
-	g_debug("la8: %s finished successfully", __func__);
+	sr_spew("la8: %s finished successfully", __func__);
 
 	/* Close device. We'll reopen it again when we need it. */
 	(void) la8_close(la8); /* Log, but ignore errors. */
 
-	// return SR_OK; /* TODO */
 	return 1;
 
 err_close_ftdic:
 	(void) la8_close(la8); /* Log, but ignore errors. */
 err_free_ftdic:
-	free(la8->ftdic);
+	free(la8->ftdic); /* NOT g_free()! */
 err_free_final_buf:
-	free(la8->final_buf);
-err_free_mangled_buf:
-	free(la8->mangled_buf);
+	g_free(la8->final_buf);
 err_free_la8:
-	free(la8);
+	g_free(la8);
 err_free_nothing:
-	// return ret; /* TODO */
+
 	return 0;
 }
 
-static int hw_opendev(int device_index)
+static int hw_opendev(int dev_index)
 {
 	int ret;
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	struct la8 *la8;
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
-		g_warning("la8: %s: sdi was NULL", __func__);
-		return SR_ERR;
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+		sr_err("la8: %s: sdi was NULL", __func__);
+		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
 
 	if (!(la8 = sdi->priv)) {
-		g_warning("la8: %s: sdi->priv was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: sdi->priv was NULL", __func__);
+		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
 
-	g_debug("la8: opening device");
+	sr_dbg("la8: opening device");
 
 	/* Open the device. */
 	if ((ret = ftdi_usb_open_desc(la8->ftdic, USB_VENDOR_ID,
 			USB_PRODUCT_ID, USB_DESCRIPTION, NULL)) < 0) {
-		g_warning("la8: %s: ftdi_usb_open_desc: (%d) %s",
-			  __func__, ret, ftdi_get_error_string(la8->ftdic));
+		sr_err("la8: %s: ftdi_usb_open_desc: (%d) %s",
+		       __func__, ret, ftdi_get_error_string(la8->ftdic));
 		(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
 		return SR_ERR;
 	}
-	g_debug("la8: device opened successfully");
+	sr_dbg("la8: device opened successfully");
 
 	/* Purge RX/TX buffers in the FTDI chip. */
 	if ((ret = ftdi_usb_purge_buffers(la8->ftdic)) < 0) {
-		g_warning("la8: %s: ftdi_usb_purge_buffers: (%d) %s",
-			  __func__, ret, ftdi_get_error_string(la8->ftdic));
+		sr_err("la8: %s: ftdi_usb_purge_buffers: (%d) %s",
+		       __func__, ret, ftdi_get_error_string(la8->ftdic));
 		(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
 		goto err_opendev_close_ftdic;
 	}
-	g_debug("la8: FTDI buffers purged successfully");
+	sr_dbg("la8: FTDI buffers purged successfully");
 
 	/* Enable flow control in the FTDI chip. */
 	if ((ret = ftdi_setflowctrl(la8->ftdic, SIO_RTS_CTS_HS)) < 0) {
-		g_warning("la8: %s: ftdi_setflowcontrol: (%d) %s",
-			  __func__, ret, ftdi_get_error_string(la8->ftdic));
+		sr_err("la8: %s: ftdi_setflowcontrol: (%d) %s",
+		       __func__, ret, ftdi_get_error_string(la8->ftdic));
 		(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
 		goto err_opendev_close_ftdic;
 	}
-	g_debug("la8: FTDI flow control enabled successfully");
+	sr_dbg("la8: FTDI flow control enabled successfully");
 
 	/* Wait 100ms. */
 	g_usleep(100 * 1000);
@@ -555,21 +608,21 @@ err_opendev_close_ftdic:
 	return SR_ERR;
 }
 
-static int set_samplerate(struct sr_device_instance *sdi, uint64_t samplerate)
+static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
 {
 	struct la8 *la8;
 
 	if (!sdi) {
-		g_warning("la8: %s: sdi was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: sdi was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (!(la8 = sdi->priv)) {
-		g_warning("la8: %s: sdi->priv was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: sdi->priv was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
-	g_debug("la8: setting samplerate");
+	sr_spew("la8: setting samplerate");
 
 	fill_supported_samplerates_if_needed();
 
@@ -580,87 +633,94 @@ static int set_samplerate(struct sr_device_instance *sdi, uint64_t samplerate)
 	/* Set the new samplerate. */
 	la8->cur_samplerate = samplerate;
 
-	g_debug("la8: samplerate set to %" PRIu64 "Hz", la8->cur_samplerate);
+	sr_dbg("la8: samplerate set to %" PRIu64 "Hz", la8->cur_samplerate);
 
 	return SR_OK;
 }
 
-static void hw_closedev(int device_index)
+static int hw_closedev(int dev_index)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	struct la8 *la8;
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
-		g_warning("la8: %s: sdi was NULL", __func__);
-		return;
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+		sr_err("la8: %s: sdi was NULL", __func__);
+		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
 
 	if (!(la8 = sdi->priv)) {
-		g_warning("la8: %s: sdi->priv was NULL", __func__);
-		return;
+		sr_err("la8: %s: sdi->priv was NULL", __func__);
+		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
 
-	g_debug("la8: closing device");
+	sr_dbg("la8: closing device");
 
 	if (sdi->status == SR_ST_ACTIVE) {
-		g_debug("la8: %s: status ACTIVE, closing device", __func__);
-		/* TODO: Handle or ignore errors here? */
+		sr_dbg("la8: %s: status ACTIVE, closing device", __func__);
+		/* TODO: Really ignore errors here, or return SR_ERR? */
 		(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
 	} else {
-		g_debug("la8: %s: status not ACTIVE, nothing to do", __func__);
+		sr_spew("la8: %s: status not ACTIVE, nothing to do", __func__);
 	}
 
 	sdi->status = SR_ST_INACTIVE;
+
+	sr_dbg("la8: %s: freeing sample buffers", __func__);
+	g_free(la8->final_buf);
+
+	return SR_OK;
 }
 
-static void hw_cleanup(void)
+static int hw_cleanup(void)
 {
 	GSList *l;
-	struct sr_device_instance *sdi;
-
-	g_debug("la8: entering %s", __func__);
+	struct sr_dev_inst *sdi;
+	int ret = SR_OK;
 
 	/* Properly close all devices. */
-	for (l = device_instances; l; l = l->next) {
-		if ((sdi = l->data) == NULL) {
-			g_warning("la8: %s: sdi was NULL", __func__);
+	for (l = dev_insts; l; l = l->next) {
+		if (!(sdi = l->data)) {
+			/* Log error, but continue cleaning up the rest. */
+			sr_err("la8: %s: sdi was NULL, continuing", __func__);
+			ret = SR_ERR_BUG;
 			continue;
 		}
-		if (sdi->priv != NULL)
-			free(sdi->priv);
-		else
-			g_warning("la8: %s: sdi->priv was NULL", __func__);
-		sr_device_instance_free(sdi); /* Returns void. */
-	}
-	g_slist_free(device_instances); /* Returns void. */
-	device_instances = NULL;
+		sr_dev_inst_free(sdi); /* Returns void. */
+	}
+	g_slist_free(dev_insts); /* Returns void. */
+	dev_insts = NULL;
+
+	return ret;
 }
 
-static void *hw_get_device_info(int device_index, int device_info_id)
+static void *hw_get_dev_info(int dev_index, int dev_info_id)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	struct la8 *la8;
 	void *info;
 
-	g_debug("la8: entering %s", __func__);
+	sr_spew("la8: entering %s", __func__);
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
-		g_warning("la8: %s: sdi was NULL", __func__);
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+		sr_err("la8: %s: sdi was NULL", __func__);
 		return NULL;
 	}
 
 	if (!(la8 = sdi->priv)) {
-		g_warning("la8: %s: sdi->priv was NULL", __func__);
+		sr_err("la8: %s: sdi->priv was NULL", __func__);
 		return NULL;
 	}
 
-	switch (device_info_id) {
-	case SR_DI_INSTANCE:
+	switch (dev_info_id) {
+	case SR_DI_INST:
 		info = sdi;
 		break;
 	case SR_DI_NUM_PROBES:
 		info = GINT_TO_POINTER(NUM_PROBES);
 		break;
+	case SR_DI_PROBE_NAMES:
+		info = probe_names;
+		break;
 	case SR_DI_SAMPLERATES:
 		fill_supported_samplerates_if_needed();
 		info = &samplerates;
@@ -673,7 +733,7 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 		break;
 	default:
 		/* Unknown device info ID, return NULL. */
-		g_warning("la8: %s: Unknown device info ID", __func__);
+		sr_err("la8: %s: Unknown device info ID", __func__);
 		info = NULL;
 		break;
 	}
@@ -681,75 +741,75 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 	return info;
 }
 
-static int hw_get_status(int device_index)
+static int hw_get_status(int dev_index)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
-		g_warning("la8: %s: sdi was NULL, device not found", __func__);
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+		sr_err("la8: %s: sdi was NULL, device not found", __func__);
 		return SR_ST_NOT_FOUND;
 	}
 
-	g_debug("la8: %s: returning status %d", __func__, sdi->status);
+	sr_dbg("la8: %s: returning status %d", __func__, sdi->status);
 
 	return sdi->status;
 }
 
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
 {
-	g_debug("la8: entering %s", __func__);
+	sr_spew("la8: entering %s", __func__);
 
-	return capabilities;
+	return hwcaps;
 }
 
-static int hw_set_configuration(int device_index, int capability, void *value)
+static int hw_set_configuration(int dev_index, int hwcap, void *value)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	struct la8 *la8;
 
-	g_debug("la8: entering %s", __func__);
+	sr_spew("la8: entering %s", __func__);
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
-		g_warning("la8: %s: sdi was NULL", __func__);
-		return SR_ERR;
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+		sr_err("la8: %s: sdi was NULL", __func__);
+		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
 
 	if (!(la8 = sdi->priv)) {
-		g_warning("la8: %s: sdi->priv was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: sdi->priv was NULL", __func__);
+		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
 
-	switch (capability) {
+	switch (hwcap) {
 	case SR_HWCAP_SAMPLERATE:
 		if (set_samplerate(sdi, *(uint64_t *)value) == SR_ERR)
 			return SR_ERR;
-		g_debug("la8: SAMPLERATE = %" PRIu64, la8->cur_samplerate);
+		sr_dbg("la8: SAMPLERATE = %" PRIu64, la8->cur_samplerate);
 		break;
 	case SR_HWCAP_PROBECONFIG:
-		/* Nothing to do, but this entry must exist. Fix this. */
-		/* TODO? */
-		g_debug("la8: %s: SR_HWCAP_PROBECONFIG called", __func__);
-		return SR_OK;
+		if (configure_probes(la8, (GSList *)value) != SR_OK) {
+			sr_err("la8: %s: probe config failed", __func__);
+			return SR_ERR;
+		}
 		break;
 	case SR_HWCAP_LIMIT_MSEC:
 		if (*(uint64_t *)value == 0) {
-			g_warning("la8: %s: LIMIT_MSEC can't be 0", __func__);
+			sr_err("la8: %s: LIMIT_MSEC can't be 0", __func__);
 			return SR_ERR;
 		}
 		la8->limit_msec = *(uint64_t *)value;
-		g_debug("la8: LIMIT_MSEC = %" PRIu64, la8->limit_msec);
+		sr_dbg("la8: LIMIT_MSEC = %" PRIu64, la8->limit_msec);
 		break;
 	case SR_HWCAP_LIMIT_SAMPLES:
 		if (*(uint64_t *)value < MIN_NUM_SAMPLES) {
-			g_warning("la8: %s: LIMIT_SAMPLES too small", __func__);
+			sr_err("la8: %s: LIMIT_SAMPLES too small", __func__);
 			return SR_ERR;
 		}
 		la8->limit_samples = *(uint64_t *)value;
-		g_debug("la8: LIMIT_SAMPLES = %" PRIu64, la8->limit_samples);
+		sr_dbg("la8: LIMIT_SAMPLES = %" PRIu64, la8->limit_samples);
 		break;
 	default:
 		/* Unknown capability, return SR_ERR. */
-		g_warning("la8: %s: Unknown capability", __func__);
+		sr_err("la8: %s: Unknown capability", __func__);
 		return SR_ERR;
 		break;
 	}
@@ -758,7 +818,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 }
 
 /**
- * Get a block of 4096 bytes of data from the LA8.
+ * Get a block of data from the LA8.
  *
  * @param la8 The LA8 struct containing private per-device-instance data.
  * @return SR_OK upon success, or SR_ERR upon errors.
@@ -769,42 +829,42 @@ static int la8_read_block(struct la8 *la8)
 	time_t now;
 
 	if (!la8) {
-		g_warning("la8: %s: la8 was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8 was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	if (!la8->ftdic) {
-		g_warning("la8: %s: la8->ftdic was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8->ftdic was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
-	// g_debug("la8: %s: reading block %d", __func__, la8->block_counter);
+	sr_spew("la8: %s: reading block %d", __func__, la8->block_counter);
 
-	bytes_read = la8_read(la8, la8->mangled_buf, 4096);
+	bytes_read = la8_read(la8, la8->mangled_buf, BS);
 
 	/* If first block read got 0 bytes, retry until success or timeout. */
 	if ((bytes_read == 0) && (la8->block_counter == 0)) {
 		do {
-			// g_debug("la8: %s: reading block 0 again", __func__);
-			bytes_read = la8_read(la8, la8->mangled_buf, 4096);
+			sr_spew("la8: %s: reading block 0 again", __func__);
+			bytes_read = la8_read(la8, la8->mangled_buf, BS);
 			/* TODO: How to handle read errors here? */
 			now = time(NULL);
 		} while ((la8->done > now) && (bytes_read == 0));
 	}
 
 	/* Check if block read was successful or a timeout occured. */
-	if (bytes_read != 4096) {
-		g_warning("la8: %s: trigger timed out", __func__);
+	if (bytes_read != BS) {
+		sr_err("la8: %s: trigger timed out", __func__);
 		(void) la8_reset(la8); /* Ignore errors. */
 		return SR_ERR;
 	}
 
 	/* De-mangle the data. */
-	// g_debug("la8: de-mangling samples of block %d", la8->block_counter);
-	byte_offset = la8->block_counter * 4096;
+	sr_spew("la8: de-mangling samples of block %d", la8->block_counter);
+	byte_offset = la8->block_counter * BS;
 	m = byte_offset / (1024 * 1024);
 	mi = m * (1024 * 1024);
-	for (i = 0; i < 4096; i++) {
+	for (i = 0; i < BS; i++) {
 		p = i & (1 << 0);
 		index = m * 2 + (((byte_offset + i) - mi) / 2) * 16;
 		index += (la8->divcount == 0) ? p : (1 - p);
@@ -814,87 +874,173 @@ static int la8_read_block(struct la8 *la8)
 	return SR_OK;
 }
 
-static int receive_data(int fd, int revents, void *user_data)
+static void send_block_to_session_bus(struct la8 *la8, int block)
 {
-	int i, ret;
-	struct sr_device_instance *sdi;
+	int i;
+	uint8_t sample, expected_sample;
 	struct sr_datafeed_packet packet;
+	struct sr_datafeed_logic logic;
+	int trigger_point; /* Relative trigger point (in this block). */
+
+	/* Note: No sanity checks on la8/block, caller is responsible. */
+
+	/* Check if we can find the trigger condition in this block. */
+	trigger_point = -1;
+	expected_sample = la8->trigger_pattern & la8->trigger_mask;
+	for (i = 0; i < BS; i++) {
+		/* Don't continue if the trigger was found previously. */
+		if (la8->trigger_found)
+			break;
+
+		/*
+		 * Also, don't continue if triggers are "don't care", i.e. if
+		 * no trigger conditions were specified by the user. In that
+		 * case we don't want to send an SR_DF_TRIGGER packet at all.
+		 */
+		if (la8->trigger_mask == 0x00)
+			break;
+
+		sample = *(la8->final_buf + (block * BS) + i);
+
+		if ((sample & la8->trigger_mask) == expected_sample) {
+			trigger_point = i;
+			la8->trigger_found = 1;
+			break;
+		}
+	}
+
+	/* If no trigger was found, send one SR_DF_LOGIC packet. */
+	if (trigger_point == -1) {
+		/* Send an SR_DF_LOGIC packet to the session bus. */
+		sr_spew("la8: sending SR_DF_LOGIC packet (%d bytes) for "
+		        "block %d", BS, block);
+		packet.type = SR_DF_LOGIC;
+		packet.payload = &logic;
+		logic.length = BS;
+		logic.unitsize = 1;
+		logic.data = la8->final_buf + (block * BS);
+		sr_session_bus(la8->session_id, &packet);
+		return;
+	}
+
+	/*
+	 * We found the trigger, so some special handling is needed. We have
+	 * to send an SR_DF_LOGIC packet with the samples before the trigger
+	 * (if any), then the SD_DF_TRIGGER packet itself, then another
+	 * SR_DF_LOGIC packet with the samples after the trigger (if any).
+	 */
+
+	/* TODO: Send SR_DF_TRIGGER packet before or after the actual sample? */
+
+	/* If at least one sample is located before the trigger... */
+	if (trigger_point > 0) {
+		/* Send pre-trigger SR_DF_LOGIC packet to the session bus. */
+		sr_spew("la8: sending pre-trigger SR_DF_LOGIC packet, "
+			"start = %d, length = %d", block * BS, trigger_point);
+		packet.type = SR_DF_LOGIC;
+		packet.payload = &logic;
+		logic.length = trigger_point;
+		logic.unitsize = 1;
+		logic.data = la8->final_buf + (block * BS);
+		sr_session_bus(la8->session_id, &packet);
+	}
+
+	/* Send the SR_DF_TRIGGER packet to the session bus. */
+	sr_spew("la8: sending SR_DF_TRIGGER packet, sample = %d",
+		(block * BS) + trigger_point);
+	packet.type = SR_DF_TRIGGER;
+	packet.payload = NULL;
+	sr_session_bus(la8->session_id, &packet);
+
+	/* If at least one sample is located after the trigger... */
+	if (trigger_point < (BS - 1)) {
+		/* Send post-trigger SR_DF_LOGIC packet to the session bus. */
+		sr_spew("la8: sending post-trigger SR_DF_LOGIC packet, "
+			"start = %d, length = %d",
+			(block * BS) + trigger_point, BS - trigger_point);
+		packet.type = SR_DF_LOGIC;
+		packet.payload = &logic;
+		logic.length = BS - trigger_point;
+		logic.unitsize = 1;
+		logic.data = la8->final_buf + (block * BS) + trigger_point;
+		sr_session_bus(la8->session_id, &packet);
+	}
+}
+
+static int receive_data(int fd, int revents, void *session_data)
+{
+	int i, ret;
+	struct sr_dev_inst *sdi;
 	struct la8 *la8;
 
 	/* Avoid compiler errors. */
-	fd = fd;
-	revents = revents;
+	(void)fd;
+	(void)revents;
 
-	if (!(sdi = user_data)) {
-		g_warning("la8: %s: user_data was NULL", __func__);
+	if (!(sdi = session_data)) {
+		sr_err("la8: %s: session_data was NULL", __func__);
 		return FALSE;
 	}
 
 	if (!(la8 = sdi->priv)) {
-		g_warning("la8: %s: sdi->priv was NULL", __func__);
+		sr_err("la8: %s: sdi->priv was NULL", __func__);
 		return FALSE;
 	}
 
-	/* Get one block of data (4096 bytes). */
+	/* Get one block of data. */
 	if ((ret = la8_read_block(la8)) < 0) {
-		g_warning("la8: %s: la8_read_block error: %d", __func__, ret);
+		sr_err("la8: %s: la8_read_block error: %d", __func__, ret);
+		hw_stop_acquisition(sdi->index, session_data);
 		return FALSE;
 	}
 
-	/* We need to get exactly 2048 blocks (i.e. 8MB) of data. */
-	if (la8->block_counter != 2047) {
+	/* We need to get exactly NUM_BLOCKS blocks (i.e. 8MB) of data. */
+	if (la8->block_counter != (NUM_BLOCKS - 1)) {
 		la8->block_counter++;
 		return TRUE;
 	}
 
-	g_debug("la8: sampling finished, sending data to session bus now");
+	sr_dbg("la8: sampling finished, sending data to session bus now");
 
 	/* All data was received and demangled, send it to the session bus. */
-	for (i = 0; i < 2048; i++) {
-		/* Send a 4096 byte SR_DF_LOGIC packet to the session bus. */
-		// g_debug("la8: %s: sending SR_DF_LOGIC packet", __func__);
-		packet.type = SR_DF_LOGIC;
-		packet.length = 4096;
-		packet.unitsize = 1;
-		packet.payload = la8->final_buf + (i * 4096);
-		sr_session_bus(la8->session_id, &packet);
-	}
+	for (i = 0; i < NUM_BLOCKS; i++)
+		send_block_to_session_bus(la8, i);
 
-	hw_stop_acquisition(sdi->index, user_data);
+	hw_stop_acquisition(sdi->index, session_data);
 
 	// return FALSE; /* FIXME? */
 	return TRUE;
 }
 
-static int hw_start_acquisition(int device_index, gpointer session_device_id)
+static int hw_start_acquisition(int dev_index, gpointer session_data)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	struct la8 *la8;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
 	uint8_t buf[4];
 	int bytes_written;
 
-	g_debug("la8: entering %s", __func__);
+	sr_spew("la8: entering %s", __func__);
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
-		g_warning("la8: %s: sdi was NULL", __func__);
-		return SR_ERR;
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+		sr_err("la8: %s: sdi was NULL", __func__);
+		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
 
 	if (!(la8 = sdi->priv)) {
-		g_warning("la8: %s: sdi->priv was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: sdi->priv was NULL", __func__);
+		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
 
 	if (!la8->ftdic) {
-		g_warning("la8: %s: la8->ftdic was NULL", __func__);
-		return SR_ERR;
+		sr_err("la8: %s: la8->ftdic was NULL", __func__);
+		return SR_ERR_ARG;
 	}
 
 	la8->divcount = samplerate_to_divcount(la8->cur_samplerate);
 	if (la8->divcount == 0xff) {
-		g_warning("la8: %s: invalid divcount/samplerate", __func__);
+		sr_err("la8: %s: invalid divcount/samplerate", __func__);
 		return SR_ERR;
 	}
 
@@ -908,35 +1054,32 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	bytes_written = la8_write(la8, buf, 4);
 
 	if (bytes_written < 0) {
-		g_warning("la8: acquisition failed to start");
+		sr_err("la8: acquisition failed to start");
 		return SR_ERR;
 	} else if (bytes_written != 4) {
-		g_warning("la8: acquisition failed to start");
+		sr_err("la8: acquisition failed to start");
 		return SR_ERR; /* TODO: Other error and return code? */
 	}
 
-	g_debug("la8: acquisition started successfully");
+	sr_dbg("la8: acquisition started successfully");
 
-	la8->session_id = session_device_id;
+	la8->session_id = session_data;
 
 	/* Send header packet to the session bus. */
-	g_debug("la8: %s: sending SR_DF_HEADER", __func__);
+	sr_dbg("la8: %s: sending SR_DF_HEADER", __func__);
 	packet.type = SR_DF_HEADER;
-	packet.length = sizeof(struct sr_datafeed_header);
-	packet.unitsize = 0;
 	packet.payload = &header;
 	header.feed_version = 1;
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = la8->cur_samplerate;
-	header.protocol_id = SR_PROTO_RAW;
-	header.num_logic_probes = la8->num_probes;
-	header.num_analog_probes = 0;
-	sr_session_bus(session_device_id, &packet);
+	header.num_logic_probes = NUM_PROBES;
+	sr_session_bus(session_data, &packet);
 
 	/* Time when we should be done (for detecting trigger timeouts). */
 	la8->done = (la8->divcount + 1) * 0.08388608 + time(NULL)
 			+ la8->trigger_timeout;
 	la8->block_counter = 0;
+	la8->trigger_found = 0;
 
 	/* Hook up a dummy handler to receive data from the LA8. */
 	sr_source_add(-1, G_IO_IN, 0, receive_data, sdi);
@@ -944,47 +1087,43 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	return SR_OK;
 }
 
-static void hw_stop_acquisition(int device_index, gpointer session_device_id)
+static int hw_stop_acquisition(int dev_index, gpointer session_data)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	struct la8 *la8;
 	struct sr_datafeed_packet packet;
 
-	g_debug("la8: stopping acquisition");
+	sr_dbg("la8: stopping acquisition");
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
-		g_warning("la8: %s: sdi was NULL", __func__);
-		return;
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+		sr_err("la8: %s: sdi was NULL", __func__);
+		return SR_ERR_BUG;
 	}
 
 	if (!(la8 = sdi->priv)) {
-		g_warning("la8: %s: sdi->priv was NULL", __func__);
-		return;
+		sr_err("la8: %s: sdi->priv was NULL", __func__);
+		return SR_ERR_BUG;
 	}
 
-	/* Reset the LA8 sequencer and close the device. */
-	(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
-
 	/* Send end packet to the session bus. */
-	g_debug("la8: %s: sending SR_DF_END", __func__);
+	sr_dbg("la8: %s: sending SR_DF_END", __func__);
 	packet.type = SR_DF_END;
-	packet.length = 0;
-	packet.unitsize = 0;
-	packet.payload = NULL;
-	sr_session_bus(session_device_id, &packet);
+	sr_session_bus(session_data, &packet);
+
+	return SR_OK;
 }
 
-struct sr_device_plugin chronovu_la8_plugin_info = {
+SR_PRIV struct sr_dev_plugin chronovu_la8_plugin_info = {
 	.name = "chronovu-la8",
 	.longname = "ChronoVu LA8",
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
-	.open = hw_opendev,
-	.close = hw_closedev,
-	.get_device_info = hw_get_device_info,
+	.opendev = hw_opendev,
+	.closedev = hw_closedev,
+	.get_dev_info = hw_get_dev_info,
 	.get_status = hw_get_status,
-	.get_capabilities = hw_get_capabilities,
+	.hwcap_get_all = hw_hwcap_get_all,
 	.set_configuration = hw_set_configuration,
 	.start_acquisition = hw_start_acquisition,
 	.stop_acquisition = hw_stop_acquisition,