Bump copyright year

[libsigrok.git] / hardware / fx2lafw / fx2lafw.c

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index a0955371a21e105fd129208a03e7c6d4ef264691..4830b4c306ee1de8c460ceb4e88b70a0164663a0 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -118,10 +118,10 @@ static const uint64_t supported_samplerates[] = {
 };
 
 static const struct sr_samplerates samplerates = {
-       0,
-       0,
-       0,
-       supported_samplerates,
+       .low  = 0,
+       .high = 0,
+       .step = 0,
+       .list = supported_samplerates,
 };
 
 SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
@@ -478,11 +478,7 @@ static GSList *hw_scan(GSList *options)
 
 static GSList *hw_dev_list(void)
 {
-       struct drv_context *drvc;
-
-       drvc = di->priv;
-
-       return drvc->instances;
+       return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -563,6 +559,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
        struct dev_context *devc;
 
        devc = sdi->priv;
+
        if (devc->usb->devhdl == NULL)
                return SR_ERR;
 
@@ -691,7 +688,7 @@ static void finish_acquisition(struct dev_context *devc)
 
        /* Terminate session. */
        packet.type = SR_DF_END;
-       sr_session_send(devc->session_dev_id, &packet);
+       sr_session_send(devc->cb_data, &packet);
 
        /* Remove fds from polling. */
        lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
@@ -823,7 +820,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
                                         */
                                        packet.type = SR_DF_TRIGGER;
                                        packet.payload = NULL;
-                                       sr_session_send(devc->session_dev_id, &packet);
+                                       sr_session_send(devc->cb_data, &packet);
 
                                        /*
                                         * Send the samples that triggered it,
@@ -834,7 +831,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
                                        logic.unitsize = sizeof(*devc->trigger_buffer);
                                        logic.length = devc->trigger_stage * logic.unitsize;
                                        logic.data = devc->trigger_buffer;
-                                       sr_session_send(devc->session_dev_id, &packet);
+                                       sr_session_send(devc->cb_data, &packet);
 
                                        devc->trigger_stage = TRIGGER_FIRED;
                                        break;
@@ -864,7 +861,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
                logic.length = transfer->actual_length - trigger_offset_bytes;
                logic.unitsize = sample_width;
                logic.data = cur_buf + trigger_offset_bytes;
-               sr_session_send(devc->session_dev_id, &packet);
+               sr_session_send(devc->cb_data, &packet);
 
                devc->num_samples += cur_sample_count;
                if (devc->limit_samples &&
@@ -926,8 +923,6 @@ static unsigned int get_timeout(struct dev_context *devc)
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                void *cb_data)
 {
-       struct sr_datafeed_packet packet;
-       struct sr_datafeed_header header;
        struct dev_context *devc;
        struct drv_context *drvc;
        struct libusb_transfer *transfer;
@@ -948,7 +943,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_ERR;
        }
 
-       devc->session_dev_id = cb_data;
+       devc->cb_data = cb_data;
        devc->num_samples = 0;
        devc->empty_transfer_count = 0;
 
@@ -991,11 +986,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                              timeout, receive_data, NULL);
        free(lupfd); /* NOT g_free()! */
 
-       packet.type = SR_DF_HEADER;
-       packet.payload = &header;
-       header.feed_version = 1;
-       gettimeofday(&header.starttime, NULL);
-       sr_session_send(cb_data, &packet);
+       /* Send header packet to the session bus. */
+       std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
        if ((ret = command_start_acquisition(devc->usb->devhdl,
                devc->cur_samplerate, devc->sample_wide)) != SR_OK) {