X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fdso.c;h=195201fe7302f3e05185cb42d5b583b8d1f25aca;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=d46ddd6e0987550baa707e39fe77eb973cea8a36;hpb=933defaa03abe4f3f01eff8067c3f0060914b050;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/dso.c b/src/hardware/hantek-dso/dso.c
index d46ddd6e..195201fe 100644
--- a/src/hardware/hantek-dso/dso.c
+++ b/src/hardware/hantek-dso/dso.c
@@ -19,12 +19,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "dso.h"
 #include <string.h>
 #include <glib.h>
 #include <libusb.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "dso.h"
+
+#define NUM_CHANNELS 2
 
 extern struct sr_dev_driver hantek_dso_driver_info;
 
@@ -109,7 +111,7 @@ err:
 SR_PRIV int dso_open(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	struct drv_context *drvc = hantek_dso_driver_info.priv;
+	struct drv_context *drvc = hantek_dso_driver_info.context;
 	struct sr_usb_dev_inst *usb;
 	struct libusb_device_descriptor des;
 	libusb_device **devlist;
@@ -185,7 +187,7 @@ SR_PRIV void dso_close(struct sr_dev_inst *sdi)
 
 	usb = sdi->conn;
 
-	if (usb->devhdl == NULL)
+	if (!usb->devhdl)
 		return;
 
 	sr_info("Closing device on %d.%d (logical) / %s (physical) interface %d.",
@@ -225,7 +227,7 @@ static int get_channel_offsets(const struct sr_dev_inst *sdi)
 	 * since that's how voltage offsets are submitted back to the DSO.
 	 * Convert to host order now, so we can use them natively.
 	 */
-	for (chan = 0; chan < 2; chan++) {
+	for (chan = 0; chan < NUM_CHANNELS; chan++) {
 		for (v = 0; v < 9; v++) {
 			devc->channel_levels[chan][v][0] =
 				g_ntohs(devc->channel_levels[chan][v][0]);
@@ -236,7 +238,7 @@ static int get_channel_offsets(const struct sr_dev_inst *sdi)
 
 	if (sr_log_loglevel_get() >= SR_LOG_DBG) {
 		gs = g_string_sized_new(128);
-		for (chan = 0; chan < 2; chan++) {
+		for (chan = 0; chan < NUM_CHANNELS; chan++) {
 			g_string_printf(gs, "CH%d:", chan + 1);
 			for (v = 0; v < 9; v++) {
 				g_string_append_printf(gs, " %.4x-%.4x",
@@ -703,7 +705,7 @@ SR_PRIV int dso_get_capturestate(const struct sr_dev_inst *sdi,
 	bitvalue = 1;
 	for (i = 0; i < 24; i++) {
 		/* Each set bit inverts all bits with a lower value. */
-		if(toff & bitvalue)
+		if (toff & bitvalue)
 			toff ^= bitvalue - 1;
 		bitvalue <<= 1;
 	}