X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=0167a220cc390b289bbfd121e650c5a32f4cb74a;hb=6936af3292b6a76a4ef5521fd8ea752333f13ae8;hp=b261d6a741b2e93b6a54b958abb532e71361c6a9;hpb=53f05fa80f1f9d7657f1173f24d9d1e2b740a312;p=libsigrok.git

diff --git a/device.c b/device.c
index b261d6a7..0167a220 100644
--- a/device.c
+++ b/device.c
@@ -208,7 +208,8 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
 	if (!sdi || !sdi->driver || !sdi->driver->config_list)
 		return FALSE;
 
-	if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS, &gvar, NULL) != SR_OK)
+	if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS,
+				&gvar, NULL, NULL) != SR_OK)
 		return FALSE;
 
 	ret = FALSE;
@@ -243,6 +244,7 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
 	sdi->model = model ? g_strdup(model) : NULL;
 	sdi->version = version ? g_strdup(version) : NULL;
 	sdi->probes = NULL;
+	sdi->probe_groups = NULL;
 	sdi->conn = NULL;
 	sdi->priv = NULL;
 
@@ -263,6 +265,9 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
 	}
 	g_slist_free(sdi->probes);
 
+	if (sdi->probe_groups)
+		g_slist_free(sdi->probe_groups);
+
 	g_free(sdi->vendor);
 	g_free(sdi->model);
 	g_free(sdi->version);
@@ -297,6 +302,8 @@ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
 
 #endif
 
+#ifdef HAVE_LIBSERIALPORT
+
 /**
  * @private
  *
@@ -343,6 +350,33 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
 	g_free(serial->serialcomm);
 	g_free(serial);
 }
+#endif
+
+SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
+{
+	struct sr_usbtmc_dev_inst *usbtmc;
+
+	if (!device) {
+		sr_err("Device name required.");
+		return NULL;
+	}
+
+	if (!(usbtmc = g_try_malloc0(sizeof(struct sr_usbtmc_dev_inst)))) {
+		sr_err("USBTMC device instance malloc failed.");
+		return NULL;
+	}
+
+	usbtmc->device = g_strdup(device);
+	usbtmc->fd = -1;
+
+	return usbtmc;
+}
+
+SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc)
+{
+	g_free(usbtmc->device);
+	g_free(usbtmc);
+}
 
 /**
  * Get the list of devices/instances of the specified driver.