From: Marek Vasut <redacted>
Date: Sun, 20 Apr 2014 17:49:44 +0000 (+0200)
Subject: asix-sigma: Decrypt the LA mode switch sequence
X-Git-Tag: libsigrok-0.3.0~44
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=011f1091fa6d85aef3c36758bd090809f2fde0c9;hp=1c2736f90912b58df18595d474e5c917c7ecd195;p=libsigrok.git

asix-sigma: Decrypt the LA mode switch sequence

Decode the logic mode start sequence into a series of FPGA instructions
instead and get rid of this sequence of magic numbers.

Signed-off-by: Marek Vasut <redacted>
---

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 06373d61..98607027 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -455,8 +455,22 @@ static int sigma_fpga_init_la(struct dev_context *devc)
 {
 	/* Initialize the logic analyzer mode. */
 	uint8_t logic_mode_start[] = {
-		0x00, 0x40, 0x0f, 0x25, 0x35, 0x40,
-		0x2a, 0x3a, 0x40, 0x03, 0x20, 0x38,
+		REG_ADDR_LOW  | (READ_ID & 0xf),
+		REG_ADDR_HIGH | (READ_ID >> 8),
+		REG_READ_ADDR,	/* Read ID register. */
+
+		REG_ADDR_LOW | (WRITE_TEST & 0xf),
+		REG_DATA_LOW | 0x5,
+		REG_DATA_HIGH_WRITE | 0x5,
+		REG_READ_ADDR,	/* Read scratch register. */
+
+		REG_DATA_LOW | 0xa,
+		REG_DATA_HIGH_WRITE | 0xa,
+		REG_READ_ADDR,	/* Read scratch register. */
+
+		REG_ADDR_LOW | (WRITE_MODE & 0xf),
+		REG_DATA_LOW | 0x0,
+		REG_DATA_HIGH_WRITE | 0x8,
 	};
 
 	uint8_t result[3];
@@ -465,7 +479,7 @@ static int sigma_fpga_init_la(struct dev_context *devc)
 	/* Initialize the logic analyzer mode. */
 	sigma_write(logic_mode_start, sizeof(logic_mode_start), devc);
 
-	/* Expect a 3 byte reply. */
+	/* Expect a 3 byte reply since we issued three READ requests. */
 	ret = sigma_read(result, 3, devc);
 	if (ret != 3)
 		goto err;