X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fanalyzer.c;h=47dcfc8b2574200b0b9069edc96384532c9bc9d2;hb=66e3219dbd086dc57087281f10fdefbe060ee5c8;hp=6f3e6cf904727949c60e8972d1577ee862501e41;hpb=0ab0cb942f59e2232921c10d79ed43cad6cf3153;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/analyzer.c b/hardware/zeroplus-logic-cube/analyzer.c
index 6f3e6cf9..47dcfc8b 100644
--- a/hardware/zeroplus-logic-cube/analyzer.c
+++ b/hardware/zeroplus-logic-cube/analyzer.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010 Sven Peter <sven@fail0verflow.com>
  * Copyright (C) 2010 Haxx Enterprises <bushing@gmail.com>
@@ -30,9 +30,11 @@
  */
 
 #include <assert.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "analyzer.h"
 #include "gl_usb.h"
-#include "libsigrok-internal.h"
+#include "protocol.h"
 
 enum {
 	HARD_DATA_CHECK_SUM		= 0x00,
@@ -116,6 +118,7 @@ static int g_memory_size = MEMORY_SIZE_8K;
 static int g_ramsize_triggerbar_addr = 2 * 1024;
 static int g_triggerbar_addr = 0;
 static int g_compression = COMPRESSION_NONE;
+static int g_thresh = 0x31; /* 1.5V */
 
 /* Maybe unk specifies an "endpoint" or "register" of sorts. */
 static int analyzer_write_status(libusb_device_handle *devh, unsigned char unk,
@@ -244,7 +247,7 @@ static int __analyzer_set_freq(libusb_device_handle *devh, int freq, int scale)
 		break;
 	}
 
-	sr_dbg("zp: Setting samplerate regs (freq=%d, scale=%d): "
+	sr_dbg("Setting samplerate regs (freq=%d, scale=%d): "
 	       "reg0: %d, reg1: %d, reg2: %d, reg3: %d.",
 	       freq, scale, divisor, reg0, 0x02, reg2);
 
@@ -318,7 +321,7 @@ static int __analyzer_set_freq(libusb_device_handle *devh, int freq, int scale)
 	if (!f[i].freq)
 		return -1;
 
-	sr_dbg("zp: Setting samplerate regs (freq=%d, scale=%d): "
+	sr_dbg("Setting samplerate regs (freq=%d, scale=%d): "
 	       "reg0: %d, reg1: %d, reg2: %d, reg3: %d.",
 	       freq, scale, f[i].div, f[i].mul, 0x02, f[i].sel);
 
@@ -399,21 +402,20 @@ SR_PRIV void analyzer_initialize(libusb_device_handle *devh)
 SR_PRIV void analyzer_wait(libusb_device_handle *devh, int set, int unset)
 {
 	int status;
+
 	while (1) {
 		status = gl_reg_read(devh, DEV_STATUS);
-		if ((status & set) && ((status & unset) == 0))
+		if ((!set || (status & set)) && ((status & unset) == 0))
 			return;
 	}
 }
 
 SR_PRIV void analyzer_read_start(libusb_device_handle *devh)
 {
-	int i;
-
 	analyzer_write_status(devh, 3, STATUS_FLAG_20 | STATUS_FLAG_READ);
 
-	for (i = 0; i < 8; i++)
-		(void)gl_reg_read(devh, READ_RAM_STATUS);
+	/* Prep for bulk reads */
+	gl_reg_read_buf(devh, READ_RAM_STATUS, NULL, 0);
 }
 
 SR_PRIV int analyzer_read_data(libusb_device_handle *devh, void *buffer,
@@ -464,20 +466,17 @@ SR_PRIV void analyzer_configure(libusb_device_handle *devh)
 	__analyzer_set_trigger_count(devh, g_trigger_count);
 
 	/* Set_Trigger_Level */
-	gl_reg_write(devh, TRIGGER_LEVEL0, 0x31);
-	gl_reg_write(devh, TRIGGER_LEVEL1, 0x31);
-	gl_reg_write(devh, TRIGGER_LEVEL2, 0x31);
-	gl_reg_write(devh, TRIGGER_LEVEL3, 0x31);
+	gl_reg_write(devh, TRIGGER_LEVEL0, g_thresh);
+	gl_reg_write(devh, TRIGGER_LEVEL1, g_thresh);
+	gl_reg_write(devh, TRIGGER_LEVEL2, g_thresh);
+	gl_reg_write(devh, TRIGGER_LEVEL3, g_thresh);
 
 	/* Size of actual memory >> 2 */
 	__analyzer_set_ramsize_trigger_address(devh, g_ramsize_triggerbar_addr);
 	__analyzer_set_triggerbar_address(devh, g_triggerbar_addr);
 
 	/* Set_Dont_Care_TriggerBar */
-	if (g_triggerbar_addr)
-		gl_reg_write(devh, DONT_CARE_TRIGGERBAR, 0x00);
-	else
-		gl_reg_write(devh, DONT_CARE_TRIGGERBAR, 0x01);
+	gl_reg_write(devh, DONT_CARE_TRIGGERBAR, 0x01);
 
 	/* Enable_Status */
 	analyzer_set_filter(devh);
@@ -566,11 +565,21 @@ SR_PRIV void analyzer_set_ramsize_trigger_address(unsigned int address)
 	g_ramsize_triggerbar_addr = address;
 }
 
+SR_PRIV unsigned int analyzer_get_ramsize_trigger_address(void)
+{
+	return g_ramsize_triggerbar_addr;
+}
+
 SR_PRIV void analyzer_set_triggerbar_address(unsigned int address)
 {
 	g_triggerbar_addr = address;
 }
 
+SR_PRIV unsigned int analyzer_get_triggerbar_address(void)
+{
+	return g_triggerbar_addr;
+}
+
 SR_PRIV unsigned int analyzer_read_status(libusb_device_handle *devh)
 {
 	return gl_reg_read(devh, DEV_STATUS);
@@ -604,6 +613,11 @@ SR_PRIV void analyzer_set_compression(unsigned int type)
 	g_compression = type;
 }
 
+SR_PRIV void analyzer_set_voltage_threshold(int thresh)
+{
+	g_thresh = thresh;
+}
+
 SR_PRIV void analyzer_wait_button(libusb_device_handle *devh)
 {
 	analyzer_wait(devh, STATUS_BUTTON_PRESSED, 0);
@@ -611,7 +625,7 @@ SR_PRIV void analyzer_wait_button(libusb_device_handle *devh)
 
 SR_PRIV void analyzer_wait_data(libusb_device_handle *devh)
 {
-	analyzer_wait(devh, STATUS_READY | 8, STATUS_BUSY);
+	analyzer_wait(devh, 0, STATUS_BUSY);
 }
 
 SR_PRIV int analyzer_decompress(void *input, unsigned int input_len,