X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fsrd_usb.py;h=25736395e4463019ad68e4fb9c4e49def3654e1e;hp=842cf03d0cdc69ce3c9dc1517b0dea50c69e09fb;hb=2b9837d9fc5f9b4eca52327527e18db4bfb730ff;hpb=677d597b072c0a1d2df81c5c193cd3678aef8d03

diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py
index 842cf03..2573639 100644
--- a/decoders/srd_usb.py
+++ b/decoders/srd_usb.py
@@ -52,28 +52,30 @@ syms = {
 }
 
 def bitstr_to_num(bitstr):
-    if not bitstr: return 0
+    if not bitstr:
+        return 0
     l = list(bitstr)
     l.reverse()
     return int(''.join(l), 2)
 
 def packet_decode(packet):
     pids = {
-        '10000111':'OUT',      # Tokens
-        '10010110':'IN',
-        '10100101':'SOF',
-        '10110100':'SETUP',
-        '11000011':'DATA0',    # Data
-        '11010010':'DATA1',
-        '01001011':'ACK',      # Handshake
-        '01011010':'NAK',
-        '01111000':'STALL',
-        '01101001':'NYET',
+        '10000111': 'OUT',      # Tokens
+        '10010110': 'IN',
+        '10100101': 'SOF',
+        '10110100': 'SETUP',
+        '11000011': 'DATA0',    # Data
+        '11010010': 'DATA1',
+        '01001011': 'ACK',      # Handshake
+        '01011010': 'NAK',
+        '01111000': 'STALL',
+        '01101001': 'NYET',
     }
 
     sync = packet[:8]
     pid = packet[8:16]
     pid = pids.get(pid, pid)
+
     # Remove CRC.
     if pid in ('OUT', 'IN', 'SOF', 'SETUP'):
         data = packet[16:-5]
@@ -82,57 +84,56 @@ def packet_decode(packet):
         else:
             dev = bitstr_to_num(data[:7])
             ep = bitstr_to_num(data[7:])
-            data = "DEV %d EP %d" % (dev, ep)
+            data = 'DEV %d EP %d' % (dev, ep)
 
     elif pid in ('DATA0', 'DATA1'):
         data = packet[16:-16]
-        tmp = ""
+        tmp = ''
         while data:
-            tmp += "%02X " % bitstr_to_num(data[:8])
+            tmp += '%02X ' % bitstr_to_num(data[:8])
             data = data[8:]
         data = tmp
     else:
         data = packet[16:]
 
-    if sync != "00000001":
-        return "SYNC INVALID!"
+    if sync != '00000001':
+        return 'SYNC INVALID!'
 
     return pid + ' ' + data
 
 class Decoder(srd.Decoder):
     id = 'usb'
     name = 'USB'
-    desc = 'Universal Serial Bus'
     longname = '...longname...'
+    desc = 'Universal Serial Bus'
     longdesc = '...longdesc...'
     author = 'Gareth McMullin'
     email = 'gareth@blacksphere.co.nz'
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['usb']
-    # Probe names with a set of defaults
     probes = [
         {'id': 'dp', 'name': 'D+', 'desc': 'USB D+ signal'},
         {'id': 'dm', 'name': 'D-', 'desc': 'USB D- signal'},
     ]
     options = {}
+    annotations = []
 
     def __init__(self):
-        self.out_proto = None
-        self.out_ann = None
+        pass
 
     def start(self, metadata):
         self.rate = metadata['samplerate']
-        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'usb')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'usb')
+        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'usb')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'usb')
         if self.rate < 48000000:
-            raise Exception("Sample rate not sufficient for USB decoding")
+            raise Exception('Sample rate not sufficient for USB decoding')
         # Initialise decoder state.
         self.sym = J
         self.scount = 0
         self.packet = ''
 
-    def decode(self, timeoffset, duration, data):
+    def decode(self, ss, es, data):
         out = []
 
         # FIXME
@@ -160,11 +161,11 @@ class Decoder(srd.Decoder):
             if self.sym == SE0:
                 if bitcount == 1:
                     # End-Of-Packet (EOP)
-                    out += [{"type":"usb", "data":self.packet,
-                              "display":packet_decode(self.packet)}]
+                    out += [{'type': 'usb', 'data': self.packet,
+                             'display': packet_decode(self.packet)}]
                 else:
                     # Longer than EOP, assume reset.
-                    out += [{"type":"usb", "display":"RESET"}]
+                    out += [{'type': 'usb', 'display': 'RESET'}]
                 self.scount = 0
                 self.sym = sym
                 self.packet = ''
@@ -176,7 +177,7 @@ class Decoder(srd.Decoder):
             if bitcount < 6 and sym != SE0:
                 self.packet += '0'
             elif bitcount > 6:
-                out += [{"type":"usb", "display":"BIT STUFF ERROR"}]
+                out += [{'type': 'usb', 'display': 'BIT STUFF ERROR'}]
 
             self.scount = 0
             self.sym = sym