Probes, optional probes and annotations now take a tuple.

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

diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
index 0a323a218c3c7cffb4224975531761cf7ea92c6b..61acd4f68154e1f8004f351d0044f52034be21e8 100644 (file)
--- a/decoders/usb_packet/pd.py
+++ b/decoders/usb_packet/pd.py
@@ -55,7 +55,7 @@ Packet:
  - 'DATA', 'DATA2', [<sync>, <pid>, <databytes>, <crc16>, <eop>]
  - 'DATA', 'MDATA', [<sync>, <pid>, <databytes>, <crc16>, <eop>]
  - 'HANDSHAKE', 'ACK', [<sync>, <pid>, <eop>]
- - 'HANDSHAKE', 'NACK', [<sync>, <pid>, <eop>]
+ - 'HANDSHAKE', 'NAK', [<sync>, <pid>, <eop>]
  - 'HANDSHAKE', 'STALL', [<sync>, <pid>, <eop>]
  - 'HANDSHAKE', 'NYET', [<sync>, <pid>, <eop>]
  - 'SPECIAL', 'PRE', [<sync>, <pid>, <addr>, <ep>, <crc5>, <eop>]
@@ -122,7 +122,7 @@ def get_category(pidname):
         return 'TOKEN'
     elif pidname in ('DATA0', 'DATA1', 'DATA2', 'MDATA'):
         return 'DATA'
-    elif pidname in ('ACK', 'NACK', 'STALL', 'NYET'):
+    elif pidname in ('ACK', 'NAK', 'STALL', 'NYET'):
         return 'HANDSHAKE'
     else:
         return 'SPECIAL'
@@ -151,42 +151,40 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['usb_signalling']
     outputs = ['usb_packet']
-    probes = []
-    optional_probes = []
-    options = {
-        'signalling': ['Signalling', 'full-speed'],
-    }
-    annotations = [
-        ['sync-ok', 'SYNC'],
-        ['sync-err', 'SYNC (error)'],
-        ['pid', 'PID'],
-        ['framenum', 'FRAMENUM'],
-        ['addr', 'ADDR'],
-        ['ep', 'EP'],
-        ['crc5-ok', 'CRC5'],
-        ['crc5-err', 'CRC5 (error)'],
-        ['data', 'DATA'],
-        ['crc16-ok', 'CRC16'],
-        ['crc16-err', 'CRC16 (error)'],
-        ['packet-out', 'Packet: OUT'],
-        ['packet-in', 'Packet: IN'],
-        ['packet-sof', 'Packet: SOF'],
-        ['packet-setup', 'Packet: SETUP'],
-        ['packet-data0', 'Packet: DATA0'],
-        ['packet-data1', 'Packet: DATA1'],
-        ['packet-data2', 'Packet: DATA2'],
-        ['packet-mdata', 'Packet: MDATA'],
-        ['packet-ack', 'Packet: ACK'],
-        ['packet-nack', 'Packet: NACK'],
-        ['packet-stall', 'Packet: STALL'],
-        ['packet-nyet', 'Packet: NYET'],
-        ['packet-pre', 'Packet: PRE'],
-        ['packet-err', 'Packet: ERR'],
-        ['packet-split', 'Packet: SPLIT'],
-        ['packet-ping', 'Packet: PING'],
-        ['packet-reserved', 'Packet: Reserved'],
-        ['packet-invalid', 'Packet: Invalid'],
-    ]
+    options = (
+        {'id': 'signalling', 'desc': 'Signalling', 'default': 'full-speed'},
+    )
+    annotations = (
+        ('sync-ok', 'SYNC'),
+        ('sync-err', 'SYNC (error)'),
+        ('pid', 'PID'),
+        ('framenum', 'FRAMENUM'),
+        ('addr', 'ADDR'),
+        ('ep', 'EP'),
+        ('crc5-ok', 'CRC5'),
+        ('crc5-err', 'CRC5 (error)'),
+        ('data', 'DATA'),
+        ('crc16-ok', 'CRC16'),
+        ('crc16-err', 'CRC16 (error)'),
+        ('packet-out', 'Packet: OUT'),
+        ('packet-in', 'Packet: IN'),
+        ('packet-sof', 'Packet: SOF'),
+        ('packet-setup', 'Packet: SETUP'),
+        ('packet-data0', 'Packet: DATA0'),
+        ('packet-data1', 'Packet: DATA1'),
+        ('packet-data2', 'Packet: DATA2'),
+        ('packet-mdata', 'Packet: MDATA'),
+        ('packet-ack', 'Packet: ACK'),
+        ('packet-nak', 'Packet: NAK'),
+        ('packet-stall', 'Packet: STALL'),
+        ('packet-nyet', 'Packet: NYET'),
+        ('packet-pre', 'Packet: PRE'),
+        ('packet-err', 'Packet: ERR'),
+        ('packet-split', 'Packet: SPLIT'),
+        ('packet-ping', 'Packet: PING'),
+        ('packet-reserved', 'Packet: Reserved'),
+        ('packet-invalid', 'Packet: Invalid'),
+    )
     annotation_rows = (
         ('fields', 'Packet fields', tuple(range(11 + 1))),
         ('packet', 'Packets', tuple(range(12, 28 + 1))),