usb_packet: Fix incorrect DATA*/MDATA handling.

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

diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
index be5429780872e96377da7e903da10c279b105d6d..6f5e66eba2c4dba8c24a7b1b78efacb3214e3da8 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'
@@ -192,7 +192,6 @@ class Decoder(srd.Decoder):
     )
 
     def __init__(self):
-        self.samplenum = 0
         self.bits = []
         self.packet = []
         self.packet_summary = ''
@@ -290,7 +289,6 @@ class Decoder(srd.Decoder):
                                'DB: %02X' % db, '%02X' % db]])
                 databytes.append(db)
                 self.packet_summary += ' %02X' % db
-                data = data[8:]
             self.packet_summary += ' ]'
 
             # Convenience Python output (no annotation) for all bytes together.
@@ -338,6 +336,3 @@ class Decoder(srd.Decoder):
                 self.bits, self.state = [], 'WAIT FOR SOP'
             else:
                 pass # TODO: Error
-        else:
-            raise Exception('Invalid state: %s' % self.state)
-