Consistency renames of {ss,es}_ variables.

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

diff --git a/decoders/spiflash/pd.py b/decoders/spiflash/pd.py
index 1e3b916d7fb0c9f4d487fe6d77fcff3f7832f30e..17ebae305216f6ffe89c8f23ce8e7aece0f2c70b 100644 (file)
--- a/decoders/spiflash/pd.py
+++ b/decoders/spiflash/pd.py
@@ -88,7 +88,7 @@ class Decoder(srd.Decoder):
         self.put(self.ss, self.es, self.out_ann, data)
 
     def putb(self, data):
-        self.put(self.block_ss, self.block_es, self.out_ann, data)
+        self.put(self.ss_block, self.es_block, self.out_ann, data)
 
     def handle_wren(self, mosi, miso):
         self.putx([0, ['Command: %s' % cmds[self.state][1]]])
@@ -188,22 +188,22 @@ class Decoder(srd.Decoder):
             # Bytes 2/3/4: Master sends read address (24bits, MSB-first).
             self.putx([24, ['AD%d: 0x%02x' % (self.cmdstate - 1, mosi)]])
             if self.cmdstate == 2:
-                self.block_ss = self.ss
+                self.ss_block = self.ss
             self.addr |= (mosi << ((4 - self.cmdstate) * 8))
         elif self.cmdstate == 5:
             self.putx([24, ['Dummy byte: 0x%02x' % mosi]])
-            self.block_es = self.es
+            self.es_block = self.es
             self.putb([5, ['Read address: 0x%06x' % self.addr]])
             self.addr = 0
         elif self.cmdstate >= 6:
             # Bytes 6-x: Master reads data bytes (until CS# de-asserted).
             # TODO: For now we hardcode 32 bytes per FAST READ command.
             if self.cmdstate == 6:
-                self.block_ss = self.ss
+                self.ss_block = self.ss
             if self.cmdstate <= 32 + 5: # TODO: While CS# asserted.
                 self.data.append(miso)
             if self.cmdstate == 32 + 5: # TODO: If CS# got de-asserted.
-                self.block_es = self.es
+                self.es_block = self.es
                 s = ' '.join([hex(b)[2:] for b in self.data])
                 self.putb([25, ['Read data: %s' % s]])
                 self.data = []