X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frdtech-um%2Fapi.c;h=3f086ae63f2a0e16518581b95bf3e1edde5f9917;hb=bc9aa94b92c5ac0271769af4605992d7a38e65bc;hp=a6c5f6976445470c416772342c73977dca678ecb;hpb=fda34e5af6e7a11744035c1c8df2f2b2f95cf1d8;p=libsigrok.git diff --git a/src/hardware/rdtech-um/api.c b/src/hardware/rdtech-um/api.c index a6c5f697..3f086ae6 100644 --- a/src/hardware/rdtech-um/api.c +++ b/src/hardware/rdtech-um/api.c @@ -67,19 +67,18 @@ static GSList *rdtech_um_scan(struct sr_dev_driver *di, goto err_out_serial; } - devc = g_malloc0(sizeof(struct dev_context)); - sdi = g_malloc0(sizeof(struct sr_dev_inst)); - + devc = g_malloc0(sizeof(*devc)); sr_sw_limits_init(&devc->limits); devc->profile = p; + sdi = g_malloc0(sizeof(*sdi)); + sdi->priv = devc; sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("RDTech"); sdi->model = g_strdup(p->model_name); sdi->version = NULL; sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; - sdi->priv = devc; for (ch_idx = 0; (name = p->channels[ch_idx].name); ch_idx++) sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, name); @@ -156,7 +155,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) serial_source_add(sdi->session, serial, G_IO_IN, 50, rdtech_um_receive_data, (void *)sdi); - return rdtech_um_poll(sdi); + return rdtech_um_poll(sdi, TRUE); } static struct sr_dev_driver rdtech_um_driver_info = {