X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=327ddc73df50b723ee7a314970046dfb764b4eda;hb=4a35548bbee613149fa4fbfa3dd9eaacb7511376;hp=2ad678497421a0247e264374b2f61cc6e5d075a8;hpb=9e2e98640ac2b12545f4923a143d06d3896f8435;p=libsigrok.git

diff --git a/device.c b/device.c
index 2ad67849..327ddc73 100644
--- a/device.c
+++ b/device.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
@@ -23,14 +23,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "device: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "device: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 /**
  * @file
@@ -258,10 +258,11 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
 	for (l = sdi->probes; l; l = l->next) {
 		probe = l->data;
 		g_free(probe->name);
+		g_free(probe->trigger);
 		g_free(probe);
 	}
+	g_slist_free(sdi->probes);
 
-	g_free(sdi->priv);
 	g_free(sdi->vendor);
 	g_free(sdi->model);
 	g_free(sdi->version);
@@ -291,9 +292,7 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 /** @private */
 SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
 {
-	(void)usb;
-
-	/* Nothing to do for this device instance type. */
+	g_free(usb);
 }
 
 #endif
@@ -345,7 +344,17 @@ SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial)
 	g_free(serial);
 }
 
-SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver)
+/**
+ * Get the list of devices/instances of the specified driver.
+ *
+ * @param driver The driver to use. Must not be NULL.
+ *
+ * @return The list of devices/instances of this driver, or NULL upon errors
+ *         or if the list is empty.
+ *
+ * @since 0.1.0 (but the API changed in 0.2.0)
+ */
+SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver)
 {
 	if (driver && driver->dev_list)
 		return driver->dev_list();
@@ -353,7 +362,16 @@ SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver)
 		return NULL;
 }
 
-SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver)
+/**
+ * Clear all devices/instances of the specified driver.
+ *
+ * @param driver The driver to use. Must not be NULL.
+ *
+ * @return SR_OK upon success, a negative error code upon errors.
+ *
+ * @since 0.2.0
+ */
+SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
 {
 	if (driver && driver->dev_clear)
 		return driver->dev_clear();
@@ -361,4 +379,46 @@ SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver)
 		return SR_OK;
 }
 
+/**
+ * Open the specified device.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return SR_OK upon success, a negative error code upon errors.
+ *
+ * @since 0.2.0
+ */
+SR_API int sr_dev_open(struct sr_dev_inst *sdi)
+{
+	int ret;
+
+	if (!sdi || !sdi->driver || !sdi->driver->dev_open)
+		return SR_ERR;
+
+	ret = sdi->driver->dev_open(sdi);
+
+	return ret;
+}
+
+/**
+ * Close the specified device.
+ *
+ * @param sdi Device instance to use. Must not be NULL.
+ *
+ * @return SR_OK upon success, a negative error code upon errors.
+ *
+ * @since 0.2.0
+ */
+SR_API int sr_dev_close(struct sr_dev_inst *sdi)
+{
+	int ret;
+
+	if (!sdi || !sdi->driver || !sdi->driver->dev_close)
+		return SR_ERR;
+
+	ret = sdi->driver->dev_close(sdi);
+
+	return ret;
+}
+
 /** @} */