X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoder%2Ftest%2Fspiflash%2Ftest.conf;h=5b3ada6e01e453f7bad572e537de05c30b73f1c1;hb=e77db4a752039323d5bd9a08facb20533101795a;hp=aa417acaac59fb9858f0163bcd83fb83ad91de5f;hpb=a6b63f409d5922cbbef493849f10db99dd0761fc;p=sigrok-test.git

diff --git a/decoder/test/spiflash/test.conf b/decoder/test/spiflash/test.conf
index aa417ac..5b3ada6 100644
--- a/decoder/test/spiflash/test.conf
+++ b/decoder/test/spiflash/test.conf
@@ -1,69 +1,85 @@
 test probe_ascii
 	protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-	protocol-decoder spiflash option format=ascii
+	protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/mx25l1605d/mx25l1605d_probe.sr
 	output spiflash annotation match probe_ascii.output
 
 test probe_hex
 	protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-	protocol-decoder spiflash option format=hex
+	protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/mx25l1605d/mx25l1605d_probe.sr
 	output spiflash annotation match probe_hex.output
 
 test read_ascii
 	protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-	protocol-decoder spiflash option format=ascii
+	protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/mx25l1605d/mx25l1605d_read.sr
 	output spiflash annotation match read_ascii.output
 
 test read_hex
 	protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-	protocol-decoder spiflash option format=hex
+	protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/mx25l1605d/mx25l1605d_read.sr
 	output spiflash annotation match read_hex.output
 
 test write_ascii
 	protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-	protocol-decoder spiflash option format=ascii
+	protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/mx25l1605d/mx25l1605d_write.sr
 	output spiflash annotation match write_ascii.output
 
 test write_hex
 	protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-	protocol-decoder spiflash option format=hex
+	protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/mx25l1605d/mx25l1605d_write.sr
 	output spiflash annotation match write_hex.output
 
 test erase_ascii
 	protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-	protocol-decoder spiflash option format=ascii
+	protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/mx25l1605d/mx25l1605d_erase.sr
 	output spiflash annotation match erase_ascii.output
 
 test erase_hex
 	protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-	protocol-decoder spiflash option format=hex
+	protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/mx25l1605d/mx25l1605d_erase.sr
 	output spiflash annotation match erase_hex.output
 
+# Note: The chip used here is unknown, but we force MX25L1605D for now.
 test dualioreads_ascii
 	protocol-decoder spi channel cs=2 channel miso=1 channel clk=0 channel mosi=3
-	protocol-decoder spiflash option format=ascii
+	protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/spiflash_dualio/dualioreads.sr
 	output spiflash annotation match dualioreads_ascii.output
 
+# Note: The chip used here is unknown, but we force MX25L1605D for now.
 test dualioreads_hex
 	protocol-decoder spi channel cs=2 channel miso=1 channel clk=0 channel mosi=3
-	protocol-decoder spiflash option format=hex
+	protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
 	stack spi spiflash
 	input spi/spiflash_dualio/dualioreads.sr
 	output spiflash annotation match dualioreads_hex.output
+
+# test fidelix_fm25q32_0x01_2bytes
+# 	protocol-decoder spi channel cs=3 channel miso=1 channel clk=0 channel mosi=2
+# 	protocol-decoder spiflash option format=hex option chip=fidelix_fm25q32
+# 	stack spi spiflash
+# 	input spi/spiflash/fidelix_fm25q32/commands
+# 	output spiflash annotation match fidelix_fm25q32_0x01_2bytes.output
+
+test adesto_at45db161e_basic
+	protocol-decoder spi channel clk=0 channel mosi=1 channel cs=2 channel miso=3
+	protocol-decoder spiflash option format=ascii option chip=adesto_at45db161e
+	stack spi spiflash
+	input spi/spiflash/adesto_at45db161e/adesto_at45db161e_basic.sr
+	output spiflash annotation match adesto_at45db161e_basic.output