X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fzeroplus-logic-cube%2Fapi.c;h=8d530e5779dc6877d1c9d9e9d43bfa188bd6e389;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=a49f07481c0469a1adcede4fa25cda98c227a0c0;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index a49f0748..8d530e57 100644
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 #define VENDOR_NAME			"ZEROPLUS"
@@ -30,7 +31,7 @@
 struct zp_model {
 	uint16_t vid;
 	uint16_t pid;
-	char *model_name;
+	const char *model_name;
 	unsigned int channels;
 	unsigned int sample_depth;	/* In Ksamples/channel */
 	unsigned int max_sampling_freq;
@@ -49,16 +50,20 @@ static const struct zp_model zeroplus_models[] = {
 	{0x0c12, 0x700d, "LAP-C(322000)", 32, 2048, 200},
 	{0x0c12, 0x700e, "LAP-C(16032)",  16, 32,   100},
 	{0x0c12, 0x7016, "LAP-C(162000)", 16, 2048, 200},
-	{ 0, 0, 0, 0, 0, 0 }
+	{0x0c12, 0x7100, "AKIP-9101", 16, 256, 200},
+	ALL_ZERO
 };
 
-static const int32_t hwcaps[] = {
+static const uint32_t drvopts[] = {
 	SR_CONF_LOGIC_ANALYZER,
-	SR_CONF_SAMPLERATE,
-	SR_CONF_TRIGGER_MATCH,
-	SR_CONF_CAPTURE_RATIO,
-	SR_CONF_VOLTAGE_THRESHOLD,
-	SR_CONF_LIMIT_SAMPLES,
+};
+
+static const uint32_t devopts[] = {
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+	SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_VOLTAGE_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 static const int32_t trigger_matches[] = {
@@ -75,12 +80,8 @@ static const char *channel_names[] = {
 	"B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7",
 	"C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7",
 	"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
-	NULL,
 };
 
-SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
-static struct sr_dev_driver *di = &zeroplus_logic_cube_driver_info;
-
 /*
  * The hardware supports more samplerates than these, but these are the
  * options hardcoded into the vendor's Windows GUI.
@@ -126,8 +127,6 @@ const uint64_t samplerates_200[] = {
 	SR_MHZ(200),
 };
 
-static int dev_close(struct sr_dev_inst *sdi);
-
 SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate)
 {
 	int i;
@@ -155,41 +154,48 @@ SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate)
 	return SR_OK;
 }
 
-static int init(struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_dev_inst *sdi;
-	struct sr_channel *ch;
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	const struct zp_model *prof;
 	struct libusb_device_descriptor des;
+	struct libusb_device_handle *hdl;
 	libusb_device **devlist;
 	GSList *devices;
-	int ret, devcnt, i, j;
+	int ret, i, j;
+	char serial_num[64], connection_id[64];
 
 	(void)options;
 
-	drvc = di->priv;
+	drvc = di->context;
 
 	devices = NULL;
 
 	/* Find all ZEROPLUS analyzers and add them to device list. */
-	devcnt = 0;
 	libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); /* TODO: Errors. */
 
 	for (i = 0; devlist[i]; i++) {
-		ret = libusb_get_device_descriptor(devlist[i], &des);
-		if (ret != 0) {
-			sr_err("Failed to get device descriptor: %s.",
-			       libusb_error_name(ret));
+		libusb_get_device_descriptor(devlist[i], &des);
+
+		if ((ret = libusb_open(devlist[i], &hdl)) < 0)
+			continue;
+
+		if (des.iSerialNumber == 0) {
+			serial_num[0] = '\0';
+		} else if ((ret = libusb_get_string_descriptor_ascii(hdl,
+				des.iSerialNumber, (unsigned char *) serial_num,
+				sizeof(serial_num))) < 0) {
+			sr_warn("Failed to get serial number string descriptor: %s.",
+				libusb_error_name(ret));
 			continue;
 		}
 
+		libusb_close(hdl);
+
+		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+
 		prof = NULL;
 		for (j = 0; j < zeroplus_models[j].vid; j++) {
 			if (des.idVendor == zeroplus_models[j].vid &&
@@ -203,19 +209,15 @@ static GSList *scan(GSList *options)
 		sr_info("Found ZEROPLUS %s.", prof->model_name);
 
 		/* Register the device with libsigrok. */
-		if (!(sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE,
-				VENDOR_NAME, prof->model_name, NULL))) {
-			sr_err("%s: sr_dev_inst_new failed", __func__);
-			return NULL;
-		}
-		sdi->driver = di;
+		sdi = g_malloc0(sizeof(struct sr_dev_inst));
+		sdi->status = SR_ST_INACTIVE;
+		sdi->vendor = g_strdup(VENDOR_NAME);
+		sdi->model = g_strdup(prof->model_name);
+		sdi->serial_num = g_strdup(serial_num);
+		sdi->connection_id = g_strdup(connection_id);
 
 		/* Allocate memory for our private driver context. */
-		if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-			sr_err("Device context malloc failed.");
-			return NULL;
-		}
-
+		devc = g_malloc0(sizeof(struct dev_context));
 		sdi->priv = devc;
 		devc->prof = prof;
 		devc->num_channels = prof->channels;
@@ -231,83 +233,36 @@ static GSList *scan(GSList *options)
 		// memset(devc->trigger_buffer, 0, NUM_TRIGGER_STAGES);
 
 		/* Fill in channellist according to this device's profile. */
-		for (j = 0; j < devc->num_channels; j++) {
-			if (!(ch = sr_channel_new(j, SR_CHANNEL_LOGIC, TRUE,
-					channel_names[j])))
-				return NULL;
-			sdi->channels = g_slist_append(sdi->channels, ch);
-		}
+		for (j = 0; j < devc->num_channels; j++)
+			sr_channel_new(sdi, j, SR_CHANNEL_LOGIC, TRUE,
+					channel_names[j]);
 
 		devices = g_slist_append(devices, sdi);
-		drvc->instances = g_slist_append(drvc->instances, sdi);
 		sdi->inst_type = SR_INST_USB;
 		sdi->conn = sr_usb_dev_inst_new(
 			libusb_get_bus_number(devlist[i]),
 			libusb_get_device_address(devlist[i]), NULL);
-		devcnt++;
-
 	}
 	libusb_free_device_list(devlist, 1);
 
-	return devices;
-}
-
-static GSList *dev_list(void)
-{
-	return ((struct drv_context *)(di->priv))->instances;
+	return std_scan_complete(di, devices);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
+	struct sr_dev_driver *di = sdi->driver;
 	struct dev_context *devc;
 	struct drv_context *drvc;
 	struct sr_usb_dev_inst *usb;
-	libusb_device **devlist, *dev;
-	struct libusb_device_descriptor des;
-	int device_count, ret, i;
+	int ret;
 
-	drvc = di->priv;
+	drvc = di->context;
 	usb = sdi->conn;
+	devc = sdi->priv;
 
-	if (!(devc = sdi->priv)) {
-		sr_err("%s: sdi->priv was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx,
-					      &devlist);
-	if (device_count < 0) {
-		sr_err("Failed to retrieve device list.");
-		return SR_ERR;
-	}
-
-	dev = NULL;
-	for (i = 0; i < device_count; i++) {
-		if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
-			sr_err("Failed to get device descriptor: %s.",
-			       libusb_error_name(ret));
-			continue;
-		}
-		if (libusb_get_bus_number(devlist[i]) == usb->bus
-		    && libusb_get_device_address(devlist[i]) == usb->address) {
-			dev = devlist[i];
-			break;
-		}
-	}
-	if (!dev) {
-		sr_err("Device on bus %d address %d disappeared!",
-		       usb->bus, usb->address);
-		return SR_ERR;
-	}
-
-	if (!(ret = libusb_open(dev, &(usb->devhdl)))) {
-		sdi->status = SR_ST_ACTIVE;
-		sr_info("Opened device %d on %d.%d interface %d.",
-			sdi->index, usb->bus, usb->address, USB_INTERFACE);
-	} else {
-		sr_err("Failed to open device: %s.", libusb_error_name(ret));
-		return SR_ERR;
-	}
+	ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
+	if (ret != SR_OK)
+		return ret;
 
 	ret = libusb_set_configuration(usb->devhdl, USB_CONFIGURATION);
 	if (ret < 0) {
@@ -364,57 +319,42 @@ static int dev_close(struct sr_dev_inst *sdi)
 	usb = sdi->conn;
 
 	if (!usb->devhdl)
-		return SR_ERR;
+		return SR_ERR_BUG;
 
-	sr_info("Closing device %d on %d.%d interface %d.", sdi->index,
-		usb->bus, usb->address, USB_INTERFACE);
+	sr_info("Closing device on %d.%d (logical) / %s (physical) interface %d.",
+		usb->bus, usb->address, sdi->connection_id, USB_INTERFACE);
 	libusb_release_interface(usb->devhdl, USB_INTERFACE);
 	libusb_reset_device(usb->devhdl);
 	libusb_close(usb->devhdl);
 	usb->devhdl = NULL;
-	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
 }
 
-static int cleanup(void)
-{
-	return std_dev_clear(di, NULL);
-}
-
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
+	GVariant *range[2];
 
 	(void)cg;
 
-	switch (id) {
+	if (!sdi)
+		return SR_ERR_ARG;
+
+	devc = sdi->priv;
+
+	switch (key) {
 	case SR_CONF_SAMPLERATE:
-		if (sdi) {
-			devc = sdi->priv;
-			*data = g_variant_new_uint64(devc->cur_samplerate);
-			sr_spew("Returning samplerate: %" PRIu64 "Hz.",
-				devc->cur_samplerate);
-		} else
-			return SR_ERR_ARG;
+		*data = g_variant_new_uint64(devc->cur_samplerate);
 		break;
 	case SR_CONF_CAPTURE_RATIO:
-		if (sdi) {
-			devc = sdi->priv;
-			*data = g_variant_new_uint64(devc->capture_ratio);
-		} else
-			return SR_ERR_ARG;
+		*data = g_variant_new_uint64(devc->capture_ratio);
 		break;
 	case SR_CONF_VOLTAGE_THRESHOLD:
-		if (sdi) {
-			GVariant *range[2];
-			devc = sdi->priv;
-			range[0] = g_variant_new_double(devc->cur_threshold);
-			range[1] = g_variant_new_double(devc->cur_threshold);
-			*data = g_variant_new_tuple(range, 2);
-		} else
-			return SR_ERR_ARG;
+		range[0] = g_variant_new_double(devc->cur_threshold);
+		range[1] = g_variant_new_double(devc->cur_threshold);
+		*data = g_variant_new_tuple(range, 2);
 		break;
 	default:
 		return SR_ERR_NA;
@@ -423,7 +363,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
@@ -431,15 +371,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
+	devc = sdi->priv;
 
-	if (!(devc = sdi->priv)) {
-		sr_err("%s: sdi->priv was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
-	switch (id) {
+	switch (key) {
 	case SR_CONF_SAMPLERATE:
 		return zp_set_samplerate(devc, g_variant_get_uint64(data));
 	case SR_CONF_LIMIT_SAMPLES:
@@ -456,7 +390,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
@@ -469,8 +403,13 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-				hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+		if (!sdi) {
+			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
+		} else {
+			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+		}
 		break;
 	case SR_CONF_SAMPLERATE:
 		devc = sdi->priv;
@@ -521,8 +460,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-		void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
@@ -544,13 +482,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	unsigned int discard;
 	int trigger_now;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
-	if (!(devc = sdi->priv)) {
-		sr_err("%s: sdi->priv was NULL", __func__);
-		return SR_ERR_ARG;
-	}
+	devc = sdi->priv;
 
 	if (analyzer_add_triggers(sdi) != SR_OK) {
 		sr_err("Failed to configure triggers.");
@@ -587,20 +519,15 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	sr_info("Ramsize trigger    = 0x%x.", ramsize_trigger);
 	sr_info("Memory size        = 0x%x.", memory_size);
 
-	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	/* Check for empty capture */
 	if ((status & STATUS_READY) && !stop_address) {
-		packet.type = SR_DF_END;
-		sr_session_send(cb_data, &packet);
+		std_session_send_df_end(sdi);
 		return SR_OK;
 	}
 
-	if (!(buf = g_try_malloc(PACKET_SIZE))) {
-		sr_err("Packet buffer malloc failed.");
-		return SR_ERR_MALLOC;
-	}
+	buf = g_malloc(PACKET_SIZE);
 
 	/* Check if the trigger is in the samples we are throwing away */
 	trigger_now = now_address == trigger_address ||
@@ -679,7 +606,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 			logic.length = (trigger_offset - samples_read) * 4;
 			logic.unitsize = 4;
 			logic.data = buf + buf_offset;
-			sr_session_send(cb_data, &packet);
+			sr_session_send(sdi, &packet);
 			len -= logic.length;
 			samples_read += logic.length / 4;
 			buf_offset += logic.length;
@@ -689,7 +616,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 			/* Send out trigger */
 			packet.type = SR_DF_TRIGGER;
 			packet.payload = NULL;
-			sr_session_send(cb_data, &packet);
+			sr_session_send(sdi, &packet);
 		}
 
 		/* Send out data (or data after trigger) */
@@ -698,32 +625,23 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 		logic.length = len;
 		logic.unitsize = 4;
 		logic.data = buf + buf_offset;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(sdi, &packet);
 		samples_read += len / 4;
 	}
 	analyzer_read_stop(usb->devhdl);
 	g_free(buf);
 
-	packet.type = SR_DF_END;
-	sr_session_send(cb_data, &packet);
+	std_session_send_df_end(sdi);
 
 	return SR_OK;
 }
 
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
-	struct sr_datafeed_packet packet;
-
-	packet.type = SR_DF_END;
-	sr_session_send(cb_data, &packet);
 
-	if (!(devc = sdi->priv)) {
-		sr_err("%s: sdi->priv was NULL", __func__);
-		return SR_ERR_BUG;
-	}
+	std_session_send_df_end(sdi);
 
 	usb = sdi->conn;
 	analyzer_reset(usb->devhdl);
@@ -732,14 +650,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
+static struct sr_dev_driver zeroplus_logic_cube_driver_info = {
 	.name = "zeroplus-logic-cube",
 	.longname = "ZEROPLUS Logic Cube LAP-C series",
 	.api_version = 1,
-	.init = init,
-	.cleanup = cleanup,
+	.init = std_init,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
+	.dev_list = std_dev_list,
 	.dev_clear = NULL,
 	.config_get = config_get,
 	.config_set = config_set,
@@ -748,5 +666,6 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(zeroplus_logic_cube_driver_info);