cjtag: Use an exact copy of the jtag PD as basis for cjtag.

[libsigrokdecode.git] / decoders / cc1101 / pd.py

diff --git a/decoders/cc1101/pd.py b/decoders/cc1101/pd.py
index fd13540a852d420a450831899d442491cf2fc490..8b851369b3de14baa15dfe51745cbcca78ebb698 100644 (file)
--- a/decoders/cc1101/pd.py
+++ b/decoders/cc1101/pd.py
@@ -18,11 +18,15 @@
 ##
 
 import sigrokdecode as srd
+from collections import namedtuple
 from .lists import *
 
 ANN_STROBE, ANN_SINGLE_READ, ANN_SINGLE_WRITE, ANN_BURST_READ, \
     ANN_BURST_WRITE, ANN_STATUS_READ, ANN_STATUS, ANN_WARN = range(8)
 
+Pos = namedtuple('Pos', ['ss', 'es'])
+Data = namedtuple('Data', ['mosi', 'miso'])
+
 class Decoder(srd.Decoder):
     api_version = 3
     id = 'cc1101'
@@ -39,11 +43,12 @@ class Decoder(srd.Decoder):
         ('single_write', 'Single register write'),
         ('burst_read', 'Burst register read'),
         ('burst_write', 'Burst register write'),
-        ('status', 'Status register'),
+        ('status_read', 'Status read'),
+        ('status_reg', 'Status register'),
         ('warning', 'Warning'),
     )
     annotation_rows = (
-        ('cmd', 'Commands', (ANN_STROBE,)),
+        ('cmds', 'Commands', (ANN_STROBE,)),
         ('data', 'Data', (ANN_SINGLE_READ, ANN_SINGLE_WRITE, ANN_BURST_READ,
                             ANN_BURST_WRITE, ANN_STATUS_READ)),
         ('status', 'Status register', (ANN_STATUS,)),
@@ -63,15 +68,15 @@ class Decoder(srd.Decoder):
 
     def warn(self, pos, msg):
         '''Put a warning message 'msg' at 'pos'.'''
-        self.put(pos[0], pos[1], self.out_ann, [ANN_WARN, [msg]])
+        self.put(pos.ss, pos.es, self.out_ann, [ANN_WARN, [msg]])
 
     def putp(self, pos, ann, msg):
         '''Put an annotation message 'msg' at 'pos'.'''
-        self.put(pos[0], pos[1], self.out_ann, [ann, [msg]])
+        self.put(pos.ss, pos.es, self.out_ann, [ann, [msg]])
 
     def putp2(self, pos, ann, msg1, msg2):
         '''Put an annotation message 'msg' at 'pos'.'''
-        self.put(pos[0], pos[1], self.out_ann, [ann, [msg1, msg2]])
+        self.put(pos.ss, pos.es, self.out_ann, [ann, [msg1, msg2]])
 
     def next(self):
         '''Resets the decoder after a complete command was decoded.'''
@@ -92,11 +97,11 @@ class Decoder(srd.Decoder):
 
     def mosi_bytes(self):
         '''Returns the collected MOSI bytes of a multi byte command.'''
-        return [b[0] for b in self.mb]
+        return [b.mosi for b in self.mb]
 
     def miso_bytes(self):
         '''Returns the collected MISO bytes of a multi byte command.'''
-        return [b[1] for b in self.mb]
+        return [b.miso for b in self.mb]
 
     def decode_command(self, pos, b):
         '''Decodes the command byte 'b' at position 'pos' and prepares
@@ -113,7 +118,7 @@ class Decoder(srd.Decoder):
         else:
             # Don't output anything now, the command is merged with
             # the data bytes following it.
-            self.ss_mb = pos[0]
+            self.ss_mb = pos.ss
 
     def format_command(self):
         '''Returns the label for the current command.'''
@@ -259,14 +264,14 @@ class Decoder(srd.Decoder):
                     if len(self.mb) < self.min:
                         self.warn((ss, ss), 'missing data bytes')
                     elif self.mb:
-                        self.finish_command((self.ss_mb, self.es_mb))
+                        self.finish_command(Pos(self.ss_mb, self.es_mb))
 
                 self.next()
                 self.cs_was_released = True
 
         elif ptype == 'DATA' and self.cs_was_released:
             mosi, miso = data1, data2
-            pos = (ss, es)
+            pos = Pos(ss, es)
 
             if miso is None or mosi is None:
                 self.requirements_met = False
@@ -286,4 +291,4 @@ class Decoder(srd.Decoder):
                     if self.ss_mb == -1:
                         self.ss_mb = ss
                     self.es_mb = es
-                    self.mb.append((mosi, miso))
+                    self.mb.append(Data(mosi, miso))