Create & use new sr_usbtmc_dev_inst for Rigol DS driver.

[libsigrok.git] / device.c

diff --git a/device.c b/device.c
index 8cdb8adf68ad050e2e9be4cda58e12f48801fff6..0167a220cc390b289bbfd121e650c5a32f4cb74a 100644 (file)
--- a/device.c
+++ b/device.c
@@ -265,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);
@@ -299,6 +302,8 @@ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
 
 #endif
 
+#ifdef HAVE_LIBSERIALPORT
+
 /**
  * @private
  *
@@ -345,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.