X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Fapi.c;h=0bc02576d70c389bec90eeebdfa23c4498c3d7fc;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=5dd5045d153944b205e3133f6925a9991ebd5045;hpb=df92e5cf6b1caad0d1d43eb890d84af1ef79cd18;p=libsigrok.git

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index 5dd5045d..0bc02576 100644
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -1,7 +1,9 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com>
+ * Copyright (C) 2012 Renato Caldas <rmsc@fe.up.pt>
+ * Copyright (C) 2013 Lior Elazary <lelazary@yahoo.com>
  *
  * 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
@@ -19,15 +21,14 @@
 
 #include "protocol.h"
 
-#define SERIALCOMM "460800/8n1" //Default communication params
-#define SERIALCONN "/dev/ttyUSB0" //Default communication params
-
 static const int hwcaps[] = {
-	SR_HWCAP_LOGIC_ANALYZER,
-	SR_HWCAP_SAMPLERATE,
-//	SR_HWCAP_CAPTURE_RATIO,
-	SR_HWCAP_LIMIT_SAMPLES,
-//	SR_HWCAP_RLE,
+	SR_CONF_LOGIC_ANALYZER,
+	SR_CONF_SAMPLERATE,
+	SR_CONF_TRIGGER_SLOPE,
+	SR_CONF_HORIZ_TRIGGERPOS,
+//      SR_CONF_CAPTURE_RATIO,
+	SR_CONF_LIMIT_SAMPLES,
+//      SR_CONF_RLE,
 	0,
 };
 
@@ -40,29 +41,11 @@ SR_PRIV const char *mso19_probe_names[NUM_PROBES + 1] = {
 	"0", "1", "2", "3", "4", "5", "6", "7", NULL
 };
 
-/*supported samplerates */
 static const struct sr_samplerates samplerates = {
-	SR_HZ(100),
-	SR_HZ(200),
-	SR_HZ(500),
-	SR_KHZ(1),
-	SR_KHZ(2),
-	SR_KHZ(5),
-	SR_KHZ(10),
-	SR_KHZ(20),
-	SR_KHZ(50),
-	SR_KHZ(100),
-	SR_KHZ(200),
-	SR_KHZ(500),
-	SR_MHZ(1),
-	SR_MHZ(2),
-	SR_MHZ(5),
-	SR_MHZ(10),
-	SR_MHZ(20),
-	SR_MHZ(50),
-	SR_MHZ(100),
-	SR_MHZ(200),
-	NULL,
+	.low  = SR_HZ(100),
+	.high = SR_MHZ(200),
+	.step = SR_HZ(100),
+	.list = NULL,
 };
 
 SR_PRIV struct sr_dev_driver link_mso19_driver_info;
@@ -70,72 +53,57 @@ static struct sr_dev_driver *di = &link_mso19_driver_info;
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-  printf("Init driver\n");
-
-	struct drv_context *drvc;
-
-	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-		sr_err("Driver context malloc failed.");
-		return SR_ERR_MALLOC;
-	}
-	drvc->sr_ctx = sr_ctx;
-	di->priv = drvc;
-
-	return SR_OK;
+	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *hw_scan(GSList *options)
 {
-	//struct sr_hwopt *opt;
-	//struct sr_probe *probe;
-	//GPollFD probefd;
-	//int ret, i;
-	//char buf[8];
-	//struct udev *udev;
-  int i;
+	int i;
+	GSList *devices = NULL;
+	const char *conn = NULL;
+	const char *serialcomm = NULL;
+	GSList *l;
+	struct sr_config *src;
+	struct udev *udev;
 
 	(void)options;
-	GSList *devices = NULL;
- 
-	sr_info("Checking for link mso19\n");
 
-	const char* conn = NULL;
-  const char* serialcomm = NULL;
-  GSList *l;
 	for (l = options; l; l = l->next) {
-		struct sr_hwopt* opt = l->data;
-		switch (opt->hwopt) {
-		case SR_HWOPT_CONN:
-			conn = opt->value;
+		src = l->data;
+		switch (src->key) {
+		case SR_CONF_CONN:
+			conn = src->value;
 			break;
-		case SR_HWOPT_SERIALCOMM:
-			serialcomm = opt->value;
+		case SR_CONF_SERIALCOMM:
+			serialcomm = src->value;
 			break;
 		}
 	}
 	if (!conn)
-    conn = SERIALCONN;
+		conn = SERIALCONN;
 	if (serialcomm == NULL)
 		serialcomm = SERIALCOMM;
 
-	struct udev *udev = udev_new();
+	udev = udev_new();
 	if (!udev) {
 		sr_err("Failed to initialize udev.");
 	}
+
 	struct udev_enumerate *enumerate = udev_enumerate_new(udev);
 	udev_enumerate_add_match_subsystem(enumerate, "usb-serial");
 	udev_enumerate_scan_devices(enumerate);
 	struct udev_list_entry *devs = udev_enumerate_get_list_entry(enumerate);
 	struct udev_list_entry *dev_list_entry;
-  for (dev_list_entry = devs; 
-      dev_list_entry != NULL; 
-      dev_list_entry = udev_list_entry_get_next(dev_list_entry))
-  {
+	for (dev_list_entry = devs;
+	     dev_list_entry != NULL;
+	     dev_list_entry = udev_list_entry_get_next(dev_list_entry)) {
 		const char *syspath = udev_list_entry_get_name(dev_list_entry);
-		struct udev_device *dev = udev_device_new_from_syspath(udev, syspath);
+		struct udev_device *dev =
+		    udev_device_new_from_syspath(udev, syspath);
 		const char *sysname = udev_device_get_sysname(dev);
-		struct udev_device *parent = udev_device_get_parent_with_subsystem_devtype(
-        dev, "usb", "usb_device");
+		struct udev_device *parent =
+		    udev_device_get_parent_with_subsystem_devtype(dev, "usb",
+								  "usb_device");
 
 		if (!parent) {
 			sr_err("Unable to find parent usb device for %s",
@@ -143,101 +111,101 @@ static GSList *hw_scan(GSList *options)
 			continue;
 		}
 
-		const char *idVendor = udev_device_get_sysattr_value(parent, "idVendor");
-		const char *idProduct = udev_device_get_sysattr_value(parent, "idProduct");
+		const char *idVendor =
+		    udev_device_get_sysattr_value(parent, "idVendor");
+		const char *idProduct =
+		    udev_device_get_sysattr_value(parent, "idProduct");
 		if (strcmp(USB_VENDOR, idVendor)
-				|| strcmp(USB_PRODUCT, idProduct))
+		    || strcmp(USB_PRODUCT, idProduct))
 			continue;
 
-		const char* iSerial = udev_device_get_sysattr_value(parent, "serial");
-		const char* iProduct = udev_device_get_sysattr_value(parent, "product");
+		const char *iSerial =
+		    udev_device_get_sysattr_value(parent, "serial");
+		const char *iProduct =
+		    udev_device_get_sysattr_value(parent, "product");
 
-    char path[32];
+		char path[32];
 		snprintf(path, sizeof(path), "/dev/%s", sysname);
+		conn = path;
 
 		size_t s = strcspn(iProduct, " ");
-    char product[32];
-    char manufacturer[32];
+		char product[32];
+		char manufacturer[32];
 		if (s > sizeof(product) ||
-				strlen(iProduct) - s > sizeof(manufacturer)) {
-      sr_err("Could not parse iProduct: %s.", iProduct);
+		    strlen(iProduct) - s > sizeof(manufacturer)) {
+			sr_err("Could not parse iProduct: %s.", iProduct);
 			continue;
 		}
 		strncpy(product, iProduct, s);
 		product[s] = 0;
-		strcpy(manufacturer, iProduct + s);
-    
-    //Create the device context and set its params
-    struct dev_context *devc;
-    if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-      sr_err("Device context malloc failed.");
-      return devices;
-    }
-
-    if (mso_parse_serial(iSerial, iProduct, devc) != SR_OK) {
-      sr_err("Invalid iSerial: %s.", iSerial);
-      g_free(devc);
-      return devices;
-    }
-    
-    char hwrev[32];
-    sprintf(hwrev, "r%d", devc->hwrev);
-    devc->ctlbase1 = 0;
-    devc->protocol_trigger.spimode = 0;
-    for (i = 0; i < 4; i++) {
-      devc->protocol_trigger.word[i] = 0;
-      devc->protocol_trigger.mask[i] = 0xff;
-    }
-
-    if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm)))
-    {
-      g_free(devc);
-      return devices;
-    }
-
-    struct sr_dev_inst *sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
-        manufacturer, product, hwrev);
-
-    if (!sdi) {
-      sr_err("Unable to create device instance for %s",
-          sysname);
-      sr_dev_inst_free(sdi);
-      g_free(devc);
-      return devices;
-    }
-    
-    //sdi->index = 0;
-    sdi->driver = di;
-    sdi->priv = devc;
-    //sdi->model = "
-    //sdi->version = "Testing1234";
-    //struct sr_probe *probe;
-    //sdi->probes = g_slist_append(sdi->probes, probe);
-
-    printf("Add the context\n");
-    //Add the driver
-    struct drv_context *drvc = di->priv;
-    drvc->instances = g_slist_append(drvc->instances, sdi);
-    devices = g_slist_append(devices, sdi);
-  }
-  
-  printf("Return devices\n");
+		strcpy(manufacturer, iProduct + s + 1);
+
+		//Create the device context and set its params
+		struct dev_context *devc;
+		if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+			sr_err("Device context malloc failed.");
+			return devices;
+		}
+
+		if (mso_parse_serial(iSerial, iProduct, devc) != SR_OK) {
+			sr_err("Invalid iSerial: %s.", iSerial);
+			g_free(devc);
+			return devices;
+		}
+
+		char hwrev[32];
+		sprintf(hwrev, "r%d", devc->hwrev);
+		devc->ctlbase1 = 0;
+		devc->protocol_trigger.spimode = 0;
+		for (i = 0; i < 4; i++) {
+			devc->protocol_trigger.word[i] = 0;
+			devc->protocol_trigger.mask[i] = 0xff;
+		}
+
+		if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm))) {
+			g_free(devc);
+			return devices;
+		}
+
+		struct sr_dev_inst *sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
+						manufacturer, product, hwrev);
+
+		if (!sdi) {
+			sr_err("Unable to create device instance for %s",
+			       sysname);
+			sr_dev_inst_free(sdi);
+			g_free(devc);
+			return devices;
+		}
+
+		sdi->driver = di;
+		sdi->priv = devc;
+
+		for (i = 0; i < NUM_PROBES; i++) {
+			struct sr_probe *probe;
+			if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE,
+						   mso19_probe_names[i])))
+				return 0;
+			sdi->probes = g_slist_append(sdi->probes, probe);
+		}
+
+		//Add the driver
+		struct drv_context *drvc = di->priv;
+		drvc->instances = g_slist_append(drvc->instances, sdi);
+		devices = g_slist_append(devices, sdi);
+	}
+
 	return devices;
 }
 
 static GSList *hw_dev_list(void)
 {
-  printf("Dev list\n");
-	struct drv_context *drvc;
-
-	drvc = di->priv;
-
-	return drvc->instances;
+	return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-  printf("Dev opewn\n");
+	int ret;
 	struct dev_context *devc;
 
 	devc = sdi->priv;
@@ -251,24 +219,23 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 	mso_check_trigger(devc->serial, &devc->trigger_state);
 	sr_dbg("Trigger state: 0x%x.", devc->trigger_state);
 
-	int ret = mso_reset_adc(sdi);
+	ret = mso_reset_adc(sdi);
 	if (ret != SR_OK)
 		return ret;
 
 	mso_check_trigger(devc->serial, &devc->trigger_state);
 	sr_dbg("Trigger state: 0x%x.", devc->trigger_state);
 
-  //	ret = mso_reset_fsm(sdi);
-  //	if (ret != SR_OK)
-  //		return ret;
-  //	return SR_ERR;
+	//    ret = mso_reset_fsm(sdi);
+	//    if (ret != SR_OK)
+	//            return ret;
+	//    return SR_ERR;
 
 	return SR_OK;
 }
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-  printf("dev close\n");
 	struct dev_context *devc;
 
 	devc = sdi->priv;
@@ -283,7 +250,6 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
 
 static int hw_cleanup(void)
 {
-  printf("*Dev clearup\n");
 	GSList *l;
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
@@ -317,30 +283,12 @@ static int hw_cleanup(void)
 	return ret;
 }
 
-static int hw_info_get(int info_id, const void **data,
-       const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-  printf("Get info\n");
-
-	switch (info_id) {
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = mso19_probe_names;
-		break;
-	case SR_DI_SAMPLERATES:
-		*data = &samplerates;
-		break;
-	case SR_DI_TRIGGER_TYPES:
-		*data = (char *)TRIGGER_TYPES;
-		break;
-	case SR_DI_CUR_SAMPLERATE:
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
 		if (sdi) {
 			devc = sdi->priv;
 			*data = &devc->cur_rate;
@@ -354,89 +302,118 @@ static int hw_info_get(int info_id, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-		const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
-	struct dev_context *devc;
 	int ret;
-	const uint64_t *tmp_u64;
+	struct dev_context *devc;
+	uint64_t num_samples, slope;
+	int trigger_pos;
+	float pos;
 
-  printf("Config set\n");
 	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR;
 
-	switch (hwcap) {
-	case SR_HWCAP_SAMPLERATE:
-		return mso_configure_rate(sdi, *(const uint64_t *) value);
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
+		// FIXME
+		return mso_configure_rate(sdi, *(const uint64_t *)value);
 		ret = SR_OK;
 		break;
-	case SR_HWCAP_LIMIT_SAMPLES:
+	case SR_CONF_LIMIT_SAMPLES:
+		num_samples = *(uint64_t *)value;
+		if (num_samples < 1024) {
+			sr_err("minimum of 1024 samples required");
+			ret = SR_ERR_ARG;
+		} else {
+			devc->limit_samples = num_samples;
+			sr_dbg("setting limit_samples to %i\n",
+			       num_samples);
+			ret = SR_OK;
+		}
+		break;
+	case SR_CONF_CAPTURE_RATIO:
 		ret = SR_OK;
 		break;
-  case SR_HWCAP_CAPTURE_RATIO:
-    ret = SR_OK;
+	case SR_CONF_TRIGGER_SLOPE:
+		slope = *(uint64_t *)value;
+		if (slope != SLOPE_NEGATIVE && slope != SLOPE_POSITIVE) {
+			sr_err("Invalid trigger slope");
+			ret = SR_ERR_ARG;
+		} else {
+			devc->trigger_slope = slope;
+			ret = SR_OK;
+		}
 		break;
-	case SR_HWCAP_RLE:
-    ret = SR_OK;
+	case SR_CONF_HORIZ_TRIGGERPOS:
+		pos = *(float *)value;
+		if (pos < 0 || pos > 255) {
+			sr_err("Trigger position (%f) should be between 0 and 255.", pos);
+			ret = SR_ERR_ARG;
+		} else {
+			trigger_pos = (int)pos;
+			devc->trigger_holdoff[0] = trigger_pos & 0xff;
+			ret = SR_OK;
+		}
+		break;
+	case SR_CONF_RLE:
+		ret = SR_OK;
 		break;
 	default:
 		ret = SR_ERR;
+		break;
 	}
 
 	return ret;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
+	case SR_CONF_SAMPLERATE:
+		*data = &samplerates;
+		break;
+	case SR_CONF_TRIGGER_TYPE:
+		*data = (char *)TRIGGER_TYPE;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
-		void *cb_data)
+				    void *cb_data)
 {
-	struct sr_datafeed_packet *packet;
-	struct sr_datafeed_header *header;
-	struct sr_datafeed_meta_logic meta;
 	struct dev_context *devc;
-	uint32_t trigger_config[4];
-	uint32_t data;
-	uint16_t readcount, delaycount;
-	uint8_t changrp_mask;
-	int num_channels;
-	int i;
 	int ret = SR_ERR;
-  
-  
-  printf("Accquistion start\n");
+
 	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR;
 
-	//TODO if (ols_configure_probes(sdi) != SR_OK) {
-	//TODO 	sr_err("Failed to configure probes.");
-	//TODO 	return SR_ERR;
-	//TODO }
-
-	/*
-	 * Enable/disable channel groups in the flag register according to the
-	 * probe mask. Calculate this here, because num_channels is needed
-	 * to limit readcount.
-	 */
-	//changrp_mask = 0;
-	//num_channels = 0;
-	//for (i = 0; i < 4; i++) {
-	//	if (devc->probe_mask & (0xff << (i * 8))) {
-	//		changrp_mask |= (1 << i);
-	//		num_channels++;
-	//	}
-	//}
+	if (mso_configure_probes(sdi) != SR_OK) {
+		sr_err("Failed to configure probes.");
+		return SR_ERR;
+	}
 
 	/* FIXME: No need to do full reconfigure every time */
-//	ret = mso_reset_fsm(sdi);
-//	if (ret != SR_OK)
-//		return ret;
+//      ret = mso_reset_fsm(sdi);
+//      if (ret != SR_OK)
+//              return ret;
 
 	/* FIXME: ACDC Mode */
 	devc->ctlbase1 &= 0x7f;
-//	devc->ctlbase1 |= devc->acdcmode;
+//      devc->ctlbase1 |= devc->acdcmode;
 
 	ret = mso_configure_rate(sdi, devc->cur_rate);
 	if (ret != SR_OK)
@@ -455,63 +432,28 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	if (ret != SR_OK)
 		return ret;
 
-	/* FIXME: trigger_position */
-
-
 	/* END of config hardware part */
-
-	/* with trigger */
 	ret = mso_arm(sdi);
 	if (ret != SR_OK)
 		return ret;
 
-	/* without trigger */
-//	ret = mso_force_capture(sdi);
-//	if (ret != SR_OK)
-//		return ret;
-
 	/* Start acquisition on the device. */
-	mso_check_trigger(sdi, &devc->trigger_state);
-	ret = mso_check_trigger(sdi, NULL);
+	mso_check_trigger(devc->serial, &devc->trigger_state);
+	ret = mso_check_trigger(devc->serial, NULL);
 	if (ret != SR_OK)
 		return ret;
 
-  sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
-
-	if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-		sr_err("Datafeed packet malloc failed.");
-		return SR_ERR_MALLOC;
-	}
-
-	if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-		sr_err("Datafeed header malloc failed.");
-		g_free(packet);
-		return SR_ERR_MALLOC;
-	}
+	/* Send header packet to the session bus. */
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
-	packet->type = SR_DF_HEADER;
-	packet->payload = (unsigned char *)header;
-	header->feed_version = 1;
-	gettimeofday(&header->starttime, NULL);
-	sr_session_send(cb_data, packet);
-
-	packet->type = SR_DF_META_LOGIC;
-	packet->payload = &meta;
-	meta.samplerate = devc->cur_rate;
-	meta.num_probes = NUM_PROBES;
-	sr_session_send(cb_data, packet);
-  
-	g_free(header);
-	g_free(packet);
+	sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
 
 	return SR_OK;
 }
 
-/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
+/* This stops acquisition on ALL devices, ignoring dev_index. */
 static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-  printf("Accuqstion stop\n");
-	/* Avoid compiler warnings. */
 	(void)cb_data;
 
 	stop_acquisition(sdi);
@@ -528,10 +470,11 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = hw_cleanup,
+	.config_get = config_get,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,