Various PDs: Drop currently unsupported probes in stacked PDs.

[libsigrokdecode.git] / decoders / mx25lxx05d / pd.py

diff --git a/decoders/mx25lxx05d/pd.py b/decoders/mx25lxx05d/pd.py
index 76319db61b52aa5b0156f0133e202b441cc98442..1099953553d4c0333484624ca20b56b803ea3208 100644 (file)
--- a/decoders/mx25lxx05d/pd.py
+++ b/decoders/mx25lxx05d/pd.py
@@ -55,7 +55,7 @@ device_name = {
 }
 
 def cmd_annotation_classes():
-    return [[cmd[0].lower(), cmd[1]] for cmd in cmds.values()]
+    return tuple([tuple([cmd[0].lower(), cmd[1]]) for cmd in cmds.values()])
 
 def decode_status_reg(data):
     # TODO: Additional per-bit(s) self.put() calls with correct start/end.
@@ -89,19 +89,13 @@ class Decoder(srd.Decoder):
     longname = 'Macronix MX25Lxx05D'
     desc = 'SPI (NOR) flash chip protocol.'
     license = 'gplv2+'
-    inputs = ['spi', 'logic']
+    inputs = ['logic']
     outputs = ['mx25lxx05d']
-    probes = []
-    optional_probes = [
-        {'id': 'hold', 'name': 'HOLD#', 'desc': 'Pause device w/o deselecting it'},
-        {'id': 'wp_acc', 'name': 'WP#/ACC', 'desc': 'Write protect'},
-    ]
-    options = {}
-    annotations = cmd_annotation_classes() + [
-        ['bits', 'Bits'],
-        ['bits2', 'Bits2'],
-        ['warnings', 'Warnings'],
-    ]
+    annotations = cmd_annotation_classes() + (
+        ('bits', 'Bits'),
+        ('bits2', 'Bits2'),
+        ('warnings', 'Warnings'),
+    )
     annotation_rows = (
         ('bits', 'Bits', (24, 25)),
         ('commands', 'Commands', tuple(range(23 + 1))),