X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fapi.c;h=d420998889ed3b821db735ddfee86cdc554d87c4;hb=8dc423b033678508ec08d7c473d883d4b3a58178;hp=8f04809e070d7ad39f93f10e3975dbe8f3aa97e9;hpb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;p=libsigrok.git diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c index 8f04809e..d4209988 100644 --- a/src/hardware/asix-sigma/api.c +++ b/src/hardware/asix-sigma/api.c @@ -65,7 +65,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) { struct sr_dev_inst *sdi; struct dev_context *devc; - GSList *devices; struct ftdi_device_list *devlist; char serial_txt[10]; uint32_t serial; @@ -74,8 +73,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) (void)options; - devices = NULL; - devc = g_malloc0(sizeof(struct dev_context)); ftdi_init(&devc->ftdic); @@ -120,13 +117,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) for (i = 0; i < ARRAY_SIZE(channel_names); i++) sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_names[i]); - devices = g_slist_append(devices, sdi); sdi->priv = devc; /* We will open the device again when we need it. */ ftdi_list_free(&devlist); - return std_scan_complete(di, devices); + return std_scan_complete(di, g_slist_append(NULL, sdi)); free: ftdi_deinit(&devc->ftdic); @@ -376,7 +372,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) gettimeofday(&devc->start_tv, 0); sigma_set_register(WRITE_MODE, 0x0d, devc); - std_session_send_df_header(sdi, LOG_PREFIX); + std_session_send_df_header(sdi); /* Add capture source. */ sr_session_source_add(sdi->session, -1, 0, 10, sigma_receive_data, (void *)sdi);