srd: Drop duplicate SRD_ prefix from ANN/PROTO.

Using srd.SRD_OUTPUT_ANN is unneeded, srd.OUTPUT_ANN is better/shorter.

diff --git a/decoders/ddc.py b/decoders/ddc.py
index a628565151addd1b3a947a6ffabeafb7629f2b8a..36d5c4aee2fcc7b9b3e44fce470747d99a9047cd 100644 (file)
--- a/decoders/ddc.py
+++ b/decoders/ddc.py
@@ -45,7 +45,7 @@ class Decoder(srd.Decoder):
         self.state = None
 
     def start(self, metadata):
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'ddc')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'ddc')
 
     def decode(self, start_sample, end_sample, i2c_data):
         try:

diff --git a/decoders/i2c.py b/decoders/i2c.py
index b8c56f72ea04d784273c0226b3ef416e8d56a822..11ee9b5fb83ed191406293299590a88e986faaac 100644 (file)
--- a/decoders/i2c.py
+++ b/decoders/i2c.py
@@ -160,8 +160,8 @@ class Decoder(srd.Decoder):
         self.oldsda = None
 
     def start(self, metadata):
-        self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'i2c')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'i2c')
+        self.out_proto = self.add(srd.OUTPUT_PROTO, 'i2c')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'i2c')
 
     def report(self):
         pass

diff --git a/decoders/mx25lxx05d.py b/decoders/mx25lxx05d.py
index 4a87fa4b4b57476978936527f9244cd04cdfb54d..3f0dc18c71df247d6577414168f0099f253c62ff 100644 (file)
--- a/decoders/mx25lxx05d.py
+++ b/decoders/mx25lxx05d.py
@@ -177,8 +177,8 @@ class Decoder(srd.Decoder):
         self.out = []
 
     def start(self, metadata):
-        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'mx25lxx05d')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'mx25lxx05d')
+        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'mx25lxx05d')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'mx25lxx05d')
 
     def report(self):
         pass

diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index 86ec17111750dcf6ed2483317f6237f54abfa1a1..63fadc2172f87457d58a814b7592487ae6856ea3 100644 (file)
--- a/decoders/nunchuk.py
+++ b/decoders/nunchuk.py
@@ -84,8 +84,8 @@ class Decoder(srd.Decoder):
         self.databytecount = 0
 
     def start(self, metadata):
-        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'nunchuk')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'nunchuk')
+        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'nunchuk')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'nunchuk')
 
     def report(self):
         pass

diff --git a/decoders/pan1321.py b/decoders/pan1321.py
index 2d86679720c5ec14047759994ef6b96c1dd5df1e..3174ffeced9a6f18abe3b40dc3d212d4190c479e 100644 (file)
--- a/decoders/pan1321.py
+++ b/decoders/pan1321.py
@@ -54,8 +54,8 @@ class Decoder(srd.Decoder):
         self.cmd = ''
 
     def start(self, metadata):
-        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'pan1321')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'pan1321')
+        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'pan1321')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'pan1321')
 
     def report(self):
         pass

diff --git a/decoders/spi.py b/decoders/spi.py
index 9d3940e392d8ac6fd81be8e9236acd6eb42d0f72..3262aa43b2e23fd8c650ea71da17d225bcea6712 100644 (file)
--- a/decoders/spi.py
+++ b/decoders/spi.py
@@ -44,8 +44,8 @@ class Decoder(srd.Decoder):
         self.bytesreceived = 0
 
     def start(self, metadata):
-        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'spi')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'spi')
+        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'spi')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'spi')
 
     def report(self):
         return 'SPI: %d bytes received' % self.bytesreceived

diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py
index c6e6627c3d4fbd47ee4becda5fd910185825894e..f7afa653c797d998a38a35c6aa8c4ec56082fdc8 100644 (file)
--- a/decoders/srd_usb.py
+++ b/decoders/srd_usb.py
@@ -122,8 +122,8 @@ class Decoder(srd.Decoder):
 
     def start(self, metadata):
         self.rate = metadata['samplerate']
-        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'usb')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'usb')
+        # 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.

diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py
index 6092258d44b6ea25706dc686fff691723c875402..5b12927bceb61f04641a5df38526d7da2930ab4a 100644 (file)
--- a/decoders/transitioncounter.py
+++ b/decoders/transitioncounter.py
@@ -40,8 +40,8 @@ class Decoder(srd.Decoder):
         self.lastsample = None
 
     def start(self, metadata):
-        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'transitioncounter')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'transitioncounter')
+        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'transitioncounter')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'transitioncounter')
 
     def report(self):
         pass

diff --git a/decoders/uart.py b/decoders/uart.py
index 45465213e717797c533f995551d18702e603cf3c..24b5ba3a5894bcfa3691c2bf164e9b6a2a894cf2 100644 (file)
--- a/decoders/uart.py
+++ b/decoders/uart.py
@@ -255,8 +255,8 @@ class Decoder(srd.Decoder):
 
     def start(self, metadata):
         self.samplerate = metadata['samplerate']
-        self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'uart')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'uart')
+        self.out_proto = self.add(srd.OUTPUT_PROTO, 'uart')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'uart')
 
         # TODO
         ### self.baudrate = metadata['baudrate']

diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index d2ffb0767487576de20672710038baec76fa2b55..426cf49c28b76c3cb8a0991929cf58c67bb51c43 100644 (file)
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -230,13 +230,13 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void)
                return NULL;
 
        /* expose output types as symbols in the sigrokdecode module */
-       if(PyModule_AddObject(mod, "SRD_OUTPUT_ANN",
+       if(PyModule_AddObject(mod, "OUTPUT_ANN",
                        PyLong_FromLong(SRD_OUTPUT_ANN)) == -1)
                return NULL;
-       if(PyModule_AddObject(mod, "SRD_OUTPUT_PROTO",
+       if(PyModule_AddObject(mod, "OUTPUT_PROTO",
                        PyLong_FromLong(SRD_OUTPUT_PROTO)) == -1)
                return NULL;
-       if(PyModule_AddObject(mod, "SRD_OUTPUT_BINARY",
+       if(PyModule_AddObject(mod, "OUTPUT_BINARY",
                        PyLong_FromLong(SRD_OUTPUT_BINARY)) == -1)
                return NULL;