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

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 7f90b834..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,
 };
@@ -69,17 +71,16 @@ static const uint32_t devopts_cg[] = {
 
 static const char *channel_names[] = {
 	"CH1", "CH2",
-	NULL,
 };
 
 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[] = {
@@ -181,7 +182,7 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
 	 * Add only the real channels -- EXT isn't a source of data, only
 	 * a trigger source internal to the device.
 	 */
-	for (i = 0; channel_names[i]; i++) {
+	for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
 		ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
 		cg = g_malloc0(sizeof(struct sr_channel_group));
 		cg->name = g_strdup(channel_names[i]);
@@ -544,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:
@@ -649,7 +650,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		return SR_ERR_ARG;
 
 	if (!cg) {
-	switch (key) {
+		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
@@ -659,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);
@@ -683,7 +684,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 			return SR_ERR_NA;
 		}
 	} else {
-	switch (key) {
+		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 					devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
@@ -768,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;
@@ -828,8 +829,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;
@@ -940,8 +940,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. */