Code drop from DreamSourceLabs first source release.

[libsigrok.git] / device.c

diff --git a/device.c b/device.c
index e49318e236cd7d48169319761401edc874f206ab..cca0bcd33d5e99b8c9790a90bf7d0f9d2d323667 100644 (file)
--- 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
@@ -225,7 +225,7 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
 }
 
 /** @private */
-SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
+SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int mode, int index, int status,
                const char *vendor, const char *model, const char *version)
 {
        struct sr_dev_inst *sdi;
@@ -236,6 +236,7 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
        }
 
        sdi->driver = NULL;
+    sdi->mode = mode;
        sdi->index = index;
        sdi->status = status;
        sdi->inst_type = -1;
@@ -250,6 +251,20 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status,
 }
 
 /** @private */
+SR_PRIV void sr_dev_probes_free(struct sr_dev_inst *sdi)
+{
+    struct sr_probe *probe;
+    GSList *l;
+
+    for (l = sdi->probes; l; l = l->next) {
+        probe = l->data;
+        g_free(probe->name);
+        g_free(probe);
+    }
+
+    sdi->probes = NULL;
+}
+
 SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
 {
        struct sr_probe *probe;
@@ -361,4 +376,28 @@ SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
                return SR_OK;
 }
 
+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;
+}
+
+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;
+}
+
 /** @} */