X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=c0381432a2dd94ef75b6815d427ef71a17f5ad3a;hb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;hp=4635f3c4b7ace23bd64b39b295197e3d3d1becbf;hpb=bc1c2f001a3b8499052348ec45155313153b2194;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index 4635f3c4..c0381432 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
@@ -61,6 +61,8 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Pre-trigger capture ratio", NULL},
 	{SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
 		"Pattern generator mode", NULL},
+	{SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
+		"Trigger types", NULL},
 	{SR_CONF_RLE, SR_T_BOOL, "rle",
 		"Run Length Encoding", NULL},
 	{SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
@@ -368,6 +370,19 @@ SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
 	return src;
 }
 
+SR_PRIV void sr_config_free(struct sr_config *src)
+{
+
+	if (!src || !src->data) {
+		sr_err("%s: invalid data!", __func__);
+		return;
+	}
+
+	g_variant_unref(src->data);
+	g_free(src);
+
+}
+
 /**
  * Returns information about the given driver or device instance.
  *
@@ -395,6 +410,9 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
 	if (!driver || !data)
 		return SR_ERR;
 
+	if (!driver->config_get)
+		return SR_ERR_ARG;
+
 	if ((ret = driver->config_get(key, data, sdi)) == SR_OK) {
 		/* Got a floating reference from the driver. Sink it here,
 		 * caller will need to unref when done with it. */
@@ -459,8 +477,10 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
 {
 	int ret;
 
-	if (!driver || !data || !driver->config_list)
+	if (!driver || !data)
 		ret = SR_ERR;
+	else if (!driver->config_list)
+		ret = SR_ERR_ARG;
 	else if ((ret = driver->config_list(key, data, sdi)) == SR_OK)
 		g_variant_ref_sink(*data);