X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoder%2Ftest%2Fspiflash%2Ftest.conf;h=0b40ec7424d11ecaf5269ed8583f0e76eb15dc20;hb=faf97b312603efabfa27e97bb35cf1a5ec5fbf9c;hp=a901750a3fa42a99e89efef8ee500e24cb811e3d;hpb=5c1b6a10c6fc421a0e82a41c296a6cb93a8712cd;p=sigrok-test.git

diff --git a/decoder/test/spiflash/test.conf b/decoder/test/spiflash/test.conf
index a901750..0b40ec7 100644
--- a/decoder/test/spiflash/test.conf
+++ b/decoder/test/spiflash/test.conf
@@ -1,55 +1,106 @@
 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 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 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
+
+test winbond_w25q80dv_ce_without_wren
+	protocol-decoder spi channel cs=0 channel clk=1 channel mosi=2 channel miso=3
+	protocol-decoder spiflash option format=ascii option chip=winbond_w25q80dv
+	stack spi spiflash
+	input spi/spiflash/winbond_w25q80d/ce_without_wren.sr
+	output spiflash annotation match winbond_w25q80dv_ce_without_wren.output
+
+test winbond_w25q80dv_chip_erase_and_writes_start
+	protocol-decoder spi channel cs=0 channel clk=1 channel mosi=2 channel miso=3
+	protocol-decoder spiflash option format=ascii option chip=winbond_w25q80dv
+	stack spi spiflash
+	input spi/spiflash/winbond_w25q80d/chip_erase_and_writes_start.sr
+	output spiflash annotation match winbond_w25q80dv_chip_erase_and_writes_start.output
+
+test winbond_w25q80dv_chip_erase_and_writes_end
+	protocol-decoder spi channel cs=0 channel clk=1 channel mosi=2 channel miso=3
+	protocol-decoder spiflash option format=ascii option chip=winbond_w25q80dv
+	stack spi spiflash
+	input spi/spiflash/winbond_w25q80d/chip_erase_and_writes_end.sr
+	output spiflash annotation match winbond_w25q80dv_chip_erase_and_writes_end.output