X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-bm86x%2Fapi.c;h=65fcb428ef078af0817dad445e9c4fecfd14b8d5;hb=5a971f66a37df7c4dbe7799b3c7fc7eb30055a61;hp=dee492af65fe7c7f843087068c9e96f10ccc4df0;hpb=a0e0bb4149081eda06714f1158639f2dadcfa9d8;p=libsigrok.git

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index dee492af..65fcb428 100644
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -27,9 +27,9 @@ static const uint32_t scanopts[] = {
 
 static const uint32_t devopts[] = {
 	SR_CONF_MULTIMETER,
-	SR_CONF_LIMIT_SAMPLES,
-	SR_CONF_LIMIT_MSEC,
 	SR_CONF_CONTINUOUS,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 };
 
 SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
@@ -73,24 +73,16 @@ static GSList *scan(GSList *options)
 	for (l = usb_devices; l; l = l->next) {
 		usb = l->data;
 
-		if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
-		                            "Brymen", "BM869", NULL))) {
-			sr_err("sr_dev_inst_new returned NULL.");
-			return NULL;
-		}
-
-		if (!(devc = g_try_malloc0(sizeof(*devc)))) {
-			sr_err("Device context malloc failed.");
-			return NULL;
-		}
-
+		sdi = g_malloc0(sizeof(struct sr_dev_inst));
+		sdi->status = SR_ST_INACTIVE;
+		sdi->vendor = g_strdup("Brymen");
+		sdi->model = g_strdup("BM869");
+		devc = g_malloc0(sizeof(struct dev_context));
 		sdi->priv = devc;
 		sdi->driver = di;
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
-			return NULL;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P2")))
-			return NULL;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P2");
 		sdi->channels = g_slist_append(sdi->channels, ch);
 
 		sdi->inst_type = SR_INST_USB;