output: Add srzip, the session file format.

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 8e06fc180359689016f43f66c9bf947d7f109d69..fb40182c13b6404a773fe0814520fe0092f64823 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -202,7 +202,7 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
 }
 
 /** @private
- *  Allocate and init new device instance struct.
+ *  Allocate and init a new device instance struct.
  *  @param[in]  index   @copydoc sr_dev_inst::index
  *  @param[in]  status  @copydoc sr_dev_inst::status
  *  @param[in]  vendor  @copydoc sr_dev_inst::vendor
@@ -240,6 +240,42 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int status,
        return sdi;
 }
 
+/**
+ * Allocate and init a new user-generated device instance.
+ */
+SR_API struct sr_dev_inst *sr_dev_inst_user_new(const char *vendor,
+               const char *model, const char *version)
+{
+       struct sr_dev_inst *sdi;
+
+       sdi = sr_dev_inst_new(0, vendor, model, version);
+       if (!sdi)
+               return NULL;
+
+       sdi->inst_type = SR_INST_USER;
+
+       return sdi;
+}
+
+/**
+ * Add a new channel to the specified device instance.
+ */
+SR_API int sr_dev_inst_channel_add(struct sr_dev_inst *sdi, int index, int type, const char *name)
+{
+       struct sr_channel *ch;
+
+       if (!sdi || sdi->inst_type != SR_INST_USER || index < 0)
+               return SR_ERR_ARG;
+
+       ch = sr_channel_new(index, type, TRUE, name);
+       if (!ch)
+               return SR_ERR;
+
+       sdi->channels = g_slist_append(sdi->channels, ch);
+
+       return SR_OK;
+}
+
 /** @private
  *  Free device instance struct created by sr_dev_inst().
  *  @param sdi device instance to free.
@@ -489,7 +525,7 @@ SR_API int sr_dev_close(struct sr_dev_inst *sdi)
  *
  * @return The driver instance or NULL on error.
  */
-SR_API struct sr_dev_driver *sr_dev_inst_driver_get(struct sr_dev_inst *sdi)
+SR_API struct sr_dev_driver *sr_dev_inst_driver_get(const struct sr_dev_inst *sdi)
 {
        if (!sdi || !sdi->driver)
                return NULL;
@@ -504,7 +540,7 @@ SR_API struct sr_dev_driver *sr_dev_inst_driver_get(struct sr_dev_inst *sdi)
  *
  * @return The vendor string or NULL.
  */
-SR_API const char *sr_dev_inst_vendor_get(struct sr_dev_inst *sdi)
+SR_API const char *sr_dev_inst_vendor_get(const struct sr_dev_inst *sdi)
 {
        if (!sdi)
                return NULL;
@@ -519,7 +555,7 @@ SR_API const char *sr_dev_inst_vendor_get(struct sr_dev_inst *sdi)
  *
  * @return The model string or NULL.
  */
-SR_API const char *sr_dev_inst_model_get(struct sr_dev_inst *sdi)
+SR_API const char *sr_dev_inst_model_get(const struct sr_dev_inst *sdi)
 {
        if (!sdi)
                return NULL;
@@ -534,7 +570,7 @@ SR_API const char *sr_dev_inst_model_get(struct sr_dev_inst *sdi)
  *
  * @return The version string or NULL.
  */
-SR_API const char *sr_dev_inst_version_get(struct sr_dev_inst *sdi)
+SR_API const char *sr_dev_inst_version_get(const struct sr_dev_inst *sdi)
 {
        if (!sdi)
                return NULL;
@@ -549,7 +585,7 @@ SR_API const char *sr_dev_inst_version_get(struct sr_dev_inst *sdi)
  *
  * @return The serial number string or NULL.
  */
-SR_API const char *sr_dev_inst_sernum_get(struct sr_dev_inst *sdi)
+SR_API const char *sr_dev_inst_sernum_get(const struct sr_dev_inst *sdi)
 {
        if (!sdi)
                return NULL;
@@ -565,7 +601,7 @@ SR_API const char *sr_dev_inst_sernum_get(struct sr_dev_inst *sdi)
  * @return A copy of the connection id string or NULL. The caller is responsible
  *         for g_free()ing the string when it is no longer needed.
  */
-SR_API const char *sr_dev_inst_connid_get(struct sr_dev_inst *sdi)
+SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
 {
        struct drv_context *drvc;
        int r, cnt, i, a, b;
@@ -587,7 +623,7 @@ SR_API const char *sr_dev_inst_connid_get(struct sr_dev_inst *sdi)
                /* connection_id isn't populated, let's do that here. */
 
                serial = sdi->conn;
-               sdi->connection_id = g_strdup(serial->port);
+               ((struct sr_dev_inst *)sdi)->connection_id = g_strdup(serial->port);
        }
 #endif
 
@@ -619,7 +655,7 @@ SR_API const char *sr_dev_inst_connid_get(struct sr_dev_inst *sdi)
                                continue;
 
                        usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
-                       sdi->connection_id = g_strdup(connection_id);
+                       ((struct sr_dev_inst *)sdi)->connection_id = g_strdup(connection_id);
                        break;
                }
 
@@ -637,7 +673,7 @@ SR_API const char *sr_dev_inst_connid_get(struct sr_dev_inst *sdi)
  *
  * @return The GSList of channels or NULL.
  */
-SR_API GSList *sr_dev_inst_channels_get(struct sr_dev_inst *sdi)
+SR_API GSList *sr_dev_inst_channels_get(const struct sr_dev_inst *sdi)
 {
        if (!sdi)
                return NULL;
@@ -652,7 +688,7 @@ SR_API GSList *sr_dev_inst_channels_get(struct sr_dev_inst *sdi)
  *
  * @return The GSList of channel groups or NULL.
  */
-SR_API GSList *sr_dev_inst_channel_groups_get(struct sr_dev_inst *sdi)
+SR_API GSList *sr_dev_inst_channel_groups_get(const struct sr_dev_inst *sdi)
 {
        if (!sdi)
                return NULL;