Rename inter-PD output type to SRD_OUTPUT_PYTHON

This better reflects what it is: a python object generated and
processed by python code.

diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index 731f847c055ab751bbf63ef1bbb5e037fdf80cb7..27b511886ecea409cd729a22529c7737b0ff9794 100644 (file)
--- a/decoders/avr_isp/pd.py
+++ b/decoders/avr_isp/pd.py
@@ -51,7 +51,7 @@ 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_PROTO, 'avr_isp')
+        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'avr_isp')
         self.out_ann = self.add(srd.OUTPUT_ANN, 'avr_isp')
 
     def report(self):

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

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

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

diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py
index dcc27b2f6269a018b5ef946be224fae1dda12c48..da8056702b0f0d5ef766e7e569629a818e6fe7b3 100644 (file)
--- a/decoders/i2c/pd.py
+++ b/decoders/i2c/pd.py
@@ -106,7 +106,7 @@ class Decoder(srd.Decoder):
         self.oldpins = [1, 1]
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PROTO, 'i2c')
+        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'i2c')
         self.out_ann = self.add(srd.OUTPUT_ANN, 'i2c')
 
     def report(self):

diff --git a/decoders/i2cdemux/pd.py b/decoders/i2cdemux/pd.py
index b075129d41695f294d63be24e9f380a78e1c788b..1e1d09c7910489a1346da0a7b408e756b4bcef8b 100644 (file)
--- a/decoders/i2cdemux/pd.py
+++ b/decoders/i2cdemux/pd.py
@@ -68,7 +68,7 @@ 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_PROTO,
+            self.out_proto.append(self.add(srd.OUTPUT_PYTHON,
                                   'i2c-%s' % hex(databyte)))
             self.stream = self.streamcount
             self.streamcount += 1

diff --git a/decoders/i2cfilter/pd.py b/decoders/i2cfilter/pd.py
index c0f9a0b14c36ec1072c39c08c7f6f84d80da8f55..4586cf7de77f5e8da2c529cb7ad4597e8f68b5b5 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_PROTO, 'i2c')
+        self.out_proto = self.add(srd.OUTPUT_PYTHON, '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 91d261a2c9c88bceb890ba62eb6690d34d08b823..292a4c48ebbd1af8e51816271270d7ac9cf2dfe9 100644 (file)
--- a/decoders/i2s/pd.py
+++ b/decoders/i2s/pd.py
@@ -69,7 +69,7 @@ class Decoder(srd.Decoder):
         self.wordlength = -1
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PROTO, 'i2s')
+        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'i2s')
         self.out_ann = self.add(srd.OUTPUT_ANN, 'i2s')
 
     def metadata(self, key, value):

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

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

diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py
index 8e447b734f040ccc31b51d484ae3e921036b0da5..de1a0dafa4fc91b6b81c8a5f709c4d69fe4554c0 100644 (file)
--- a/decoders/lm75/pd.py
+++ b/decoders/lm75/pd.py
@@ -78,7 +78,7 @@ class Decoder(srd.Decoder):
         self.avgvalues = []
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'lm75')
+        # self.out_proto = self.add(srd.OUTPUT_PYTHON, 'lm75')
         self.out_ann = self.add(srd.OUTPUT_ANN, 'lm75')
 
     def report(self):

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index d18af854bf8a3fee5481215190d0056709cb33bf..888cbd34e1a847229220c005fd613e1b5af58cf0 100644 (file)
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -101,7 +101,7 @@ class Decoder(srd.Decoder):
         self.state = 'IDLE'
 
     def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PROTO, 'spi')
+        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'spi')
         self.out_ann = self.add(srd.OUTPUT_ANN, 'spi')
 
     def report(self):

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

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

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

diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
index d799cd5f9f688a113b4f5db7f249dd242403845a..5b3c5e6a3ca9b4387f444ca63fc7ae0da93ac45c 100644 (file)
--- a/decoders/usb_packet/pd.py
+++ b/decoders/usb_packet/pd.py
@@ -176,7 +176,7 @@ 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_PROTO, 'usb_packet')
+        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'usb_packet')
         self.out_ann = self.add(srd.OUTPUT_ANN, 'usb_packet')
 
     def report(self):

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

diff --git a/libsigrokdecode.h.in b/libsigrokdecode.h.in
index 3eaace655d6e1cc28cafc1c10f8d730a747e7973..cec6def197b598680fef718619c49379869c66c7 100644 (file)
--- a/libsigrokdecode.h.in
+++ b/libsigrokdecode.h.in
@@ -160,7 +160,7 @@ enum {
  */
 enum {
        SRD_OUTPUT_ANN,
-       SRD_OUTPUT_PROTO,
+       SRD_OUTPUT_PYTHON,
        SRD_OUTPUT_BINARY,
 };
 

diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index 6fba05ca5a875b145d1b5d96b8221d992eeb4348..46b3ced7695db861d61acc126f473b9ec48c69cd 100644 (file)
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -71,8 +71,8 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void)
        /* expose output types as symbols in the sigrokdecode module */
        if (PyModule_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) == -1)
                return NULL;
-       if (PyModule_AddIntConstant(mod, "OUTPUT_PROTO",
-           SRD_OUTPUT_PROTO) == -1)
+       if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON",
+           SRD_OUTPUT_PYTHON) == -1)
                return NULL;
        if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY",
            SRD_OUTPUT_BINARY) == -1)

diff --git a/type_decoder.c b/type_decoder.c
index c8ef09e1021b4be12335eac5af61235f445330e2..f689dd0f396045dfa37e484d3f7e1667df976a49 100644 (file)
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -25,7 +25,7 @@
 /* This is only used for nicer srd_dbg() output. */
 static const char *OUTPUT_TYPES[] = {
        "OUTPUT_ANN",
-       "OUTPUT_PROTO",
+       "OUTPUT_PYTHON",
        "OUTPUT_BINARY",
 };
 
@@ -145,7 +145,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
                        cb->cb(pdata, cb->cb_data);
                }
                break;
-       case SRD_OUTPUT_PROTO:
+       case SRD_OUTPUT_PYTHON:
                for (l = di->next_di; l; l = l->next) {
                        next_di = l->data;
                        /* TODO: Is this needed? */