uart/i2cfilter: Don't check multiple-choice options.

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

diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
index 740435665d3c907e5465f1cfbfce589f01888d90..4716dd7109edece530a042c71fea32d3c4096612 100644 (file)
--- a/decoders/usb_packet/pd.py
+++ b/decoders/usb_packet/pd.py
@@ -143,7 +143,7 @@ def bitstr_to_num(bitstr):
     return int(''.join(l), 2)
 
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'usb_packet'
     name = 'USB packet'
     longname = 'Universal Serial Bus (LS/FS) packet'
@@ -187,8 +187,8 @@ class Decoder(srd.Decoder):
         ('packet-invalid', 'Packet: Invalid'),
     )
     annotation_rows = (
-        ('fields', 'Packet fields', tuple(range(11 + 1))),
-        ('packet', 'Packets', tuple(range(12, 28 + 1))),
+        ('fields', 'Packet fields', tuple(range(10 + 1))),
+        ('packet', 'Packets', tuple(range(11, 28 + 1))),
     )
 
     def __init__(self):
@@ -338,6 +338,4 @@ class Decoder(srd.Decoder):
                 self.bits, self.state = [], 'WAIT FOR SOP'
             else:
                 pass # TODO: Error
-        else:
-            raise Exception('Invalid state: %s' % self.state)