hantek-dso: Use message logging helpers.

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

diff --git a/hardware/hantek-dso/dso.c b/hardware/hantek-dso/dso.c
index 853bab340146ce2bb34eefa4cb3d12b5de203fcd..66d6978f24bbd3d720d8796bc8315c7cfafd1b6a 100644 (file)
--- a/hardware/hantek-dso/dso.c
+++ b/hardware/hantek-dso/dso.c
@@ -237,7 +237,7 @@ static int get_channel_offsets(struct dev_context *devc)
                                        devc->channel_levels[chan][v][0],
                                        devc->channel_levels[chan][v][1]);
                        }
-                       sr_dbg(gs->str);
+                       sr_dbg("%s", gs->str);
                }
                g_string_free(gs, TRUE);
        }
@@ -393,8 +393,7 @@ SR_PRIV int dso_set_filters(struct dev_context *devc)
                        DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
                        cmdstring, sizeof(cmdstring),
                        &tmp, 100)) != 0) {
-               sr_err("Failed to set filters: %s",
-                      libusb_error_name(ret));
+               sr_err("Failed to set filters: %s.", libusb_error_name(ret));
                return SR_ERR;
        }
        sr_dbg("Sent CMD_SET_FILTERS.");
@@ -461,8 +460,7 @@ SR_PRIV int dso_set_voltage(struct dev_context *devc)
                        DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
                        cmdstring, sizeof(cmdstring),
                        &tmp, 100)) != 0) {
-               sr_err("Failed to set voltage: %s.",
-                      libusb_error_name(ret));
+               sr_err("Failed to set voltage: %s.", libusb_error_name(ret));
                return SR_ERR;
        }
        sr_dbg("Sent CMD_SET_VOLTAGE.");
@@ -507,15 +505,14 @@ SR_PRIV int dso_set_relays(struct dev_context *devc)
                g_string_printf(gs, "Relays:");
                for (i = 0; i < 17; i++)
                        g_string_append_printf(gs, " %.2x", relays[i]);
-               sr_dbg(gs->str);
+               sr_dbg("%s", gs->str);
                g_string_free(gs, TRUE);
        }
 
        if ((ret = libusb_control_transfer(devc->usb->devhdl,
                        LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETRELAYS,
                        0, 0, relays, 17, 100)) != sizeof(relays)) {
-               sr_err("Failed to set relays: %s.",
-                      libusb_error_name(ret));
+               sr_err("Failed to set relays: %s.", libusb_error_name(ret));
                return SR_ERR;
        }
        sr_dbg("Sent CTRL_SETRELAYS.");
@@ -558,8 +555,7 @@ SR_PRIV int dso_set_voffsets(struct dev_context *devc)
        if ((ret = libusb_control_transfer(devc->usb->devhdl,
                        LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETOFFSET,
                        0, 0, offsets, sizeof(offsets), 100)) != sizeof(offsets)) {
-               sr_err("Failed to set offsets: %s.",
-                      libusb_error_name(ret));
+               sr_err("Failed to set offsets: %s.", libusb_error_name(ret));
                return SR_ERR;
        }
        sr_dbg("Sent CTRL_SETOFFSET.");
@@ -585,8 +581,7 @@ SR_PRIV int dso_enable_trigger(struct dev_context *devc)
                        DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
                        cmdstring, sizeof(cmdstring),
                        &tmp, 100)) != 0) {
-               sr_err("Failed to enable trigger: %s.",
-                      libusb_error_name(ret));
+               sr_err("Failed to enable trigger: %s.", libusb_error_name(ret));
                return SR_ERR;
        }
 
@@ -611,8 +606,7 @@ SR_PRIV int dso_force_trigger(struct dev_context *devc)
                        DSO_EP_OUT | LIBUSB_ENDPOINT_OUT,
                        cmdstring, sizeof(cmdstring),
                        &tmp, 100)) != 0) {
-               sr_err("Failed to force trigger: %s.",
-                      libusb_error_name(ret));
+               sr_err("Failed to force trigger: %s.", libusb_error_name(ret));
                return SR_ERR;
        }
 
@@ -713,13 +707,16 @@ SR_PRIV int dso_capture_start(struct dev_context *devc)
        return SR_OK;
 }
 
-SR_PRIV int dso_get_channeldata(struct dev_context *devc, libusb_transfer_cb_fn cb)
+SR_PRIV int dso_get_channeldata(const struct sr_dev_inst *sdi,
+               libusb_transfer_cb_fn cb)
 {
+       struct dev_context *devc;
        struct libusb_transfer *transfer;
        int num_transfers, ret, i;
        uint8_t cmdstring[2];
        unsigned char *buf;
 
+       devc = sdi->priv;
        sr_dbg("Sending CMD_GET_CHANNELDATA.");
 
        cmdstring[0] = CMD_GET_CHANNELDATA;
@@ -743,7 +740,7 @@ SR_PRIV int dso_get_channeldata(struct dev_context *devc, libusb_transfer_cb_fn
                transfer = libusb_alloc_transfer(0);
                libusb_fill_bulk_transfer(transfer, devc->usb->devhdl,
                                DSO_EP_IN | LIBUSB_ENDPOINT_IN, buf,
-                               devc->epin_maxpacketsize, cb, devc, 40);
+                               devc->epin_maxpacketsize, cb, (void *)sdi, 40);
                if ((ret = libusb_submit_transfer(transfer)) != 0) {
                        sr_err("Failed to submit transfer: %s.",
                               libusb_error_name(ret));