X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fvictor-dmm%2Fapi.c;h=7ed2bf435fb0081032023debec8cf999470d5bb9;hb=65e0036635a54b3273436b4ea7918aea25bad788;hp=85874b12c53f213644e1293e81b44cb84b95f590;hpb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;p=libsigrok.git

diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index 85874b12..7ed2bf43 100644
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -29,7 +29,7 @@
 #define VICTOR_PID 0xd237
 #define VICTOR_VENDOR "Victor"
 #define VICTOR_INTERFACE 0
-#define VICTOR_ENDPOINT LIBUSB_ENDPOINT_IN | 1
+#define VICTOR_ENDPOINT (LIBUSB_ENDPOINT_IN | 1)
 
 SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
@@ -37,6 +37,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 static const uint32_t drvopts[] = {
 	SR_CONF_MULTIMETER,
 };
+
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 };
@@ -195,7 +196,6 @@ static int cleanup(const struct sr_dev_driver *di)
 		/* Can get called on an unused driver, doesn't matter. */
 		return SR_OK;
 
-
 	ret = std_dev_clear(di, NULL);
 	g_free(drvc);
 
@@ -231,7 +231,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	struct sr_dev_driver *di = sdi->driver;
 	struct dev_context *devc;
 	gint64 now;
-	int ret;
 
 	(void)cg;
 
@@ -244,25 +243,21 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	}
 
 	devc = sdi->priv;
-	ret = SR_OK;
+
 	switch (key) {
 	case SR_CONF_LIMIT_MSEC:
 		devc->limit_msec = g_variant_get_uint64(data);
 		now = g_get_monotonic_time() / 1000;
 		devc->end_time = now + devc->limit_msec;
-		sr_dbg("Setting time limit to %" PRIu64 "ms.",
-		       devc->limit_msec);
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		devc->limit_samples = g_variant_get_uint64(data);
-		sr_dbg("Setting sample limit to %" PRIu64 ".",
-		       devc->limit_samples);
 		break;
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -291,7 +286,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	return SR_OK;
 }
 
-static void receive_transfer(struct libusb_transfer *transfer)
+static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 {
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
@@ -400,7 +395,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	usb_source_add(sdi->session, drvc->sr_ctx, 100,
 			handle_events, (void *)sdi);
 
-	buf = g_try_malloc(DMM_DATA_SIZE);
+	buf = g_malloc(DMM_DATA_SIZE);
 	transfer = libusb_alloc_transfer(0);
 	/* Each transfer request gets 100ms to arrive before it's restarted.
 	 * The device only sends 1 transfer/second no matter how many