srd: rename extra_probes to optional_probes in all PDs

[libsigrokdecode.git] / decoders / usb / usb.py

diff --git a/decoders/usb/usb.py b/decoders/usb/usb.py
index 073fe0114d2824116ec6ff25fb5af60fd6c3aa99..b209aa3186fbf9f2ba4feffa63bdd0ca74cd03db 100644 (file)
--- a/decoders/usb/usb.py
+++ b/decoders/usb/usb.py
@@ -105,6 +105,7 @@ def packet_decode(packet):
     return pid + ' ' + data
 
 class Decoder(srd.Decoder):
+    api_version = 1
     id = 'usb'
     name = 'USB'
     longname = 'Universal Serial Bus'
@@ -117,6 +118,7 @@ class Decoder(srd.Decoder):
         {'id': 'dp', 'name': 'D+', 'desc': 'USB D+ signal'},
         {'id': 'dm', 'name': 'D-', 'desc': 'USB D- signal'},
     ]
+    optional_probes = []
     options = {}
     annotations = [
         ['TODO', 'TODO']
@@ -132,17 +134,18 @@ class Decoder(srd.Decoder):
         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 (%d) not sufficient for USB '
+                            'decoding, need at least 48MHz' % self.rate)
 
         # Initialise decoder state.
         self.sym = J
         self.scount = 0
         self.packet = ''
 
-    def decode(self, ss, es, data):
+    def report(self):
+        pass
 
-        # FIXME
-        # for (samplenum, (dp, dm, x, y, z, a)) in data:
+    def decode(self, ss, es, data):
         for (samplenum, (dm, dp)) in data:
 
             self.scount += 1