srd: Use 'import sigrokdecode as srd' for brevity.

diff --git a/decoders/ddc.py b/decoders/ddc.py
index b4681d0fbe0566cca9028bed096e7035bd0d086c..a628565151addd1b3a947a6ffabeafb7629f2b8a 100644 (file)
--- a/decoders/ddc.py
+++ b/decoders/ddc.py
@@ -24,10 +24,10 @@
 # and a display device. The stream is output as plain bytes.
 #
 
 # and a display device. The stream is output as plain bytes.
 #
 

-import sigrokdecode
+import sigrokdecode as srd

 
 
 
 

-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):

     id = 'ddc'
     name = 'DDC'
     longname = 'Display Data Channel'
     id = 'ddc'
     name = 'DDC'
     longname = 'Display Data Channel'


@@ -45,7 +45,7 @@ class Decoder(sigrokdecode.Decoder):
         self.state = None
 
     def start(self, metadata):
         self.state = None
 
     def start(self, metadata):

-        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'ddc')
+        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'ddc')

 
     def decode(self, start_sample, end_sample, i2c_data):
         try:
 
     def decode(self, start_sample, end_sample, i2c_data):
         try:

diff --git a/decoders/i2c.py b/decoders/i2c.py
index b101e8a2328fc2a191fd2a8188549b3faeadda72..69827984f0586683ed7fa92bef8630bfb93decd0 100644 (file)
--- a/decoders/i2c.py
+++ b/decoders/i2c.py
@@ -93,7 +93,7 @@
 #
 #
 
 #
 #
 

-import sigrokdecode
+import sigrokdecode as srd

 
 # annotation feed formats
 ANN_SHIFTED       = 0
 
 # annotation feed formats
 ANN_SHIFTED       = 0


@@ -119,7 +119,7 @@ FIND_ADDRESS = 1
 FIND_DATA = 2
 
 
 FIND_DATA = 2
 
 

-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):

     id = 'i2c'
     name = 'I2C'
     longname = 'Inter-Integrated Circuit (I2C) bus'
     id = 'i2c'
     name = 'I2C'
     longname = 'Inter-Integrated Circuit (I2C) bus'


@@ -162,8 +162,8 @@ class Decoder(sigrokdecode.Decoder):
         self.oldsda = None
 
     def start(self, metadata):
         self.oldsda = None
 
     def start(self, metadata):

-        self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'i2c')
-        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'i2c')
+        self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'i2c')
+        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'i2c')

 
     def report(self):
         pass
 
     def report(self):
         pass

diff --git a/decoders/mx25lxx05d.py b/decoders/mx25lxx05d.py
index bd1ce16d3007c9f1d389de009d51db23adc671b4..72e1e1b679e1c559eba11d2d7f1cd92f2793652f 100644 (file)
--- a/decoders/mx25lxx05d.py
+++ b/decoders/mx25lxx05d.py
@@ -30,7 +30,7 @@
 # http://www.macronix.com/QuickPlace/hq/PageLibrary4825740B00298A3B.nsf/h_Index/3F21BAC2E121E17848257639003A3146/$File/MX25L1605D-3205D-6405D-1.5.pdf
 #
 
 # http://www.macronix.com/QuickPlace/hq/PageLibrary4825740B00298A3B.nsf/h_Index/3F21BAC2E121E17848257639003A3146/$File/MX25L1605D-3205D-6405D-1.5.pdf
 #
 

-import sigrokdecode
+import sigrokdecode as srd

 
 # States
 IDLE = -1
 
 # States
 IDLE = -1


@@ -157,7 +157,7 @@ miso_packets = [
     {'type': 'D',  'range': (10, 11), 'data': 0xff, 'ann': ''},
 ]
 
     {'type': 'D',  'range': (10, 11), 'data': 0xff, 'ann': ''},
 ]
 

-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):

     id = 'mx25lxx05d'
     name = 'Macronix MX25Lxx05D'
     longname = 'Macronix MX25Lxx05D SPI flash chip decoder'
     id = 'mx25lxx05d'
     name = 'Macronix MX25Lxx05D'
     longname = 'Macronix MX25Lxx05D SPI flash chip decoder'


@@ -179,8 +179,8 @@ class Decoder(sigrokdecode.Decoder):
         self.out = []
 
     def start(self, metadata):
         self.out = []
 
     def start(self, metadata):

-        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'mx25lxx05d')
-        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'mx25lxx05d')
+        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'mx25lxx05d')
+        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'mx25lxx05d')

 
     def report(self):
         pass
 
     def report(self):
         pass

diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index cd2c064b77e1c08a4bc866552b83f2c8a5f9ac04..009459db861d09736f516fa9c00ba057263828fa 100644 (file)
--- a/decoders/nunchuk.py
+++ b/decoders/nunchuk.py
@@ -30,7 +30,7 @@
 # https://www.sparkfun.com/products/9281
 #
 
 # https://www.sparkfun.com/products/9281
 #
 

-import sigrokdecode
+import sigrokdecode as srd

 
 # States
 IDLE = 0
 
 # States
 IDLE = 0


@@ -62,7 +62,7 @@ example_packets = [
     {'type': 'P',  'range': (32, 33), 'data': None, 'ann': ''},
 ]
 
     {'type': 'P',  'range': (32, 33), 'data': None, 'ann': ''},
 ]
 

-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):

     id = 'nunchuk'
     name = 'Nunchuk'
     longname = 'Nintendo Wii Nunchuk decoder'
     id = 'nunchuk'
     name = 'Nunchuk'
     longname = 'Nintendo Wii Nunchuk decoder'


@@ -87,8 +87,8 @@ class Decoder(sigrokdecode.Decoder):
         self.databytecount = 0
 
     def start(self, metadata):
         self.databytecount = 0
 
     def start(self, metadata):

-        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'nunchuk')
-        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'nunchuk')
+        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'nunchuk')
+        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'nunchuk')

 
     def report(self):
         pass
 
     def report(self):
         pass

diff --git a/decoders/pan1321.py b/decoders/pan1321.py
index bebfc689c039ae259d44e67e467fc8abebe9b558..441cba04c972b427e97762315ac2b6441a515aee 100644 (file)
--- a/decoders/pan1321.py
+++ b/decoders/pan1321.py
@@ -22,7 +22,7 @@
 # TODO
 #
 
 # TODO
 #
 

-import sigrokdecode
+import sigrokdecode as srd

 
 # Annotation feed formats
 ANN_ASCII = 0
 
 # Annotation feed formats
 ANN_ASCII = 0


@@ -30,7 +30,7 @@ ANN_ASCII = 0
 # UART 'data' packet type.
 T_DATA = 1
 
 # UART 'data' packet type.
 T_DATA = 1
 

-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):

     id = 'pan1321'
     name = 'Panasonic PAN1321'
     longname = 'TODO.'
     id = 'pan1321'
     name = 'Panasonic PAN1321'
     longname = 'TODO.'


@@ -56,8 +56,8 @@ class Decoder(sigrokdecode.Decoder):
         self.cmd = ''
 
     def start(self, metadata):
         self.cmd = ''
 
     def start(self, metadata):

-        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'pan1321')
-        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'pan1321')
+        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'pan1321')
+        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'pan1321')

 
     def report(self):
         pass
 
     def report(self):
         pass

diff --git a/decoders/spi.py b/decoders/spi.py
index a866767e71eb2de7455bbd2212495c38ef068cea..5529025b1c1c029d6c88b3c01f2a9a4757d994f4 100644 (file)
--- a/decoders/spi.py
+++ b/decoders/spi.py
@@ -18,9 +18,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 

-import sigrokdecode
+import sigrokdecode as srd

 
 

-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):

     id = 'spi'
     name = 'SPI'
     desc = '...desc...'
     id = 'spi'
     name = 'SPI'
     desc = '...desc...'


@@ -46,8 +46,8 @@ class Decoder(sigrokdecode.Decoder):
         self.out_ann = None
 
     def start(self, metadata):
         self.out_ann = None
 
     def start(self, metadata):

-        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'spi')
-        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'spi')
+        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'spi')
+        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'spi')

 
     def report(self):
         return 'SPI: %d bytes received' % self.bytesreceived
 
     def report(self):
         return 'SPI: %d bytes received' % self.bytesreceived

diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py
index c97ef730ea80e9f100cb21ab783740c9600be941..842cf03d0cdc69ce3c9dc1517b0dea50c69e09fb 100644 (file)
--- a/decoders/srd_usb.py
+++ b/decoders/srd_usb.py
@@ -40,7 +40,7 @@
 # http://www.usb.org/developers/docs/
 #
 
 # http://www.usb.org/developers/docs/
 #
 

-import sigrokdecode
+import sigrokdecode as srd

 
 # States
 SE0, J, K, SE1 = 0, 1, 2, 3
 
 # States
 SE0, J, K, SE1 = 0, 1, 2, 3


@@ -99,7 +99,7 @@ def packet_decode(packet):
 
     return pid + ' ' + data
 
 
     return pid + ' ' + data
 

-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):

     id = 'usb'
     name = 'USB'
     desc = 'Universal Serial Bus'
     id = 'usb'
     name = 'USB'
     desc = 'Universal Serial Bus'


@@ -123,8 +123,8 @@ class Decoder(sigrokdecode.Decoder):
 
     def start(self, metadata):
         self.rate = metadata['samplerate']
 
     def start(self, metadata):
         self.rate = metadata['samplerate']

-        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'usb')
-        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'usb')
+        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'usb')
+        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'usb')

         if self.rate < 48000000:
             raise Exception("Sample rate not sufficient for USB decoding")
         # Initialise decoder state.
         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 9d437d1bfa156e06b51a2b8e7daf297e02779bba..eaf87389e16908c3c621b8a2a2c36372e34b83d1 100644 (file)
--- a/decoders/transitioncounter.py
+++ b/decoders/transitioncounter.py
@@ -18,9 +18,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 

-import sigrokdecode
+import sigrokdecode as srd

 
 

-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):

     id = 'transitioncounter'
     name = 'Transition counter'
     longname = '...'
     id = 'transitioncounter'
     name = 'Transition counter'
     longname = '...'


@@ -42,8 +42,8 @@ class Decoder(sigrokdecode.Decoder):
         self.lastsample = None
 
     def start(self, metadata):
         self.lastsample = None
 
     def start(self, metadata):

-        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'transitioncounter')
-        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'transitioncounter')
+        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'transitioncounter')
+        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'transitioncounter')

 
     def report(self):
         pass
 
     def report(self):
         pass

diff --git a/decoders/uart.py b/decoders/uart.py
index c9f787583d7ee934610c13478f5f5451bf4d6b82..c3a90ef046670d6e0ecccd0bc328bfd6491b319b 100644 (file)
--- a/decoders/uart.py
+++ b/decoders/uart.py
@@ -125,7 +125,7 @@
 # [T_PARITY_ERROR, (0, 1)]
 #
 
 # [T_PARITY_ERROR, (0, 1)]
 #
 

-import sigrokdecode
+import sigrokdecode as srd

 
 # States
 WAIT_FOR_START_BIT = 0
 
 # States
 WAIT_FOR_START_BIT = 0


@@ -190,7 +190,7 @@ def parity_ok(parity_type, parity_bit, data, num_data_bits):
     else:
         raise Exception('Invalid parity type: %d' % parity_type)
 
     else:
         raise Exception('Invalid parity type: %d' % parity_type)
 

-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):

     id = 'uart'
     name = 'UART'
     longname = 'Universal Asynchronous Receiver/Transmitter (UART)'
     id = 'uart'
     name = 'UART'
     longname = 'Universal Asynchronous Receiver/Transmitter (UART)'


@@ -258,8 +258,8 @@ class Decoder(sigrokdecode.Decoder):
 
     def start(self, metadata):
         self.samplerate = metadata['samplerate']
 
     def start(self, metadata):
         self.samplerate = metadata['samplerate']

-        self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTO, 'uart')
-        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'uart')
+        self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'uart')
+        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'uart')

 
         # TODO
         ### self.baudrate = metadata['baudrate']
 
         # TODO
         ### self.baudrate = metadata['baudrate']