X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=47907d8e1754f36a84eceda01365a9469c1e78fb;hb=65e0036635a54b3273436b4ea7918aea25bad788;hp=2b039ed22b60e32e499141fbb45fdf29e573a3ff;hpb=a95f142e88fa5368adfabf87544acfdeed7d7604;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 2b039ed2..47907d8e 100644
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -40,6 +40,8 @@
 #define NUM_TIMEBASE  10
 #define NUM_VDIV      8
 
+#define NUM_BUFFER_SIZES 2
+
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 };
@@ -543,13 +545,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 			break;
 		case SR_CONF_BUFFERSIZE:
 			tmp_u64 = g_variant_get_uint64(data);
-			for (i = 0; i < 2; i++) {
+			for (i = 0; i < NUM_BUFFER_SIZES; i++) {
 				if (devc->profile->buffersizes[i] == tmp_u64) {
 					devc->framesize = tmp_u64;
 					break;
 				}
 			}
-			if (i == 2)
+			if (i == NUM_BUFFER_SIZES)
 				ret = SR_ERR_ARG;
 			break;
 		case SR_CONF_TIMEBASE:
@@ -658,7 +660,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 				return SR_ERR_ARG;
 			devc = sdi->priv;
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-					devc->profile->buffersizes, 2, sizeof(uint64_t));
+					devc->profile->buffersizes, NUM_BUFFER_SIZES, sizeof(uint64_t));
 			break;
 		case SR_CONF_TIMEBASE:
 			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
@@ -767,7 +769,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
  * queued up beforehand, so this just needs to chuck the incoming data onto
  * the libsigrok session bus.
  */
-static void receive_transfer(struct libusb_transfer *transfer)
+static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_dev_inst *sdi;