]> sigrok.org Git - libsigrokdecode.git/commitdiff
usb_{signalling,packet}: Minor cosmetics.
authorUwe Hermann <redacted>
Tue, 6 Oct 2015 06:28:03 +0000 (08:28 +0200)
committerUwe Hermann <redacted>
Tue, 6 Oct 2015 15:42:32 +0000 (17:42 +0200)
decoders/usb_packet/pd.py
decoders/usb_signalling/pd.py

index 8a8503eab535e0876fd8da5985ca16e67f433517..89549fa1bc6cff7d030195c8808574cbc2add3ad 100644 (file)
@@ -145,7 +145,7 @@ def bitstr_to_num(bitstr):
 def reverse_number(num, count):
     out = list(count * '0')
     for i in range(0, count):
-        if (num >> i & 1):
+        if num >> i & 1:
             out[i] = '1';
     return int(''.join(out), 2)
 
@@ -154,7 +154,7 @@ def calc_crc5(bitstr):
     crc5 = 0x1f
     for bit in bitstr:
         crc5 <<= 1
-        if (int(bit) != (crc5 >> 5)):
+        if int(bit) != (crc5 >> 5):
             crc5 ^= poly5
         crc5 &= 0x1f
     crc5 ^= 0x1f
@@ -165,7 +165,7 @@ def calc_crc16(bitstr):
     crc16 = 0xffff
     for bit in bitstr:
         crc16 <<= 1
-        if (int(bit) != (crc16 >> 16)):
+        if int(bit) != (crc16 >> 16):
             crc16 ^= poly16
         crc16 &= 0xffff
     crc16 ^= 0xffff
@@ -314,7 +314,7 @@ class Decoder(srd.Decoder):
             crc5 = bitstr_to_num(packet[27:31 + 1])
             crc5_calc = calc_crc5(packet[16:27])
             self.ss, self.es = self.bits[27][1], self.bits[31][2]
-            if (crc5 == crc5_calc):
+            if crc5 == crc5_calc:
                 self.putpb(['CRC5', crc5])
                 self.putb([6, ['CRC5: 0x%02X' % crc5, 'CRC5', 'C']])
             else:
@@ -346,7 +346,7 @@ class Decoder(srd.Decoder):
             crc16 = bitstr_to_num(packet[-16:])
             crc16_calc = calc_crc16(packet[16:-16])
             self.ss, self.es = self.bits[-16][1], self.bits[-1][2]
-            if (crc16 == crc16_calc):
+            if crc16 == crc16_calc:
                 self.putpb(['CRC16', crc16])
                 self.putb([9, ['CRC16: 0x%04X' % crc16, 'CRC16', 'C']])
             else:
index 6b4c02849a3d62fc639c8d64b967eb56b9e776e2..768a3b72b9a24e9df5190608550f49d121ad1ef8 100644 (file)
@@ -217,11 +217,10 @@ class Decoder(srd.Decoder):
         self.syms.append(sym)
         self.putpb(['SYM', sym])
         b = '0' if self.oldsym != sym else '1'
-        if (self.oldsym != sym):
-            # edge
+        if self.oldsym != sym:
             edgesym = symbols[self.options['signalling']][tuple(self.edgepins)]
-            if (edgesym not in ('SE0', 'SE1')):
-                if (edgesym == sym):
+            if edgesym not in ('SE0', 'SE1'):
+                if edgesym == sym:
                     self.bitwidth = self.bitwidth - (0.001 * self.bitwidth)
                     self.samplepos = self.samplepos - (0.01 * self.bitwidth)
                 else: