X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpipistrello-ols%2Fapi.c;h=8f9829666db820342cd7ab5eb03e8e4e0f58b6a2;hb=f5083435cb874618625c5dc31d02fae5610dd946;hp=9fc0ccffd44ea2d9bcc8994f232302c2df6520c3;hpb=758906aa711c2936e7e9adcb449f70905087a5d9;p=libsigrok.git

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 9fc0ccff..8f982966 100644
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -264,10 +264,6 @@ static int config_set(uint32_t key, GVariant *data,
 		break;
 	case SR_CONF_CAPTURE_RATIO:
 		devc->capture_ratio = g_variant_get_uint64(data);
-		if (devc->capture_ratio < 0 || devc->capture_ratio > 100)
-			return SR_ERR;
-		else
-			return SR_OK;
 		break;
 	case SR_CONF_EXTERNAL_CLOCK:
 		if (g_variant_get_boolean(data)) {
@@ -280,7 +276,6 @@ static int config_set(uint32_t key, GVariant *data,
 		break;
 	case SR_CONF_PATTERN_MODE:
 		stropt = g_variant_get_string(data, NULL);
-		flag = 0xffff;
 		if (!strcmp(stropt, STR_PATTERN_NONE)) {
 			sr_info("Disabling test modes.");
 			flag = 0x0000;
@@ -293,10 +288,9 @@ static int config_set(uint32_t key, GVariant *data,
 		} else {
 			return SR_ERR;
 		}
-		if (flag != 0xffff) {
-			devc->flag_reg &= ~(FLAG_INTERNAL_TEST_MODE | FLAG_EXTERNAL_TEST_MODE);
-			devc->flag_reg |= flag;
-		}
+		devc->flag_reg &= ~FLAG_INTERNAL_TEST_MODE;
+		devc->flag_reg &= ~FLAG_EXTERNAL_TEST_MODE;
+		devc->flag_reg |= flag;
 		break;
 	case SR_CONF_SWAP:
 		if (g_variant_get_boolean(data)) {
@@ -331,7 +325,7 @@ static int config_list(uint32_t key, GVariant **data,
 
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
-		return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
+		return STD_CONFIG_LIST(key, data, sdi, cg, NO_OPTS, drvopts, devopts);
 	case SR_CONF_SAMPLERATE:
 		*data = std_gvar_samplerates_steps(ARRAY_AND_SIZE(samplerates));
 		break;
@@ -563,13 +557,13 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	arg[1] = ((readcount - 1) & 0xff00) >> 8;
 	arg[2] = ((readcount - 1) & 0xff0000) >> 16;
 	arg[3] = ((readcount - 1) & 0xff000000) >> 24;
-	if (write_longcommand(devc, CMD_CAPTURE_DELAY, arg) != SR_OK)
+	if (write_longcommand(devc, CMD_CAPTURE_READCOUNT, arg) != SR_OK)
 		return SR_ERR;
 	arg[0] = ((delaycount - 1) & 0xff);
 	arg[1] = ((delaycount - 1) & 0xff00) >> 8;
 	arg[2] = ((delaycount - 1) & 0xff0000) >> 16;
 	arg[3] = ((delaycount - 1) & 0xff000000) >> 24;
-	if (write_longcommand(devc, CMD_CAPTURE_COUNT, arg) != SR_OK)
+	if (write_longcommand(devc, CMD_CAPTURE_DELAYCOUNT, arg) != SR_OK)
 		return SR_ERR;
 
 	/* Flag register. */
@@ -642,7 +636,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver p_ols_driver_info = {
+static struct sr_dev_driver p_ols_driver_info = {
 	.name = "p-ols",
 	.longname = "Pipistrello OLS",
 	.api_version = 1,