X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Flink-mso19.c;h=98e1507b939a0981f8e7aa559a4169f01177e34d;hb=a7d05fcb388f142012035a0ed31bcf74d42bbe73;hp=8b06151a3cbbca2a63943559689743e979081691;hpb=42eb54fb62b84adb5aaa4bf9144752e46ade54ea;p=libsigrok.git

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 8b06151a..98e1507b 100644
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -2,6 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com>
+ * Copyright (C) 2012 Renato Caldas <rmsc@fe.up.pt>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +30,6 @@
 #include <arpa/inet.h>
 #include "sigrok.h"
 #include "sigrok-internal.h"
-#include "config.h"
 #include "link-mso19.h"
 
 #define USB_VENDOR "3195"
@@ -37,7 +37,7 @@
 
 #define NUM_PROBES 8
 
-static int capabilities[] = {
+static int hwcaps[] = {
 	SR_HWCAP_LOGIC_ANALYZER,
 //	SR_HWCAP_OSCILLOSCOPE,
 //	SR_HWCAP_PAT_GENERATOR,
@@ -91,10 +91,10 @@ static struct sr_samplerates samplerates = {
 	supported_samplerates,
 };
 
-static GSList *device_instances = NULL;
+static GSList *dev_insts = NULL;
 
-static int mso_send_control_message(struct sr_device_instance *sdi,
-		uint16_t payload[], int n)
+static int mso_send_control_message(struct sr_dev_inst *sdi,
+				    uint16_t payload[], int n)
 {
 	int fd = sdi->serial->fd;
 	int i, w, ret, s = n * 2 + sizeof(mso_head) + sizeof(mso_foot);
@@ -137,49 +137,52 @@ ret:
 	return ret;
 }
 
-static int mso_reset_adc(struct sr_device_instance *sdi)
+static int mso_reset_adc(struct sr_dev_inst *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[2];
 
-	ops[0] = mso_trans(REG_CTL, (mso->ctlbase | BIT_CTL_RESETADC));
-	ops[1] = mso_trans(REG_CTL, mso->ctlbase);
-	mso->ctlbase |= BIT_CTL_ADC_UNKNOWN4;
+	ops[0] = mso_trans(REG_CTL1, (mso->ctlbase1 | BIT_CTL1_RESETADC));
+	ops[1] = mso_trans(REG_CTL1, mso->ctlbase1);
+	mso->ctlbase1 |= BIT_CTL1_ADC_UNKNOWN4;
 
+	sr_dbg("mso19: Requesting ADC reset");
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_reset_fsm(struct sr_device_instance *sdi)
+static int mso_reset_fsm(struct sr_dev_inst *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[1];
 
-	mso->ctlbase |= BIT_CTL_RESETFSM;
-	ops[0] = mso_trans(REG_CTL, mso->ctlbase);
+	mso->ctlbase1 |= BIT_CTL1_RESETFSM;
+	ops[0] = mso_trans(REG_CTL1, mso->ctlbase1);
 
+	sr_dbg("mso19: Requesting ADC reset");
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_toggle_led(struct sr_device_instance *sdi, int state)
+static int mso_toggle_led(struct sr_dev_inst *sdi, int state)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[1];
 
-	mso->ctlbase &= BIT_CTL_LED;
+	mso->ctlbase1 &= ~BIT_CTL1_LED;
 	if (state)
-		mso->ctlbase |= BIT_CTL_LED;
-	ops[0] = mso_trans(REG_CTL, mso->ctlbase);
+		mso->ctlbase1 |= BIT_CTL1_LED;
+	ops[0] = mso_trans(REG_CTL1, mso->ctlbase1);
 
+	sr_dbg("mso19: Requesting LED toggle");
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_check_trigger(struct sr_device_instance *sdi,
-		uint8_t *info)
+static int mso_check_trigger(struct sr_dev_inst *sdi, uint8_t *info)
 {
 	uint16_t ops[] = { mso_trans(REG_TRIGGER, 0) };
 	char buf[1];
 	int ret;
 
+	sr_dbg("mso19: Requesting trigger state");
 	ret = mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 	if (info == NULL || ret != SR_OK)
 		return ret;
@@ -189,63 +192,68 @@ static int mso_check_trigger(struct sr_device_instance *sdi,
 		ret = SR_ERR;
 	*info = buf[0];
 
+	sr_dbg("mso19: Trigger state is: 0x%x", *info);
 	return ret;
 }
 
-static int mso_read_buffer(struct sr_device_instance *sdi)
+static int mso_read_buffer(struct sr_dev_inst *sdi)
 {
 	uint16_t ops[] = { mso_trans(REG_BUFFER, 0) };
 
+	sr_dbg("mso19: Requesting buffer dump");
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_arm(struct sr_device_instance *sdi)
+static int mso_arm(struct sr_dev_inst *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[] = {
-		mso_trans(REG_CTL, mso->ctlbase | BIT_CTL_RESETFSM),
-		mso_trans(REG_CTL, mso->ctlbase | BIT_CTL_ARM),
-		mso_trans(REG_CTL, mso->ctlbase),
+		mso_trans(REG_CTL1, mso->ctlbase1 | BIT_CTL1_RESETFSM),
+		mso_trans(REG_CTL1, mso->ctlbase1 | BIT_CTL1_ARM),
+		mso_trans(REG_CTL1, mso->ctlbase1),
 	};
 
+	sr_dbg("mso19: Requesting trigger arm");
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_force_capture(struct sr_device_instance *sdi)
+static int mso_force_capture(struct sr_dev_inst *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[] = {
-		mso_trans(REG_CTL, mso->ctlbase | 8),
-		mso_trans(REG_CTL, mso->ctlbase),
+		mso_trans(REG_CTL1, mso->ctlbase1 | 8),
+		mso_trans(REG_CTL1, mso->ctlbase1),
 	};
 
+	sr_dbg("mso19: Requesting forced capture");
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_dac_out(struct sr_device_instance *sdi, uint16_t val)
+static int mso_dac_out(struct sr_dev_inst *sdi, uint16_t val)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[] = {
 		mso_trans(REG_DAC1, (val >> 8) & 0xff),
 		mso_trans(REG_DAC2, val & 0xff),
-		mso_trans(REG_CTL, mso->ctlbase | BIT_CTL_RESETADC),
+		mso_trans(REG_CTL1, mso->ctlbase1 | BIT_CTL1_RESETADC),
 	};
 
+	sr_dbg("mso19: Setting dac word to 0x%x", val);
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_clkrate_out(struct sr_device_instance *sdi, uint16_t val)
+static int mso_clkrate_out(struct sr_dev_inst *sdi, uint16_t val)
 {
 	uint16_t ops[] = {
 		mso_trans(REG_CLKRATE1, (val >> 8) & 0xff),
 		mso_trans(REG_CLKRATE2, val & 0xff),
 	};
 
+	sr_dbg("mso19: Setting clkrate word to 0x%x", val);
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_configure_rate(struct sr_device_instance *sdi,
-		uint32_t rate)
+static int mso_configure_rate(struct sr_dev_inst *sdi, uint32_t rate)
 {
 	struct mso *mso = sdi->priv;
 	unsigned int i;
@@ -253,7 +261,7 @@ static int mso_configure_rate(struct sr_device_instance *sdi,
 
 	for (i = 0; i < ARRAY_SIZE(rate_map); i++) {
 		if (rate_map[i].rate == rate) {
-			mso->slowmode = rate_map[i].slowmode;
+			mso->ctlbase2 = rate_map[i].slowmode;
 			ret = mso_clkrate_out(sdi, rate_map[i].val);
 			if (ret == SR_OK)
 				mso->cur_rate = rate;
@@ -270,7 +278,7 @@ static inline uint16_t mso_calc_raw_from_mv(struct mso *mso)
 			 mso->vbit));
 }
 
-static int mso_configure_trigger(struct sr_device_instance *sdi)
+static int mso_configure_trigger(struct sr_dev_inst *sdi)
 {
 	struct mso *mso = sdi->priv;
 	uint16_t ops[16];
@@ -323,24 +331,26 @@ static int mso_configure_trigger(struct sr_device_instance *sdi)
 	ops[3] = mso_trans(4, (dso_trigger >> 8) & 0xff);
 	ops[4] = mso_trans(11,
 			mso->dso_trigger_width / SR_HZ_TO_NS(mso->cur_rate));
-	ops[5] = mso_trans(15, (2 | mso->slowmode));
-
-	/* FIXME SPI/I2C Triggers */
-	ops[6] = mso_trans(0, 0);
-	ops[7] = mso_trans(1, 0);
-	ops[8] = mso_trans(2, 0);
-	ops[9] = mso_trans(3, 0);
-	ops[10] = mso_trans(4, 0xff);
-	ops[11] = mso_trans(5, 0xff);
-	ops[12] = mso_trans(6, 0xff);
-	ops[13] = mso_trans(7, 0xff);
-	ops[14] = mso_trans(8, mso->trigger_spimode);
-	ops[15] = mso_trans(15, mso->slowmode);
+
+	/* Select the SPI/I2C trigger config bank */
+	ops[5] = mso_trans(REG_CTL2, (mso->ctlbase2 | BITS_CTL2_BANK(2)));
+	/* Configure the SPI/I2C protocol trigger */
+	ops[6] = mso_trans(REG_PT_WORD(0), mso->protocol_trigger.word[0]);
+	ops[7] = mso_trans(REG_PT_WORD(1), mso->protocol_trigger.word[1]);
+	ops[8] = mso_trans(REG_PT_WORD(2), mso->protocol_trigger.word[2]);
+	ops[9] = mso_trans(REG_PT_WORD(3), mso->protocol_trigger.word[3]);
+	ops[10] = mso_trans(REG_PT_MASK(0), mso->protocol_trigger.mask[0]);
+	ops[11] = mso_trans(REG_PT_MASK(1), mso->protocol_trigger.mask[1]);
+	ops[12] = mso_trans(REG_PT_MASK(2), mso->protocol_trigger.mask[2]);
+	ops[13] = mso_trans(REG_PT_MASK(3), mso->protocol_trigger.mask[3]);
+	ops[14] = mso_trans(REG_PT_SPIMODE, mso->protocol_trigger.spimode);
+	/* Select the default config bank */
+	ops[15] = mso_trans(REG_CTL2, mso->ctlbase2);
 
 	return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops));
 }
 
-static int mso_configure_threshold_level(struct sr_device_instance *sdi)
+static int mso_configure_threshold_level(struct sr_dev_inst *sdi)
 {
 	struct mso *mso = sdi->priv;
 
@@ -348,7 +358,7 @@ static int mso_configure_threshold_level(struct sr_device_instance *sdi)
 }
 
 static int mso_parse_serial(const char *iSerial, const char *iProduct,
-		struct mso *mso)
+			    struct mso *mso)
 {
 	unsigned int u1, u2, u3, u4, u5, u6;
 
@@ -386,16 +396,16 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct,
 	return SR_OK;
 }
 
-static int hw_init(const char *deviceinfo)
+static int hw_init(const char *devinfo)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	int devcnt = 0;
 	struct udev *udev;
 	struct udev_enumerate *enumerate;
-	struct udev_list_entry *devices, *dev_list_entry;
+	struct udev_list_entry *devs, *dev_list_entry;
 	struct mso *mso;
 
-	deviceinfo = deviceinfo;
+	devinfo = devinfo;
 
 	/* It's easier to map usb<->serial using udev */
 	/*
@@ -404,14 +414,14 @@ static int hw_init(const char *deviceinfo)
 	 */
 	udev = udev_new();
 	if (!udev) {
-		sr_warn("Failed to initialize udev.");
+		sr_err("mso19: Failed to initialize udev.");
 		goto ret;
 	}
 	enumerate = udev_enumerate_new(udev);
 	udev_enumerate_add_match_subsystem(enumerate, "usb-serial");
 	udev_enumerate_scan_devices(enumerate);
-	devices = udev_enumerate_get_list_entry(enumerate);
-	udev_list_entry_foreach(dev_list_entry, devices) {
+	devs = udev_enumerate_get_list_entry(enumerate);
+	udev_list_entry_foreach(dev_list_entry, devs) {
 		const char *syspath, *sysname, *idVendor, *idProduct,
 			*iSerial, *iProduct;
 		char path[32], manufacturer[32], product[32], hwrev[32];
@@ -424,8 +434,8 @@ static int hw_init(const char *deviceinfo)
 		parent = udev_device_get_parent_with_subsystem_devtype(
 				dev, "usb", "usb_device");
 		if (!parent) {
-			sr_warn("Unable to find parent usb device for %s",
-				sysname);
+			sr_err("mso19: Unable to find parent usb device for %s",
+			       sysname);
 			continue;
 		}
 
@@ -443,7 +453,7 @@ static int hw_init(const char *deviceinfo)
 		s = strcspn(iProduct, " ");
 		if (s > sizeof(product) ||
 				strlen(iProduct) - s > sizeof(manufacturer)) {
-			sr_warn("Could not parse iProduct: %s", iProduct);
+			sr_err("mso19: Could not parse iProduct: %s", iProduct);
 			continue;
 		}
 		strncpy(product, iProduct, s);
@@ -456,36 +466,46 @@ static int hw_init(const char *deviceinfo)
 		}
 
 		if (mso_parse_serial(iSerial, iProduct, mso) != SR_OK) {
-			sr_warn("Invalid iSerial: %s", iSerial);
+			sr_err("mso19: Invalid iSerial: %s", iSerial);
 			goto err_free_mso;
 		}
 		sprintf(hwrev, "r%d", mso->hwrev);
+
 		/* hardware initial state */
-		mso->ctlbase = 0;
+		mso->ctlbase1 = 0;
+		{
+			/* Initialize the protocol trigger configuration */
+			int i;
+			for (i = 0; i < 4; i++) {
+				mso->protocol_trigger.word[i] = 0;
+				mso->protocol_trigger.mask[i] = 0xff;
+			}
+			mso->protocol_trigger.spimode = 0;
+		}
 
-		sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING,
-			manufacturer, product, hwrev);
+		sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
+				      manufacturer, product, hwrev);
 		if (!sdi) {
-			sr_warn("Unable to create device instance for %s",
-				sysname);
+			sr_err("mso19: Unable to create device instance for %s",
+			       sysname);
 			goto err_free_mso;
 		}
 
 		/* save a pointer to our private instance data */
 		sdi->priv = mso;
 
-		sdi->serial = sr_serial_device_instance_new(path, -1);
+		sdi->serial = sr_serial_dev_inst_new(path, -1);
 		if (!sdi->serial)
-			goto err_device_instance_free;
+			goto err_dev_inst_free;
 
-		device_instances = g_slist_append(device_instances, sdi);
+		dev_insts = g_slist_append(dev_insts, sdi);
 		devcnt++;
 		continue;
 
-err_device_instance_free:
-		sr_device_instance_free(sdi);
+err_dev_inst_free:
+		sr_dev_inst_free(sdi);
 err_free_mso:
-		free(mso);
+		g_free(mso);
 	}
 
 	udev_enumerate_unref(enumerate);
@@ -495,31 +515,38 @@ ret:
 	return devcnt;
 }
 
-static void hw_cleanup(void)
+static int hw_cleanup(void)
 {
 	GSList *l;
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
+	int ret;
 
+	ret = SR_OK;
 	/* Properly close all devices. */
-	for (l = device_instances; l; l = l->next) {
-		sdi = l->data;
+	for (l = dev_insts; l; l = l->next) {
+		if (!(sdi = l->data)) {
+			/* Log error, but continue cleaning up the rest. */
+			sr_err("mso19: %s: sdi was NULL, continuing", __func__);
+			ret = SR_ERR_BUG;
+			continue;
+		}
 		if (sdi->serial->fd != -1)
 			serial_close(sdi->serial->fd);
-		if (sdi->priv != NULL)
-			free(sdi->priv);
-		sr_device_instance_free(sdi);
+		sr_dev_inst_free(sdi);
 	}
-	g_slist_free(device_instances);
-	device_instances = NULL;
+	g_slist_free(dev_insts);
+	dev_insts = NULL;
+
+	return ret;
 }
 
-static int hw_opendev(int device_index)
+static int hw_opendev(int dev_index)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	struct mso *mso;
 	int ret = SR_ERR;
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return ret;
 
 	mso = sdi->priv;
@@ -536,28 +563,30 @@ static int hw_opendev(int device_index)
 	/* FIXME: discard serial buffer */
 
 	mso_check_trigger(sdi, &mso->trigger_state);
-//	sr_warn("trigger state: %c", mso->trigger_state);
+	sr_dbg("mso19: trigger state: 0x%x", mso->trigger_state);
 
 	ret = mso_reset_adc(sdi);
 	if (ret != SR_OK)
 		return ret;
 
 	mso_check_trigger(sdi, &mso->trigger_state);
-//	sr_warn("trigger state: %c", mso->trigger_state);
+	sr_dbg("mso19: trigger state: 0x%x", mso->trigger_state);
 
 //	ret = mso_reset_fsm(sdi);
 //	if (ret != SR_OK)
 //		return ret;
 
+	sr_dbg("mso19: Finished %s", __func__);
+
 //	return SR_ERR;
 	return SR_OK;
 }
 
-static int hw_closedev(int device_index)
+static int hw_closedev(int dev_index)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
 		sr_err("mso19: %s: sdi was NULL", __func__);
 		return SR_ERR; /* TODO: SR_ERR_ARG? */
 	}
@@ -569,21 +598,22 @@ static int hw_closedev(int device_index)
 		sdi->status = SR_ST_INACTIVE;
 	}
 
+	sr_dbg("mso19: finished %s", __func__);
 	return SR_OK;
 }
 
-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 mso *mso;
 	void *info = NULL;
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return NULL;
 	mso = sdi->priv;
 
-	switch (device_info_id) {
-	case SR_DI_INSTANCE:
+	switch (dev_info_id) {
+	case SR_DI_INST:
 		info = sdi;
 		break;
 	case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */
@@ -605,29 +635,29 @@ 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)))
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return SR_ST_NOT_FOUND;
 
 	return sdi->status;
 }
 
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
 {
-	return capabilities;
+	return hwcaps;
 }
 
-static int hw_set_configuration(int device_index, int capability, void *value)
+static int hw_config_set(int dev_index, int hwcap, void *value)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return SR_ERR;
 
-	switch (capability) {
+	switch (hwcap) {
 	case SR_HWCAP_SAMPLERATE:
 		return mso_configure_rate(sdi, *(uint64_t *) value);
 	case SR_HWCAP_PROBECONFIG:
@@ -648,7 +678,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 /* FIXME: Pass errors? */
 static int receive_data(int fd, int revents, void *user_data)
 {
-	struct sr_device_instance *sdi = user_data;
+	struct sr_dev_inst *sdi = user_data;
 	struct mso *mso = sdi->priv;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
@@ -713,15 +743,15 @@ static int receive_data(int fd, int revents, void *user_data)
 	return TRUE;
 }
 
-static int hw_start_acquisition(int device_index, gpointer session_device_id)
+static int hw_start_acquisition(int dev_index, gpointer session_dev_id)
 {
-	struct sr_device_instance *sdi;
+	struct sr_dev_inst *sdi;
 	struct mso *mso;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
 	int ret = SR_ERR;
 
-	if (!(sdi = sr_get_device_instance(device_instances, device_index)))
+	if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
 		return ret;
 	mso = sdi->priv;
 
@@ -731,8 +761,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 //		return ret;
 
 	/* FIXME: ACDC Mode */
-	mso->ctlbase &= 0x7f;
-//	mso->ctlbase |= mso->acdcmode;
+	mso->ctlbase1 &= 0x7f;
+//	mso->ctlbase1 |= mso->acdcmode;
 
 	ret = mso_configure_rate(sdi, mso->cur_rate);
 	if (ret != SR_OK)
@@ -771,7 +801,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	if (ret != SR_OK)
 		return ret;
 
-	mso->session_id = session_device_id;
+	mso->session_id = session_dev_id;
 	sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi);
 
 	packet.type = SR_DF_HEADER;
@@ -779,25 +809,27 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	header.feed_version = 1;
 	gettimeofday(&header.starttime, NULL);
 	header.samplerate = mso->cur_rate;
-	header.num_analog_probes = 1;
+	// header.num_analog_probes = 1;
 	header.num_logic_probes = 8;
-	sr_session_bus(session_device_id, &packet);
+	sr_session_bus(session_dev_id, &packet);
 
 	return ret;
 }
 
 /* FIXME */
-static void hw_stop_acquisition(int device_index, gpointer session_device_id)
+static int hw_stop_acquisition(int dev_index, gpointer session_dev_id)
 {
 	struct sr_datafeed_packet packet;
 
-	device_index = device_index;
+	dev_index = dev_index;
 
 	packet.type = SR_DF_END;
-	sr_session_bus(session_device_id, &packet);
+	sr_session_bus(session_dev_id, &packet);
+
+	return SR_OK;
 }
 
-struct sr_device_plugin link_mso19_plugin_info = {
+SR_PRIV struct sr_dev_plugin link_mso19_plugin_info = {
 	.name = "link-mso19",
 	.longname = "Link Instruments MSO-19",
 	.api_version = 1,
@@ -805,10 +837,10 @@ struct sr_device_plugin link_mso19_plugin_info = {
 	.cleanup = hw_cleanup,
 	.opendev = hw_opendev,
 	.closedev = hw_closedev,
-	.get_device_info = hw_get_device_info,
+	.get_dev_info = hw_get_dev_info,
 	.get_status = hw_get_status,
-	.get_capabilities = hw_get_capabilities,
-	.set_configuration = hw_set_configuration,
+	.hwcap_get_all = hw_hwcap_get_all,
+	.config_set = hw_config_set,
 	.start_acquisition = hw_start_acquisition,
 	.stop_acquisition = hw_stop_acquisition,
 };