X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fdso.c;h=3d799664a530cdb550ab952fcfbc8c16fa9beb05;hb=6cf1a87bfb803e088234e2e313891d27379880cf;hp=8561ac3ded1494474bd48564cee18cc15e734874;hpb=2a8f2d41adcd0aa9e498c4eea2a5f82263039e5c;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/dso.c b/src/hardware/hantek-dso/dso.c
index 8561ac3d..3d799664 100644
--- a/src/hardware/hantek-dso/dso.c
+++ b/src/hardware/hantek-dso/dso.c
@@ -29,8 +29,6 @@
 
 #define NUM_CHANNELS 2
 
-extern struct sr_dev_driver hantek_dso_driver_info;
-
 static int send_begin(const struct sr_dev_inst *sdi)
 {
 	struct sr_usb_dev_inst *usb;
@@ -111,7 +109,7 @@ err:
 SR_PRIV int dso_open(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	struct drv_context *drvc = hantek_dso_driver_info.context;
+	struct drv_context *drvc = sdi->driver->context;
 	struct sr_usb_dev_inst *usb;
 	struct libusb_device_descriptor des;
 	libusb_device **devlist;
@@ -317,8 +315,8 @@ static int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi)
 	cmdstring[2] |= (tmp & 0x07) << 5;
 
 	/* Enabled channels: 00=CH1 01=CH2 10=both */
-	sr_dbg("Channels CH1=%d CH2=%d", devc->ch1_enabled, devc->ch2_enabled);
-	tmp = (((devc->ch2_enabled ? 1 : 0) << 1) + (devc->ch1_enabled ? 1 : 0)) - 1;
+	sr_dbg("Channels CH1=%d CH2=%d", devc->ch_enabled[0], devc->ch_enabled[1]);
+	tmp = (((devc->ch_enabled[1] ? 1 : 0) << 1) + (devc->ch_enabled[0] ? 1 : 0)) - 1;
 	cmdstring[3] = tmp;
 
 	/* Fast rates channel */