X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fatsha204a%2Fpd.py;h=3b7ee53cf8c074a589b0e7f640c915aff2589aa2;hb=d62ee705a0807493781bf1e314c73399bb8d72c5;hp=c2289facab88eecb1536f3859533830cce741bcc;hpb=f96a96022ca3ce7b98320db95608323d289c6dc1;p=libsigrokdecode.git

diff --git a/decoders/atsha204a/pd.py b/decoders/atsha204a/pd.py
index c2289fa..3b7ee53 100644
--- a/decoders/atsha204a/pd.py
+++ b/decoders/atsha204a/pd.py
@@ -116,40 +116,42 @@ class Decoder(srd.Decoder):
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def output_tx_bytes(self):
-        if len(self.bytes) < 1: # Ignore wakeup.
+        b = self.bytes
+        if len(b) < 1: # Ignore wakeup.
             return
-        self.waddr = self.bytes[0][2]
-        self.display_waddr(self.bytes[0])
+        self.waddr = b[0][2]
+        self.display_waddr(b[0])
         if self.waddr == WORD_ADDR_COMMAND:
-            count = self.bytes[1][2]
-            self.display_count(self.bytes[1])
-            if len(self.bytes) - 1 != count:
-                self.display_warning(self.bytes[0][0], self.bytes[-1][1],
+            count = b[1][2]
+            self.display_count(b[1])
+            if len(b) - 1 != count:
+                self.display_warning(b[0][0], b[-1][1],
                     'Invalid frame length: Got {}, expecting {} '.format(
-                      len(self.bytes) - 1, count))
+                      len(b) - 1, count))
                 return
-            self.opcode = self.bytes[2][2]
-            self.display_opcode(self.bytes[2])
-            self.display_param1(self.bytes[3])
-            self.display_param2([self.bytes[4], self.bytes[5]])
-            self.display_data(self.bytes[6:-2])
-            self.display_crc([self.bytes[-2], self.bytes[-1]])
+            self.opcode = b[2][2]
+            self.display_opcode(b[2])
+            self.display_param1(b[3])
+            self.display_param2([b[4], b[5]])
+            self.display_data(b[6:-2])
+            self.display_crc([b[-2], b[-1]])
 
     def output_rx_bytes(self):
-        count = self.bytes[0][2]
-        self.display_count(self.bytes[0])
+        b = self.bytes
+        count = b[0][2]
+        self.display_count(b[0])
         if self.waddr == WORD_ADDR_RESET:
-            self.display_data([self.bytes[1]])
-            self.display_crc([self.bytes[2], self.bytes[3]])
-            self.display_status(self.bytes[0][0], self.bytes[-1][1], self.bytes[1][2])
+            self.display_data([b[1]])
+            self.display_crc([b[2], b[3]])
+            self.display_status(b[0][0], b[-1][1], b[1][2])
         elif self.waddr == WORD_ADDR_COMMAND:
             if count == 4: # Status / Error.
-                self.display_data([self.bytes[1]])
-                self.display_crc([self.bytes[2], self.bytes[3]])
-                self.display_status(self.bytes[0][0], self.bytes[-1][1], self.bytes[1][2])
+                self.display_data([b[1]])
+                self.display_crc([b[2], b[3]])
+                self.display_status(b[0][0], b[-1][1], b[1][2])
             else:
-                self.display_data(self.bytes[1:-2])
-                self.display_crc([self.bytes[-2], self.bytes[-1]])
+                self.display_data(b[1:-2])
+                self.display_crc([b[-2], b[-1]])
 
     def display_waddr(self, data):
         self.put(data[0], data[1], self.out_ann, [0, ['Word addr: %s' % WORD_ADDR[data[2]]]])
@@ -161,10 +163,8 @@ class Decoder(srd.Decoder):
         self.put(data[0], data[1], self.out_ann, [2, ['Opcode: %s' % OPCODES[data[2]]]])
 
     def display_param1(self, data):
-        if (self.opcode == OPCODE_CHECK_MAC) or (self.opcode == OPCODE_DEV_REV) or \
-           (self.opcode == OPCODE_HMAC) or (self.opcode == OPCODE_MAC) or \
-           (self.opcode == OPCODE_NONCE) or (self.opcode == OPCODE_RANDOM) or \
-           (self.opcode == OPCODE_SHA):
+        if self.opcode in (OPCODE_CHECK_MAC, OPCODE_DEV_REV, OPCODE_HMAC, \
+                OPCODE_MAC, OPCODE_NONCE, OPCODE_RANDOM, OPCODE_SHA):
             self.put(data[0], data[1], self.out_ann, [3, ['Mode: %02X' % data[2]]])
         elif self.opcode == OPCODE_DERIVE_KEY:
             self.put(data[0], data[1], self.out_ann, [3, ['Random: %s' % data[2]]])
@@ -188,14 +188,13 @@ class Decoder(srd.Decoder):
     def display_param2(self, data):
         if self.opcode == OPCODE_DERIVE_KEY:
             self.put(data[0][0], data[1][1], self.out_ann, [4, ['TargetKey: {:02x} {:02x}'.format(data[1][2], data[0][2])]])
-        elif (self.opcode == OPCODE_NONCE) or (self.opcode == OPCODE_PAUSE) or (self.opcode == OPCODE_RANDOM):
+        elif self.opcode in (OPCODE_NONCE, OPCODE_PAUSE, OPCODE_RANDOM):
             self.put(data[0][0], data[1][1], self.out_ann, [4, ['Zero: {:02x} {:02x}'.format(data[1][2], data[0][2])]])
-        elif (self.opcode == OPCODE_HMAC) or (self.opcode == OPCODE_MAC) or \
-             (self.opcode == OPCODE_CHECK_MAC) or (self.opcode == OPCODE_GEN_DIG):
+        elif self.opcode in (OPCODE_HMAC, OPCODE_MAC, OPCODE_CHECK_MAC, OPCODE_GEN_DIG):
             self.put(data[0][0], data[1][1], self.out_ann, [4, ['SlotID: {:02x} {:02x}'.format(data[1][2], data[0][2])]])
         elif self.opcode == OPCODE_LOCK:
             self.put(data[0][0], data[1][1], self.out_ann, [4, ['Summary: {:02x} {:02x}'.format(data[1][2], data[0][2])]])
-        elif (self.opcode == OPCODE_READ) or (self.opcode == OPCODE_WRITE):
+        elif self.opcode in (OPCODE_READ, OPCODE_WRITE):
             self.put(data[0][0], data[1][1], self.out_ann, [4, ['Address: {:02x} {:02x}'.format(data[1][2], data[0][2])]])
         elif self.opcode == OPCODE_UPDATE_EXTRA:
             self.put(data[0][0], data[1][1], self.out_ann, [4, ['NewValue: {:02x}'.format(data[0][2])]])