Drop deprecated sr_session_halt().

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

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 345468c41be550174350ecd2ea4b7984edf37499..560d1be3c5d99da52c5d950f810716a475e58fce 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -79,7 +79,7 @@ struct dev_context {
        GIOChannel *channels[2];
        uint8_t sample_generator;
        uint64_t samples_counter;
-       void *session_dev_id;
+       void *cb_data;
        int64_t starttime;
 };
 
@@ -94,10 +94,10 @@ static const int hwcaps[] = {
 };
 
 static const struct sr_samplerates samplerates = {
-       SR_HZ(1),
-       SR_GHZ(1),
-       SR_HZ(1),
-       NULL,
+       .low  = SR_HZ(1),
+       .high = SR_GHZ(1),
+       .step = SR_HZ(1),
+       .list = NULL,
 };
 
 static const char *pattern_strings[] = {
@@ -148,16 +148,7 @@ static int clear_instances(void)
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-       struct drv_context *drvc;
-
-       if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-               sr_err("Driver context malloc failed.");
-               return SR_ERR_MALLOC;
-       }
-       drvc->sr_ctx = sr_ctx;
-       di->priv = drvc;
-
-       return SR_OK;
+       return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -171,6 +162,7 @@ static GSList *hw_scan(GSList *options)
        (void)options;
 
        drvc = di->priv;
+
        devices = NULL;
 
        sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
@@ -195,11 +187,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)
@@ -231,9 +219,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        (void)sdi;
 
        switch (id) {
-       case SR_DI_HWCAPS:
-               *data = hwcaps;
-               break;
        case SR_CONF_SAMPLERATE:
                *data = &cur_samplerate;
                break;
@@ -298,6 +283,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
        (void)sdi;
 
        switch (key) {
+       case SR_CONF_DEVICE_OPTIONS:
+               *data = hwcaps;
+               break;
        case SR_CONF_SAMPLERATE:
                *data = &samplerates;
                break;
@@ -383,7 +371,7 @@ static int receive_data(int fd, int revents, void *cb_data)
                logic.length = sending_now;
                logic.unitsize = 1;
                logic.data = buf;
-               sr_session_send(devc->session_dev_id, &packet);
+               sr_session_send(devc->cb_data, &packet);
                devc->samples_counter += sending_now;
        }
 
@@ -399,14 +387,10 @@ static int receive_data(int fd, int revents, void *cb_data)
 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;
 
        (void)sdi;
 
-       sr_dbg("Starting acquisition.");
-
        /* TODO: 'devc' is never g_free()'d? */
        if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
                sr_err("%s: devc malloc failed", __func__);
@@ -414,7 +398,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        }
 
        devc->sample_generator = default_pattern;
-       devc->session_dev_id = cb_data;
+       devc->cb_data = cb_data;
        devc->samples_counter = 0;
 
        /*
@@ -446,28 +430,12 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        sr_session_source_add_channel(devc->channels[0], G_IO_IN | G_IO_ERR,
                    40, receive_data, devc);
 
-       if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-               sr_err("%s: packet malloc failed", __func__);
-               return SR_ERR_MALLOC;
-       }
-
-       if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-               sr_err("%s: header malloc failed", __func__);
-               return SR_ERR_MALLOC;
-       }
-
-       packet->type = SR_DF_HEADER;
-       packet->payload = header;
-       header->feed_version = 1;
-       gettimeofday(&header->starttime, NULL);
-       sr_session_send(devc->session_dev_id, packet);
+       /* Send header packet to the session bus. */
+       std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
        /* We use this timestamp to decide how many more samples to send. */
        devc->starttime = g_get_monotonic_time();
 
-       g_free(header);
-       g_free(packet);
-
        return SR_OK;
 }
 
@@ -487,7 +455,7 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 
        /* Send last packet. */
        packet.type = SR_DF_END;
-       sr_session_send(devc->session_dev_id, &packet);
+       sr_session_send(devc->cb_data, &packet);
 
        return SR_OK;
 }