diff options
| author | Bert Vermeulen <bert@biot.com> | 2014-03-10 12:23:38 +0100 |
|---|---|---|
| committer | Bert Vermeulen <bert@biot.com> | 2014-03-10 12:23:38 +0100 |
| commit | da9bcbd9f45b0153465c55ec726a0d76f6d7f01e (patch) | |
| tree | 01190e6a1e52a3aedf5b2578716b8a470cd50fd0 /decoders/usb_packet | |
| parent | d1e2129c7b01a760d48bcc8e7fc12956a62698c1 (diff) | |
| download | libsigrokdecode-da9bcbd9f45b0153465c55ec726a0d76f6d7f01e.tar.gz libsigrokdecode-da9bcbd9f45b0153465c55ec726a0d76f6d7f01e.zip | |
Probes, optional probes and annotations now take a tuple.
Annotation entries also consist of a tuple, not a list.
Diffstat (limited to 'decoders/usb_packet')
| -rw-r--r-- | decoders/usb_packet/pd.py | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py index 82e5eee..61acd4f 100644 --- a/decoders/usb_packet/pd.py +++ b/decoders/usb_packet/pd.py @@ -154,37 +154,37 @@ class Decoder(srd.Decoder): 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'], - ] + 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))), |