X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fusb_packet%2Fpd.py;h=8e5fb9e9da29bc3a545debc3a7c8c514b3d1fce2;hb=a74855de187198624fefd2c12ef8355e5a869f80;hp=1a814b0d3bf49805075c903854e45b3f3be37850;hpb=0eb16a7bab83bf219004b768cb58d90a6c52e0d7;p=libsigrokdecode.git

diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
index 1a814b0..8e5fb9e 100644
--- a/decoders/usb_packet/pd.py
+++ b/decoders/usb_packet/pd.py
@@ -19,12 +19,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-# USB (low-speed and full-speed) packet protocol decoder
-
 import sigrokdecode as srd
 
 '''
-Protocol output format:
+OUTPUT_PYTHON format:
 
 Packet:
 [<ptype>, <pdata>]
@@ -151,7 +149,7 @@ class Decoder(srd.Decoder):
         'signalling': ['Signalling', 'full-speed'],
     }
     annotations = [
-        ['Text', 'Human-readable text']
+        ['text', 'Human-readable text']
     ]
 
     def __init__(self):
@@ -164,23 +162,20 @@ class Decoder(srd.Decoder):
         self.state = 'WAIT FOR SOP'
 
     def putpb(self, data):
-        self.put(self.ss, self.es, self.out_proto, data)
+        self.put(self.ss, self.es, self.out_python, data)
 
     def putb(self, data):
         self.put(self.ss, self.es, self.out_ann, data)
 
     def putpp(self, data):
-        self.put(self.ss_packet, self.es_packet, self.out_proto, data)
+        self.put(self.ss_packet, self.es_packet, self.out_python, data)
 
     def putp(self, data):
         self.put(self.ss_packet, self.es_packet, self.out_ann, data)
 
-    def start(self, metadata):
-        self.out_proto = self.add(srd.OUTPUT_PROTO, 'usb_packet')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'usb_packet')
-
-    def report(self):
-        pass
+    def start(self):
+        self.out_python = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def handle_packet(self):
         packet = ''
@@ -256,7 +251,7 @@ class Decoder(srd.Decoder):
                 data = data[8:]
             self.packet_summary += ' ]'
 
-            # Convenience proto output (no annotation) for all bytes together.
+            # Convenience python output (no annotation) for all bytes together.
             self.ss, self.es = self.bits[16][1], self.bits[-16][2]
             self.putpb(['DATABYTES', databytes])
             self.packet.append(databytes)