Use ALL_ZERO in a few more places.

[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 b05e644aff3b616f66a13db3fab75f2aa2d279dc..d96afdb2f68318585fc65e40fc7351d98b777f42 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -88,24 +88,24 @@ static const struct dso_profile dev_profiles[] = {
        {       0x04b4, 0x2090, 0x04b5, 0x2090,
                "Hantek", "DSO-2090",
                buffersizes_32k,
-               FIRMWARE_DIR "/hantek-dso-2090.fw" },
+               "hantek-dso-2090.fw" },
        {       0x04b4, 0x2150, 0x04b5, 0x2150,
                "Hantek", "DSO-2150",
                buffersizes_32k,
-               FIRMWARE_DIR "/hantek-dso-2150.fw" },
+               "hantek-dso-2150.fw" },
        {       0x04b4, 0x2250, 0x04b5, 0x2250,
                "Hantek", "DSO-2250",
                buffersizes_512k,
-               FIRMWARE_DIR "/hantek-dso-2250.fw" },
+               "hantek-dso-2250.fw" },
        {       0x04b4, 0x5200, 0x04b5, 0x5200,
                "Hantek", "DSO-5200",
                buffersizes_14k,
-               FIRMWARE_DIR "/hantek-dso-5200.fw" },
+               "hantek-dso-5200.fw" },
        {       0x04b4, 0x520a, 0x04b5, 0x520a,
                "Hantek", "DSO-5200A",
                buffersizes_512k,
-               FIRMWARE_DIR "/hantek-dso-5200A.fw" },
-       { 0, 0, 0, 0, 0, 0, 0, 0 },
+               "hantek-dso-5200A.fw" },
+       ALL_ZERO
 };
 
 static const uint64_t timebases[][2] = {
@@ -323,8 +323,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                                sdi->connection_id = g_strdup(connection_id);
                                devices = g_slist_append(devices, sdi);
                                devc = sdi->priv;
-                               if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
-                                               prof->firmware) == SR_OK)
+                               if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
+                                               USB_CONFIGURATION, prof->firmware) == SR_OK)
                                        /* Remember when the firmware on this device was updated */
                                        devc->fw_updated = g_get_monotonic_time();
                                else
@@ -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;