X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=160dbb4d52e777069807db97b30719583499b63b;hb=c442ffda0fc6fa9bc3c5397a21ef1d04f01a64a1;hp=c990a5c53cbb6f1901a00003c2fe161739ba99de;hpb=0f34cb472368be61aa2e7bc9d9d1b25bb28aa560;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index c990a5c5..160dbb4d 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,
 };
@@ -72,13 +74,13 @@ static const char *channel_names[] = {
 };
 
 static const uint64_t buffersizes_32k[] = {
-	10240, 32768,
+	(10 * 1024), (32 * 1024),
 };
 static const uint64_t buffersizes_512k[] = {
-	10240, 524288,
+	(10 * 1024), (512 * 1024),
 };
 static const uint64_t buffersizes_14k[] = {
-	10240, 14336,
+	(10 * 1024), (14 * 1024),
 };
 
 static const struct dso_profile dev_profiles[] = {
@@ -206,7 +208,7 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
 	devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
 	devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
 	sdi->priv = devc;
-	drvc = hantek_dso_driver_info.priv;
+	drvc = hantek_dso_driver_info.context;
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 
 	return sdi;
@@ -271,7 +273,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	const char *conn;
 	char connection_id[64];
 
-	drvc = di->priv;
+	drvc = di->context;
 
 	devices = 0;
 
@@ -361,7 +363,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -470,10 +472,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 			*data = g_variant_new_string(devc->triggersource);
 			break;
 		case SR_CONF_TRIGGER_SLOPE:
-			if (devc->triggerslope == SLOPE_POSITIVE)
-				s = "r";
-			else
-				s = "f";
+			s = (devc->triggerslope == SLOPE_POSITIVE) ? "r" : "f";
 			*data = g_variant_new_string(s);
 			break;
 		case SR_CONF_HORIZ_TRIGGERPOS:
@@ -543,13 +542,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 +657,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 +766,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;
@@ -827,8 +826,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
 		}
 	} else {
 		/* Already past the trigger point, just send it all out. */
-		send_chunk(sdi, transfer->buffer,
-				num_samples);
+		send_chunk(sdi, transfer->buffer, num_samples);
 	}
 
 	devc->samp_received += num_samples;
@@ -875,7 +873,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 
 	sdi = cb_data;
 	di = sdi->driver;
-	drvc = di->priv;
+	drvc = di->context;
 	devc = sdi->priv;
 	if (devc->dev_state == STOPPING) {
 		/* We've been told to wind up the acquisition. */
@@ -939,8 +937,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 		devc->trigger_offset = trigger_offset;
 
 		num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
-		/* TODO: Check malloc return value. */
-		devc->framebuf = g_try_malloc(devc->framesize * num_channels * 2);
+		devc->framebuf = g_malloc(devc->framesize * num_channels * 2);
 		devc->samp_buffered = devc->samp_received = 0;
 
 		/* Tell the scope to send us the first frame. */
@@ -976,7 +973,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct dev_context *devc;
 	struct sr_dev_driver *di = sdi->driver;
-	struct drv_context *drvc = di->priv;
+	struct drv_context *drvc = di->context;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
@@ -1035,5 +1032,5 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };