X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=c81a87a169d0f9e8ef52a1abba87b51c4cb5d63a;hb=2472271e0833d3dee569a97a07b86467043dac16;hp=cad75e13b0800246f35f9ecfcdebdb5f22c5bb0e;hpb=9e411f4be85302b9623e597c142f11268745812e;p=libsigrok.git

diff --git a/src/hwdriver.c b/src/hwdriver.c
index cad75e13..c81a87a1 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -666,9 +666,9 @@ static int check_key(const struct sr_dev_driver *driver,
 	const char *opstr;
 
 	if (sdi && cg)
-		suffix = " for this device and channel group";
+		suffix = " for this device instance and channel group";
 	else if (sdi)
-		suffix = " for this device";
+		suffix = " for this device instance";
 	else
 		suffix = "";
 
@@ -690,6 +690,15 @@ static int check_key(const struct sr_dev_driver *driver,
 			return SR_ERR_ARG;
 		}
 		break;
+	case SR_CONF_CAPTURE_RATIO:
+		/* Capture ratio must always be between 0 and 100. */
+		if (op != SR_CONF_SET || !data)
+			break;
+		if (g_variant_get_uint64(data) > 100) {
+			sr_err("Capture ratio must be 0..100.");
+			return SR_ERR_ARG;
+		}
+		break;
 	}
 
 	if (sr_config_list(driver, sdi, cg, SR_CONF_DEVICE_OPTIONS, &gvar_opts) != SR_OK) {
@@ -772,6 +781,10 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver,
 		g_variant_ref_sink(*data);
 	}
 
+	if (ret == SR_ERR_CHANNEL_GROUP)
+		sr_err("%s: No channel group specified.",
+			(sdi) ? sdi->driver->name : "unknown");
+
 	return ret;
 }