X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fssi32%2Fpd.py;h=51608039ea205bd685800dfb29583d2849dd6f40;hp=7b11fd95e8d82d4f779ffedc96d766d3e273f4b5;hb=6cbba91f23b9f9ace75b4722c9c0776b9211008d;hpb=268d62bf304d73d8e99cf2112c0974c813b966f6

diff --git a/decoders/ssi32/pd.py b/decoders/ssi32/pd.py
index 7b11fd9..5160803 100644
--- a/decoders/ssi32/pd.py
+++ b/decoders/ssi32/pd.py
@@ -11,19 +11,27 @@
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
 ##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
+##
 
 import sigrokdecode as srd
-from .lists import *
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'ssi32'
     name = 'SSI32'
-    longname = 'Bosch SSI32 Protocol'
-    desc = 'Bosch SSI32 Protocol'
+    longname = 'Synchronous Serial Interface (32bit)'
+    desc = 'Synchronous Serial Interface (32bit) protocol.'
     license = 'gplv2+'
     inputs = ['spi']
-    outputs = ['ssi32']
+    outputs = []
+    tags = ['Embedded/industrial']
     options = (
         {'id': 'msgsize', 'desc': 'Message size', 'default': 64},
     )
@@ -31,14 +39,17 @@ class Decoder(srd.Decoder):
         ('ctrl-tx', 'CTRL TX'),
         ('ack-tx', 'ACK TX'),
         ('ctrl-rx', 'CTRL RX'),
-        ('ack-rx', 'ACK Tx'),
+        ('ack-rx', 'ACK RX'),
     )
     annotation_rows = (
-        ('tx', 'TX', (0, 1,)),
-        ('rx', 'RX', (2, 3,)),
+        ('tx', 'TX', (0, 1)),
+        ('rx', 'RX', (2, 3)),
     )
 
     def __init__(self):
+        self.reset()
+
+    def reset(self):
         self.ss_cmd, self.es_cmd = 0, 0
         self.mosi_bytes = []
         self.miso_bytes = []
@@ -52,15 +63,13 @@ class Decoder(srd.Decoder):
     def putx(self, data):
         self.put(self.ss_cmd, self.es_cmd, self.out_ann, data)
 
-    def reset(self):
+    def reset_data(self):
         self.mosi_bytes = []
         self.miso_bytes = []
         self.es_array = []
 
     def handle_ack(self):
-        # Only first byte should have ACK data, other 3 bytes
-        # are reserved.
-
+        # Only first byte should have ACK data, other 3 bytes are reserved.
         self.es_cmd = self.es_array[0]
         self.putx([1, ['> ACK:0x%02x' % (self.mosi_bytes[0])]])
         self.putx([3, ['< ACK:0x%02x' % (self.miso_bytes[0])]])
@@ -76,21 +85,19 @@ class Decoder(srd.Decoder):
             miso = ', DATA:0x' + ''.join(format(x, '02x') for x in self.miso_bytes[4:self.rx_size + 4])
 
         self.es_cmd = self.es_array[self.tx_size + 3]
-        self.putx([0,
-                  ['> CTRL:0x%02x, LUN:0x%02x, SIZE:0x%02x, CRC:0x%02x%s'
+        self.putx([0, ['> CTRL:0x%02x, LUN:0x%02x, SIZE:0x%02x, CRC:0x%02x%s'
                    % (self.mosi_bytes[0], self.mosi_bytes[1],
                       self.mosi_bytes[2], self.mosi_bytes[3], mosi)]])
 
         self.es_cmd = self.es_array[self.rx_size + 3]
-        self.putx([2,
-                  ['< CTRL:0x%02x, LUN:0x%02x, SIZE:0x%02x, CRC:0x%02x%s'
+        self.putx([2, ['< CTRL:0x%02x, LUN:0x%02x, SIZE:0x%02x, CRC:0x%02x%s'
                    % (self.miso_bytes[0], self.miso_bytes[1],
                       self.miso_bytes[2], self.miso_bytes[3], miso)]])
 
     def decode(self, ss, es, data):
         ptype = data[0]
         if ptype == 'CS-CHANGE':
-            self.reset()
+            self.reset_data()
             return
 
         # Don't care about anything else.
@@ -111,10 +118,10 @@ class Decoder(srd.Decoder):
                 return
 
             self.handle_ack()
-            self.reset()
+            self.reset_data()
         else:
             if len(self.mosi_bytes) < self.options['msgsize']:
                 return
 
             self.handle_ctrl()
-            self.reset()
+            self.reset_data()