X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdevice.c;h=7bfaa4cfb93e572c04f25010d75e174679d8f44a;hb=f2209364737835ba78126cf7f2a707f63182f0e6;hp=a331536c733b9c82fff8cede49025e45e30026de;hpb=379d2609651e16956ae51b90e324e82d0e85b854;p=libsigrok.git diff --git a/src/device.c b/src/device.c index a331536c..7bfaa4cf 100644 --- a/src/device.c +++ b/src/device.c @@ -213,7 +213,7 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key) * @retval struct sr_dev_inst *. Dynamically allocated, free using * sr_dev_inst_free(). */ -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 status, const char *vendor, const char *model, const char *version) { struct sr_dev_inst *sdi; @@ -224,12 +224,13 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int index, int status, } sdi->driver = NULL; - sdi->index = index; sdi->status = status; 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->serial_num = NULL; + sdi->connection_id = NULL; sdi->channels = NULL; sdi->channel_groups = NULL; sdi->session = NULL; @@ -262,6 +263,8 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi) g_free(sdi->vendor); g_free(sdi->model); g_free(sdi->version); + g_free(sdi->serial_num); + g_free(sdi->connection_id); g_free(sdi); }