X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fdso.c;h=66d6978f24bbd3d720d8796bc8315c7cfafd1b6a;hb=d3b38ad389a6186e2822d62b20b9f0d9d9e7c21c;hp=c60496e783a79f01d3307fa15aaef61041d96a34;hpb=1740429d7045385866caafb0d2cbe302e7c74604;p=libsigrok.git

diff --git a/hardware/hantek-dso/dso.c b/hardware/hantek-dso/dso.c
index c60496e7..66d6978f 100644
--- 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);
 	}
@@ -505,7 +505,7 @@ 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);
 	}
 
@@ -707,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;
@@ -737,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));