Use the new Decoder.register() API

diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index 27b511886ecea409cd729a22529c7737b0ff9794..789a7f9b1ac893b2879c5665b8184efd31fcec43 100644 (file)
--- a/decoders/avr_isp/pd.py
+++ b/decoders/avr_isp/pd.py
@@ -51,8 +51,8 @@ class Decoder(srd.Decoder):
         self.xx, self.yy, self.zz, self.mm = 0, 0, 0, 0
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'avr_isp')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'avr_isp')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 2e58c0af0ab984939c7d2c0cba74e7fa1c389c98..1495e5e7eaf26805f3c752aedc768605365746e5 100644 (file)
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -64,8 +64,8 @@ class Decoder(srd.Decoder):
         self.reset_variables()
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'can')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'can')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:

diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py
index 9a273b21498dbdc828c8f07461a9bffde46debd2..b708fbc790ea3cf5dcedcb92c3884b6cf0de00c8 100644 (file)
--- a/decoders/dcf77/pd.py
+++ b/decoders/dcf77/pd.py
@@ -76,8 +76,8 @@ class Decoder(srd.Decoder):
         self.dcf77_bitnumber_is_known = 0
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'dcf77')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'dcf77')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:

diff --git a/decoders/ds1307/pd.py b/decoders/ds1307/pd.py
index 07bdebc9c065ec0aa622fb6b803f9e7e6b285e87..8652d1b8fc6426644f20a486496e0d01ca17e1fd 100644 (file)
--- a/decoders/ds1307/pd.py
+++ b/decoders/ds1307/pd.py
@@ -64,7 +64,7 @@ class Decoder(srd.Decoder):
         self.years = -1
 
     def start(self):
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'ds1307')
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/edid/pd.py b/decoders/edid/pd.py
index 1f621b22a5f1bef8890f4c49dad69fb9a8559e07..704f3505a164f167273a1333c2423c895ba84e9d 100644 (file)
--- a/decoders/edid/pd.py
+++ b/decoders/edid/pd.py
@@ -101,7 +101,7 @@ class Decoder(srd.Decoder):
         self.cache = []
 
     def start(self):
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'edid')
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/guess_bitrate/pd.py b/decoders/guess_bitrate/pd.py
index 3eaa1e9dbe60dca22c6a9fccf8a91de0cbeb5c32..9acce50ae5cc1b1e93716d249ef7eb84ceaac534 100644 (file)
--- a/decoders/guess_bitrate/pd.py
+++ b/decoders/guess_bitrate/pd.py
@@ -51,8 +51,8 @@ class Decoder(srd.Decoder):
 
     def start(self, metadata):
         self.samplerate = metadata['samplerate']
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'guess_bitrate')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'guess_bitrate')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/i2cdemux/pd.py b/decoders/i2cdemux/pd.py
index 1e1d09c7910489a1346da0a7b408e756b4bcef8b..d86c59781728fa93c52b4c888ab7c070f5455029 100644 (file)
--- a/decoders/i2cdemux/pd.py
+++ b/decoders/i2cdemux/pd.py
@@ -68,8 +68,8 @@ class Decoder(srd.Decoder):
 
             # We're never seen this slave, add a new stream.
             self.slaves.append(databyte)
-            self.out_proto.append(self.add(srd.OUTPUT_PYTHON,
-                                  'i2c-%s' % hex(databyte)))
+            self.out_proto.append(self.register(srd.OUTPUT_PYTHON,
+                                  proto_id='i2c-%s' % hex(databyte)))
             self.stream = self.streamcount
             self.streamcount += 1
         elif cmd == 'STOP':

diff --git a/decoders/i2cfilter/pd.py b/decoders/i2cfilter/pd.py
index 4586cf7de77f5e8da2c529cb7ad4597e8f68b5b5..4fe3a9c94e39679edfc6970ee1c25227ed661a76 100644 (file)
--- a/decoders/i2cfilter/pd.py
+++ b/decoders/i2cfilter/pd.py
@@ -48,7 +48,7 @@ class Decoder(srd.Decoder):
         self.packets = [] # Local cache of I2C packets
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'i2c')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON, proto_id='i2c')
         if self.options['address'] not in range(0, 127 + 1):
             raise Exception('Invalid slave (must be 0..127).')
         if self.options['direction'] not in ('both', 'read', 'write'):

diff --git a/decoders/i2s/pd.py b/decoders/i2s/pd.py
index 292a4c48ebbd1af8e51816271270d7ac9cf2dfe9..ea147dec0369f11446468dc929a00e5bc4b20ee9 100644 (file)
--- a/decoders/i2s/pd.py
+++ b/decoders/i2s/pd.py
@@ -69,8 +69,8 @@ class Decoder(srd.Decoder):
         self.wordlength = -1
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'i2s')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'i2s')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:

diff --git a/decoders/jtag/pd.py b/decoders/jtag/pd.py
index e327d321e40b2fef1c117749cc808b59430d5b7d..5d4ee8e71eea751b1a844f1a8534cf23d864f97c 100644 (file)
--- a/decoders/jtag/pd.py
+++ b/decoders/jtag/pd.py
@@ -57,8 +57,8 @@ class Decoder(srd.Decoder):
         self.bits_tdo = []
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'jtag')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'jtag')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/jtag_stm32/pd.py b/decoders/jtag_stm32/pd.py
index fee208870cd5eedd19ec413eb6cb2e45de3468a7..3daa024b742a301dcc53fd3f074eebc9eaf08fca 100644 (file)
--- a/decoders/jtag_stm32/pd.py
+++ b/decoders/jtag_stm32/pd.py
@@ -141,8 +141,8 @@ class Decoder(srd.Decoder):
         # self.state = 'BYPASS'
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'jtag_stm32')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'jtag_stm32')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py
index de1a0dafa4fc91b6b81c8a5f709c4d69fe4554c0..6bbc5d8765ddca69dc9166129478dbb8bfa9fa36 100644 (file)
--- a/decoders/lm75/pd.py
+++ b/decoders/lm75/pd.py
@@ -78,8 +78,8 @@ class Decoder(srd.Decoder):
         self.avgvalues = []
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'lm75')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'lm75')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         # TODO: print() or self.put() or return xyz, or... ?

diff --git a/decoders/lpc/pd.py b/decoders/lpc/pd.py
index b4adb5b7d05d7d9f1f3cb752306fbd45aa57887c..313b7d26071d417d4fec8dc13921792c221c79d5 100644 (file)
--- a/decoders/lpc/pd.py
+++ b/decoders/lpc/pd.py
@@ -151,8 +151,8 @@ class Decoder(srd.Decoder):
         self.ss_block = self.es_block = None
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'lpc')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'lpc')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/maxim_ds28ea00/pd.py b/decoders/maxim_ds28ea00/pd.py
index ed020d4bf44ec3d732615601da99a7b051853059..69ace697d18a93d278d446412c25bf167e77cbc1 100644 (file)
--- a/decoders/maxim_ds28ea00/pd.py
+++ b/decoders/maxim_ds28ea00/pd.py
@@ -65,7 +65,7 @@ class Decoder(srd.Decoder):
         self.rom = 0x0000000000000000
 
     def start(self):
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'maxim_ds28ea00')
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/midi/pd.py b/decoders/midi/pd.py
index 371bcd5a0f3e053e487eaf496e5301bdc56aa3f9..6f2f1c71b35381e12f4b7bf5871da057dca79811 100644 (file)
--- a/decoders/midi/pd.py
+++ b/decoders/midi/pd.py
@@ -52,8 +52,8 @@ class Decoder(srd.Decoder):
         self.es_block = None
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'midi')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'midi')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
index 67a852c4b9c7854c1a7bb1ba15f0b866f4872b09..f0bed5c653a801a86f3d220cd8fcb46de69c11b1 100644 (file)
--- a/decoders/mlx90614/pd.py
+++ b/decoders/mlx90614/pd.py
@@ -44,8 +44,8 @@ class Decoder(srd.Decoder):
         self.data = []
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'mlx90614')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'mlx90614')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/mx25lxx05d/pd.py b/decoders/mx25lxx05d/pd.py
index 856497be896c6145f0591e566ca34b7044eb19ce..68335d4d0bd3ab90ee2736126f53b9d88f16aad4 100644 (file)
--- a/decoders/mx25lxx05d/pd.py
+++ b/decoders/mx25lxx05d/pd.py
@@ -111,8 +111,8 @@ class Decoder(srd.Decoder):
         self.data = []
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'mx25lxx05d')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'mx25lxx05d')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py
index e707b7509bb9b2fcf7c28a68f23c63b9921e6bba..de7efafc9bdab7f83eb46fadda50d592267c9e3e 100644 (file)
--- a/decoders/mxc6225xu/pd.py
+++ b/decoders/mxc6225xu/pd.py
@@ -83,8 +83,8 @@ class Decoder(srd.Decoder):
         self.state = 'IDLE'
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'mxc6225xu')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'mxc6225xu')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/nunchuk/pd.py b/decoders/nunchuk/pd.py
index 544802edff7adc841795aee9c2fe5e38add31a72..78eacea123497ccee1395eda449fe7d2c8adb1fa 100644 (file)
--- a/decoders/nunchuk/pd.py
+++ b/decoders/nunchuk/pd.py
@@ -48,8 +48,8 @@ class Decoder(srd.Decoder):
         self.init_seq = []
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'nunchuk')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'nunchuk')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index 34cd4f4bb47a30e035bf22bacec161af41c0efc9..bc44ce9317856caa536a01b8ae59658e6b5724f4 100644 (file)
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -92,8 +92,8 @@ class Decoder(srd.Decoder):
         self.rise = 0
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'onewire_link')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'onewire_link')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
         if key != srd.SRD_CONF_SAMPLERATE:

diff --git a/decoders/onewire_network/pd.py b/decoders/onewire_network/pd.py
index 1099bdc2c37dfbc9b5fbfa78dd687b4ceb89378b..6ab8f8e2550dc5194a5fc7223e66685db09b6157 100644 (file)
--- a/decoders/onewire_network/pd.py
+++ b/decoders/onewire_network/pd.py
@@ -62,8 +62,8 @@ class Decoder(srd.Decoder):
         self.rom = 0x0000000000000000
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'onewire_network')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'onewire_network')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/pan1321/pd.py b/decoders/pan1321/pd.py
index 42cace2ca3f6a6ec0909256646a72157ddf2078f..d9700b2fe0edfe72f52e41e8be1be2b83b2a6c51 100644 (file)
--- a/decoders/pan1321/pd.py
+++ b/decoders/pan1321/pd.py
@@ -49,8 +49,8 @@ class Decoder(srd.Decoder):
         self.ss_block = None
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'pan1321')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'pan1321')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/parallel/pd.py b/decoders/parallel/pd.py
index 2de9dde41854c80f06507ceb4273f40d60af20b6..9c203543f21a65593df2eea5b753dc1a1c32b6f4 100644 (file)
--- a/decoders/parallel/pd.py
+++ b/decoders/parallel/pd.py
@@ -99,8 +99,8 @@ class Decoder(srd.Decoder):
         self.state = 'IDLE'
 
     def start(self, metadata):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'parallel')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'parallel')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/rtc8564/pd.py b/decoders/rtc8564/pd.py
index e7ae03690bf0e574a2b5be022351e3d40d8a9b86..3abd1d8b8ed8f288b82ba08af16f3c2bad027ef9 100644 (file)
--- a/decoders/rtc8564/pd.py
+++ b/decoders/rtc8564/pd.py
@@ -56,8 +56,8 @@ class Decoder(srd.Decoder):
         self.years = -1
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'rtc8564')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'rtc8564')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/sdcard_spi/pd.py b/decoders/sdcard_spi/pd.py
index 0d93d1691127518704d2d9eebc0a6587a1ea931b..de3adbdd86fe5922ff0b96f719ce4b889cf2e1cf 100644 (file)
--- a/decoders/sdcard_spi/pd.py
+++ b/decoders/sdcard_spi/pd.py
@@ -98,8 +98,8 @@ class Decoder(srd.Decoder):
         self.read_buf = []
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'sdcard_spi')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'sdcard_spi')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index b18d021b85c592bcc67105fc3dc590924f4f84ee..21012c19996031a2dcd001ac5e220f741653d8f7 100644 (file)
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -106,8 +106,8 @@ class Decoder(srd.Decoder):
             self.samplerate = value
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'spi')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'spi')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
         self.out_bitrate = self.register(srd.OUTPUT_META,
                 meta=(int, 'Bitrate', 'Bitrate during transfers'))
 

diff --git a/decoders/tlc5620/pd.py b/decoders/tlc5620/pd.py
index 313adcaf7a961b2dc6b5188145451d506838bc4d..395267dedb883797ec58f13e97fab4511f4d759a 100644 (file)
--- a/decoders/tlc5620/pd.py
+++ b/decoders/tlc5620/pd.py
@@ -65,8 +65,8 @@ class Decoder(srd.Decoder):
         self.dac_select = self.gain = self.dac_value = None
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'tlc5620')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'tlc5620')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/transitioncounter/pd.py b/decoders/transitioncounter/pd.py
index 45446e2e207ba17aecde9538ec9b255d635fbb94..09164c0b1bd2f65e6d911200f17ae7590964a4a7 100644 (file)
--- a/decoders/transitioncounter/pd.py
+++ b/decoders/transitioncounter/pd.py
@@ -43,8 +43,8 @@ class Decoder(srd.Decoder):
         self.lastsample = None
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'transitioncounter')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'transitioncounter')
+        # self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/uart/pd.py b/decoders/uart/pd.py
index 32568da307a24b62f9f4d1d42f5c12fb98383643..89027806bf63a0da710114a5bca5225d36dd8b29 100644 (file)
--- a/decoders/uart/pd.py
+++ b/decoders/uart/pd.py
@@ -132,8 +132,8 @@ class Decoder(srd.Decoder):
         self.oldpins = [1, 1]
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'uart')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'uart')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:

diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
index 5b3c5e6a3ca9b4387f444ca63fc7ae0da93ac45c..8e981ee41b325ef66178f36d6cc2a39e775b5c30 100644 (file)
--- a/decoders/usb_packet/pd.py
+++ b/decoders/usb_packet/pd.py
@@ -176,8 +176,8 @@ class Decoder(srd.Decoder):
         self.put(self.ss_packet, self.es_packet, self.out_ann, data)
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'usb_packet')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'usb_packet')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def report(self):
         pass

diff --git a/decoders/usb_signalling/pd.py b/decoders/usb_signalling/pd.py
index 0d21d2226405a0814f32ebde93f6a5b479e9554a..3760dea85c64a3fe5f1a97cc13f7f607e68a1a6a 100644 (file)
--- a/decoders/usb_signalling/pd.py
+++ b/decoders/usb_signalling/pd.py
@@ -109,8 +109,8 @@ class Decoder(srd.Decoder):
         self.state = 'IDLE'
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'usb_signalling')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'usb_signalling')
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:

diff --git a/decoders/xfp/pd.py b/decoders/xfp/pd.py
index abbf62611d28a9e96299a77c54a80c7ded49cf18..623052382ee30b80561d05deb721367b080591cf 100644 (file)
--- a/decoders/xfp/pd.py
+++ b/decoders/xfp/pd.py
@@ -277,7 +277,7 @@ class Decoder(srd.Decoder):
         }
 
     def start(self):
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'xfp')
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def decode(self, ss, es, data):
         cmd, data = data