From: Uwe Hermann <redacted>
Date: Sun, 5 Jan 2020 14:49:18 +0000 (+0100)
Subject: spiflash: Don't use ambiguous annotation class names.
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=12fb8f6232ed39ed78382c79049fd061ba809cf4

spiflash: Don't use ambiguous annotation class names.

This is not technically a bug since (at least some) datasheets refer
to this command as "Chip erase", it just happens to have two different
command codes (0x60 and 0xc7).

In order to not confuse users with two annotation classes with the
same name, we'll call the second one "Chip erase 2" to match the
"CE2" short name.

This fixes bug #1482.
---

diff --git a/decoders/spiflash/lists.py b/decoders/spiflash/lists.py
index 49993ad..c6e07bf 100644
--- a/decoders/spiflash/lists.py
+++ b/decoders/spiflash/lists.py
@@ -47,7 +47,7 @@ cmds = OrderedDict([
     (0xb9, ('DP', 'Deep power down')),
     (0xbb, ('2READ', '2x I/O read')), # a.k.a. "Fast read dual I/O".
     (0xc1, ('EXSO', 'Exit secured OTP')),
-    (0xc7, ('CE2', 'Chip erase')), # Alternative command ID
+    (0xc7, ('CE2', 'Chip erase 2')), # Alternative command ID
     (0xd7, ('STATUS', 'Status register read')),
     (0xd8, ('BE', 'Block erase')),
     (0xef, ('REMS2', 'Read ID for 2x I/O mode')),