Change sr_dev_inst_new() to take no parameters.

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 969faa4de5bd4d3e7f7e7d38179170b9a1c8458c..a45bd9826e4dd01820c0c0e6760a9978bf96b369 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -202,33 +202,23 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
 }
 
 /** @private
- *  Allocate and init 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
- *  @param[in]  model   @copydoc sr_dev_inst::model
- *  @param[in]  version @copydoc sr_dev_inst::version
+ *  Allocate and init a new device instance struct.
  *
- *  @retval NULL Error
  *  @retval struct sr_dev_inst *. Dynamically allocated, free using
  *              sr_dev_inst_free().
  */
-SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int status,
-               const char *vendor, const char *model, const char *version)
+SR_PRIV struct sr_dev_inst *sr_dev_inst_new(void)
 {
        struct sr_dev_inst *sdi;
 
-       if (!(sdi = g_try_malloc(sizeof(struct sr_dev_inst)))) {
-               sr_err("Device instance malloc failed.");
-               return NULL;
-       }
+       sdi = g_malloc0(sizeof(struct sr_dev_inst));
 
        sdi->driver = NULL;
-       sdi->status = status;
+       sdi->status = -1;
        sdi->inst_type = -1;
-       sdi->vendor = vendor ? g_strdup(vendor) : NULL;
-       sdi->model = model ? g_strdup(model) : NULL;
-       sdi->version = version ? g_strdup(version) : NULL;
+       sdi->vendor = NULL;
+       sdi->model = NULL;
+       sdi->version = NULL;
        sdi->serial_num = NULL;
        sdi->connection_id = NULL;
        sdi->channels = NULL;
@@ -240,6 +230,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();
+       sdi->vendor = g_strdup(vendor);
+       sdi->model = g_strdup(model);
+       sdi->version = g_strdup(version);
+       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.