Remove trailing semicolons

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

diff --git a/decoders/jtag_ejtag/pd.py b/decoders/jtag_ejtag/pd.py
index 9dc443826c67dabe2db8d963fe098aad19710bc3..ceaa1142dd6f02bda715b30823bbe800a5b5564e 100644 (file)
--- a/decoders/jtag_ejtag/pd.py
+++ b/decoders/jtag_ejtag/pd.py
@@ -223,7 +223,7 @@ class Decoder(srd.Decoder):
         self.put(self.ss, self.es, self.out_ann, data)
 
     def put_at(self, ss: int, es: int, data):
-        self.put(ss, es, self.out_ann, data);
+        self.put(ss, es, self.out_ann, data)
 
     def start(self):
         self.out_ann = self.register(srd.OUTPUT_ANN)
@@ -243,24 +243,23 @@ class Decoder(srd.Decoder):
         ss, es = self.pracc_state.ss, self.pracc_state.es
         pracc_write = (control_out & ControlReg.PRNW) != 0
 
-        display_string = 'PrAcc: '
-        display_string += 'Store' if pracc_write else 'Load/Fetch'
+        s = 'PrAcc: '
+        s += 'Store' if pracc_write else 'Load/Fetch'
 
         if pracc_write:
-            if self.pracc_state.address_out != None:
-                display_string += ', A:' + ' 0x{:08X}'.format(self.pracc_state.address_out)
-            if self.pracc_state.data_out != None:
-                display_string += ', D:' + ' 0x{:08X}'.format(self.pracc_state.data_out)
+            if self.pracc_state.address_out is not None:
+                s += ', A:' + ' 0x{:08X}'.format(self.pracc_state.address_out)
+            if self.pracc_state.data_out is not None:
+                s += ', D:' + ' 0x{:08X}'.format(self.pracc_state.data_out)
         else:
-            if self.pracc_state.address_out != None:
-                display_string += ', A:' + ' 0x{:08X}'.format(self.pracc_state.address_out)
-            if self.pracc_state.data_in != None:
-                display_string += ', D:' + ' 0x{:08X}'.format(self.pracc_state.data_in)
+            if self.pracc_state.address_out is not None:
+                s += ', A:' + ' 0x{:08X}'.format(self.pracc_state.address_out)
+            if self.pracc_state.data_in is not None:
+                s += ', D:' + ' 0x{:08X}'.format(self.pracc_state.data_in)
 
         self.pracc_state.reset()
 
-        display_data = [Ann.PRACC, [display_string]]
-        self.put_at(ss, es, display_data)
+        self.put_at(ss, es, [Ann.PRACC, [s]])
 
     def parse_control_reg(self, ann):
         reg_write = ann == Ann.CONTROL_FIELD_IN
@@ -292,9 +291,8 @@ class Decoder(srd.Decoder):
 
             short_desc = comment + ': ' + value_str
             long_desc = value_descriptions[value_index] if len(value_descriptions) > value_index else '?'
-            display_data = [ann, [short_desc, long_desc]]
 
-            self.put_at(ss, es, display_data)
+            self.put_at(ss, es, [ann, [long_desc, short_desc]])
 
     def check_last_data(self):
         if not hasattr(self, 'last_data'):
@@ -366,7 +364,7 @@ class Decoder(srd.Decoder):
             s_short = insn[0]
             s_long = insn[0] + ': ' + insn[1] + ' (' + hex + ')'
             # Display it and select data register.
-            self.put_current([Ann.INSTRUCTION, [s_short, s_long]])
+            self.put_current([Ann.INSTRUCTION, [s_long, s_short]])
         else:
             self.put_current([Ann.INSTRUCTION, [hex, 'IR TDI ({})'.format(hex)]])
         self.select_reg(code)