srd: decoders: Metadata consistency fixes/updates.

[libsigrokdecode.git] / decoders / uart.py

diff --git a/decoders/uart.py b/decoders/uart.py
index 1c204dc053d7b9defccddb43b4883a232e2ad64d..9243bbc3e33741e38ec09e033dd88258aa5bb3a3 100644 (file)
--- a/decoders/uart.py
+++ b/decoders/uart.py
@@ -125,7 +125,7 @@
 # [T_PARITY_ERROR, (0, 1)]
 #
 
-import sigrokdecode
+import sigrokdecode as srd
 
 # 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)
 
-class Decoder(sigrokdecode.Decoder):
+class Decoder(srd.Decoder):
     id = 'uart'
     name = 'UART'
     longname = 'Universal Asynchronous Receiver/Transmitter (UART)'
@@ -217,23 +217,20 @@ class Decoder(sigrokdecode.Decoder):
         # TODO: Options to invert the signal(s).
         # ...
     }
-    annotation = [
+    annotations = [
         # ANN_ASCII
-        ["ASCII", "TODO: description"],
+        ['ASCII', 'TODO: description'],
         # ANN_DEC
-        ["Decimal", "TODO: description"],
+        ['Decimal', 'TODO: description'],
         # ANN_HEX
-        ["Hex", "TODO: description"],
+        ['Hex', 'TODO: description'],
         # ANN_OCT
-        ["Octal", "TODO: description"],
+        ['Octal', 'TODO: description'],
         # ANN_BITS
-        ["Bits", "TODO: description"],
+        ['Bits', 'TODO: description'],
     ]
 
     def __init__(self, **kwargs):
-        self.out_proto = None
-        self.out_ann = None
-
         # Set defaults, can be overridden in 'start'.
         self.baudrate = 115200
         self.num_data_bits = 8
@@ -258,8 +255,8 @@ class Decoder(sigrokdecode.Decoder):
 
     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.OUTPUT_PROTO, 'uart')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'uart')
 
         # TODO
         ### self.baudrate = metadata['baudrate']