Add and use std_session_send_df_header().

[libsigrok.git] / hardware / mic-985xx / api.c

diff --git a/hardware/mic-985xx/api.c b/hardware/mic-985xx/api.c
index b8983a6dab69aa336baf78edad383d04cfa89af3..bfb942ed118fdcf49fc9eafa557592f4ab793a68 100644 (file)
--- a/hardware/mic-985xx/api.c
+++ b/hardware/mic-985xx/api.c
@@ -169,11 +169,7 @@ static GSList *hw_scan(GSList *options, int idx)
 
 static GSList *hw_dev_list(int idx)
 {
-       struct drv_context *drvc;
-
-       drvc = mic_devs[idx].di->priv;
-
-       return drvc->instances;
+       return ((struct drv_context *)(mic_devs[idx].di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -260,26 +256,17 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                                    void *cb_data, int idx)
 {
-       struct sr_datafeed_packet packet;
-       struct sr_datafeed_header header;
        struct dev_context *devc;
 
        devc = sdi->priv;
 
        devc->cb_data = cb_data;
 
-       sr_dbg("Starting acquisition.");
-
        devc->num_samples = 0;
        devc->starttime = g_get_monotonic_time();
 
        /* Send header packet to the session bus. */
-       sr_dbg("Sending SR_DF_HEADER.");
-       packet.type = SR_DF_HEADER;
-       packet.payload = (uint8_t *)&header;
-       header.feed_version = 1;
-       gettimeofday(&header.starttime, NULL);
-       sr_session_send(devc->cb_data, &packet);
+       std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
        /* Poll every 100ms, or whenever some data comes in. */
        sr_source_add(devc->serial->fd, G_IO_IN, 100,