X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=7d0fbf8b21030e080f699c6090b0fa8251b7e8f6;hb=65e0036635a54b3273436b4ea7918aea25bad788;hp=7beb15ca6c644178813cae4d241c790c1101132e;hpb=f254bc4bba68d2cade0c8f7993d8fa8d3d9b556a;p=libsigrok.git

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index 7beb15ca..7d0fbf8b 100644
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -24,13 +24,13 @@
 static const uint32_t devopts[] = {
 	SR_CONF_OSCILLOSCOPE,
 	SR_CONF_LOGIC_ANALYZER,
-	SR_CONF_SAMPLERATE,
-	SR_CONF_TRIGGER_TYPE,
-	SR_CONF_TRIGGER_SLOPE,
-	SR_CONF_HORIZ_TRIGGERPOS,
-//      SR_CONF_CAPTURE_RATIO,
-	SR_CONF_LIMIT_SAMPLES,
-//      SR_CONF_RLE,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TRIGGER_TYPE | SR_CONF_LIST,
+	SR_CONF_TRIGGER_SLOPE | SR_CONF_SET,
+	SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
+	SR_CONF_CAPTURE_RATIO | SR_CONF_SET,
+	SR_CONF_RLE | SR_CONF_SET,
 };
 
 /*
@@ -38,9 +38,9 @@ static const uint32_t devopts[] = {
  *
  * See also: http://www.linkinstruments.com/images/mso19_1113.gif
  */
-SR_PRIV const char *mso19_channel_names[NUM_CHANNELS + 1] = {
+static const char *channel_names[] = {
 	/* Note: DSO needs to be first. */
-	"DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL,
+	"DSO", "0", "1", "2", "3", "4", "5", "6", "7",
 };
 
 static const uint64_t samplerates[] = {
@@ -50,10 +50,9 @@ static const uint64_t samplerates[] = {
 };
 
 SR_PRIV struct sr_dev_driver link_mso19_driver_info;
-static struct sr_dev_driver *di = &link_mso19_driver_info;
 
 /* TODO: Use sr_dev_inst to store connection handle & use std_dev_clear(). */
-static int dev_clear(void)
+static int dev_clear(const struct sr_dev_driver *di)
 {
 	GSList *l;
 	struct sr_dev_inst *sdi;
@@ -88,12 +87,12 @@ static int dev_clear(void)
 	return ret;
 }
 
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, 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)
 {
 	int i;
 	GSList *devices = NULL;
@@ -117,7 +116,7 @@ static GSList *scan(GSList *options)
 	}
 	if (!conn)
 		conn = SERIALCONN;
-	if (serialcomm == NULL)
+	if (!serialcomm)
 		serialcomm = SERIALCOMM;
 
 	udev = udev_new();
@@ -178,10 +177,7 @@ static GSList *scan(GSList *options)
 
 		//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;
-		}
+		devc = g_malloc0(sizeof(struct dev_context));
 
 		if (mso_parse_serial(iSerial, iProduct, devc) != SR_OK) {
 			sr_err("Invalid iSerial: %s.", iSerial);
@@ -198,13 +194,13 @@ static GSList *scan(GSList *options)
 			devc->protocol_trigger.mask[i] = 0xff;
 		}
 
-		if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm))) {
-			g_free(devc);
-			return devices;
-		}
+		devc->serial = sr_serial_dev_inst_new(conn, serialcomm);
 
-		struct sr_dev_inst *sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
-						manufacturer, product, hwrev);
+		struct sr_dev_inst *sdi = g_malloc0(sizeof(struct sr_dev_inst));
+		sdi->status = SR_ST_INACTIVE;
+		sdi->vendor = g_strdup(manufacturer);
+		sdi->model = g_strdup(product);
+		sdi->version = g_strdup(hwrev);
 
 		if (!sdi) {
 			sr_err("Unable to create device instance for %s",
@@ -217,13 +213,9 @@ static GSList *scan(GSList *options)
 		sdi->driver = di;
 		sdi->priv = devc;
 
-		for (i = 0; i < NUM_CHANNELS; i++) {
-			struct sr_channel *ch;
+		for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
 			chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC;
-			if (!(ch = sr_channel_new(i, chtype, TRUE,
-						   mso19_channel_names[i])))
-				return 0;
-			sdi->channels = g_slist_append(sdi->channels, ch);
+			sr_channel_new(sdi, i, chtype, TRUE, channel_names[i]);
 		}
 
 		//Add the driver
@@ -235,7 +227,7 @@ static GSList *scan(GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
 	return ((struct drv_context *)(di->priv))->instances;
 }
@@ -271,19 +263,19 @@ static int dev_open(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
 	return dev_clear();
 }
 
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 
 	(void)cg;
 
-	switch (id) {
+	switch (key) {
 	case SR_CONF_SAMPLERATE:
 		if (sdi) {
 			devc = sdi->priv;
@@ -298,7 +290,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(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
 	int ret;
@@ -314,7 +306,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	switch (id) {
+	switch (key) {
 	case SR_CONF_SAMPLERATE:
 		// FIXME
 		return mso_configure_rate(sdi, g_variant_get_uint64(data));
@@ -327,8 +319,6 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 			ret = SR_ERR_ARG;
 		} else {
 			devc->limit_samples = num_samples;
-			sr_dbg("setting limit_samples to %i\n",
-			       num_samples);
 			ret = SR_OK;
 		}
 		break;