X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkern-scale%2Fapi.c;h=e369a44cf5e585722dbec8acf544b8a90b8119e8;hb=7d0f52f7e5cb16d204490ca4006983237bf3df7d;hp=421ab7981cf06d903c6df3127d1298304856af76;hpb=c3cd66a00cdb4afbd43108563d979eebfbafaf69;p=libsigrok.git

diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index 421ab798..e369a44c 100644
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -28,8 +28,11 @@ static const uint32_t scanopts[] = {
 	SR_CONF_SERIALCOMM,
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
 	SR_CONF_SCALE,
+};
+
+static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_SET,
@@ -79,7 +82,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	serial_flush(serial);
 
 	sr_spew("Set O1 mode (continuous values, stable and unstable ones).");
-	if (serial_write_nonblocking(serial, "O1\r\n", 4) != 4)
+	if (serial_write_blocking(serial, "O1\r\n", 4, 0) < 0)
 		goto scan_cleanup;
 	/* Device replies with "A00\r\n" (OK) or "E01\r\n" (Error). Ignore. */
 
@@ -110,8 +113,8 @@ scan_cleanup:
 	return std_scan_complete(di, devices);
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 
@@ -122,26 +125,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	(void)sdi;
-	(void)cg;
-
-	switch (key) {
-	case SR_CONF_SCAN_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		break;
-	case SR_CONF_DEVICE_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-		break;
-	default:
-		return SR_ERR_NA;
-	}
-
-	return SR_OK;
+	return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -153,14 +140,13 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	serial = sdi->conn;
 
 	sr_spew("Set O1 mode (continuous values, stable and unstable ones).");
-	if (serial_write_nonblocking(serial, "O1\r\n", 4) != 4)
+	if (serial_write_blocking(serial, "O1\r\n", 4, 0) < 0)
 		return SR_ERR;
 	/* Device replies with "A00\r\n" (OK) or "E01\r\n" (Error). Ignore. */
 
 	sr_sw_limits_acquisition_start(&devc->limits);
 	std_session_send_df_header(sdi);
 
-	/* Poll every 50ms, or whenever some data comes in. */
 	serial_source_add(sdi->session, serial, G_IO_IN, 50,
 		      kern_scale_receive_data, (void *)sdi);
 
@@ -178,6 +164,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 			.cleanup = std_cleanup, \
 			.scan = scan, \
 			.dev_list = std_dev_list, \
+			.dev_clear = std_dev_clear, \
 			.config_get = NULL, \
 			.config_set = config_set, \
 			.config_list = config_list, \