X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fusb_packet%2Fpd.py;h=a9c8b252eb27f01e9b1967530c9ef7baaa9fd640;hb=e228150a0e8d60ef3fcaa6f077305a8e6045dfe8;hp=740435665d3c907e5465f1cfbfce589f01888d90;hpb=7a23306705864b1cc96bbbee57d47e6f87f7767b;p=libsigrokdecode.git diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py index 7404356..a9c8b25 100644 --- 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,12 +187,11 @@ 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): - self.samplenum = 0 self.bits = [] self.packet = [] self.packet_summary = '' @@ -338,6 +337,3 @@ class Decoder(srd.Decoder): self.bits, self.state = [], 'WAIT FOR SOP' else: pass # TODO: Error - else: - raise Exception('Invalid state: %s' % self.state) -