Constify a lot more items.

[libsigrok.git] / src / hardware / hantek-dso / api.c

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index e55f4e09f89b0b648a0ba896c28c1f06406acbed..1c9289e5712efbf40a7aaf5127fb0443a4f65d71 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -428,7 +428,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 {
        struct dev_context *devc;
        struct sr_usb_dev_inst *usb;
-       char str[128], *s;
+       char str[128];
+       const char *s;
        const uint64_t *vdiv;
        int ch_idx;
 
@@ -708,14 +709,14 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
                int num_samples)
 {
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct dev_context *devc;
        float ch1, ch2, range;
        int num_channels, data_offset, i;
 
        devc = sdi->priv;
        num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
        /* TODO: support for 5xxx series 9-bit samples */
        analog.channels = devc->enabled_channels;