X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fsrd_usb.py;h=6cf8c2d77a48193fc5cfca08586051099b70b3df;hb=0c3089c1c49e51e588dd264abafb05efdd44d0c8;hp=387fd06768c50ff8fc8936cb4092de21fadf092d;hpb=eb7082c98efad727d88e3ebeadcd496fa948475b;p=libsigrokdecode.git

diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py
index 387fd06..6cf8c2d 100644
--- a/decoders/srd_usb.py
+++ b/decoders/srd_usb.py
@@ -44,6 +44,8 @@ import sigrokdecode as srd
 
 # States
 SE0, J, K, SE1 = 0, 1, 2, 3
+
+# ...
 syms = {
         (0, 0): SE0,
         (1, 0): J,
@@ -51,6 +53,20 @@ syms = {
         (1, 1): SE1,
 }
 
+# ...
+pids = {
+    '10000111': 'OUT',      # Tokens
+    '10010110': 'IN',
+    '10100101': 'SOF',
+    '10110100': 'SETUP',
+    '11000011': 'DATA0',    # Data
+    '11010010': 'DATA1',
+    '01001011': 'ACK',      # Handshake
+    '01011010': 'NAK',
+    '01111000': 'STALL',
+    '01101001': 'NYET',
+}
+
 def bitstr_to_num(bitstr):
     if not bitstr:
         return 0
@@ -59,19 +75,6 @@ def bitstr_to_num(bitstr):
     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',
-    }
-
     sync = packet[:8]
     pid = packet[8:16]
     pid = pids.get(pid, pid)
@@ -90,7 +93,7 @@ def packet_decode(packet):
         data = packet[16:-16]
         tmp = ''
         while data:
-            tmp += '%02X ' % bitstr_to_num(data[:8])
+            tmp += '%02x ' % bitstr_to_num(data[:8])
             data = data[8:]
         data = tmp
     else:
@@ -104,8 +107,8 @@ def packet_decode(packet):
 class Decoder(srd.Decoder):
     id = 'usb'
     name = 'USB'
+    longname = 'Universal Serial Bus'
     desc = 'Universal Serial Bus'
-    longname = '...longname...'
     longdesc = '...longdesc...'
     author = 'Gareth McMullin'
     email = 'gareth@blacksphere.co.nz'
@@ -117,30 +120,38 @@ class Decoder(srd.Decoder):
         {'id': 'dm', 'name': 'D-', 'desc': 'USB D- signal'},
     ]
     options = {}
+    annotations = [
+        ['TODO', 'TODO']
+    ]
 
     def __init__(self):
         pass
 
     def start(self, metadata):
         self.rate = metadata['samplerate']
+
         # 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')
+
         # Initialise decoder state.
         self.sym = J
         self.scount = 0
         self.packet = ''
 
-    def decode(self, timeoffset, duration, data):
-        out = []
+    def decode(self, ss, es, data):
 
         # FIXME
-        for (samplenum, (dp, dm, x, y, z, a)) in data:
+        # for (samplenum, (dp, dm, x, y, z, a)) in data:
+        for (samplenum, (dm, dp)) in data:
 
             self.scount += 1
 
             sym = syms[dp, dm]
+
+            # ...
             if sym == self.sym:
                 continue
 
@@ -152,7 +163,7 @@ class Decoder(srd.Decoder):
                 continue
 
             # How many bits since the last transition?
-            if self.packet or self.sym != J:
+            if self.packet != '' or self.sym != J:
                 bitcount = int((self.scount - 1) * 12000000 / self.rate)
             else:
                 bitcount = 0
@@ -160,11 +171,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)}]
+                    self.put(0, 0, self.out_ann,
+                             [0, [packet_decode(self.packet), self.packet]])
                 else:
                     # Longer than EOP, assume reset.
-                    out += [{'type': 'usb', 'display': 'RESET'}]
+                    self.put(0, 0, self.out_ann, [0, ['RESET']])
                 self.scount = 0
                 self.sym = sym
                 self.packet = ''
@@ -172,16 +183,13 @@ class Decoder(srd.Decoder):
 
             # Add bits to the packet string.
             self.packet += '1' * bitcount
+
             # Handle bit stuffing.
             if bitcount < 6 and sym != SE0:
                 self.packet += '0'
             elif bitcount > 6:
-                out += [{'type': 'usb', 'display': 'BIT STUFF ERROR'}]
+                self.put(0, 0, self.out_ann, [0, ['BIT STUFF ERROR']])
 
             self.scount = 0
             self.sym = sym
 
-        if out != []:
-            # self.put(0, 0, self.out_proto, out_proto)
-            self.put(0, 0, self.out_ann, out)
-