Improve MPSSE tracer

Support several read requests from same buffer
eblot · Mar 22, 2018 · b9f69e4 · b9f69e4
1 parent 3e132c9
commit b9f69e4
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/pyftdi/tracer.py b/pyftdi/tracer.py
@@ -43,7 +43,7 @@ def __init__(self):
         self._clkdiv5 = False
         self._cmd_decoded = True
         self._resp_decoded = True
-        self._last_code = None
+        self._last_codes = deque()
         self._expect_resp = deque()
 
     def send(self, buffer):
@@ -53,7 +53,7 @@ def send(self, buffer):
                 code = self._trace_tx[0]
                 cmd = self.COMMANDS[code]
                 if cmd not in self.NO_RX:
-                    self._last_code = code
+                    self._last_codes.append(code)
                 if self._cmd_decoded:
                     self.log.debug("Command: %02X: %s", code, cmd)
                 cmd_decoder = getattr(self, '_cmd_%s' % cmd.lower())
@@ -70,25 +70,29 @@ def send(self, buffer):
             # on error, flush all buffers
             self._trace_tx = array('B')
             self._trace_rx = array('B')
+            self._last_codes.clear()
 
     def receive(self, buffer):
         self._trace_rx.extend(buffer)
         while self._trace_rx:
+            code = None
             try:
-                cmd = self.COMMANDS[self._last_code]
+                code = self._last_codes.popleft()
+                cmd = self.COMMANDS[code]
                 resp_decoder = getattr(self, '_resp_%s' % cmd.lower())
                 self._resp_decoded = resp_decoder()
                 if self._resp_decoded:
                     continue
             except IndexError:
                 self.log.warning('Empty buffer')
             except KeyError:
-                self.log.warning('Unknown command code: %02X', self._last_code)
+                self.log.warning('Unknown command code: %02X', code)
             except AttributeError:
                 self.log.warning('Decoder for response %s is not implemented',
                                  cmd)
             # on error, flush RX buffer
             self._trace_rx = array('B')
+            self._last_codes.clear()
 
     def _cmd_enable_clk_div5(self):
         self.log.info('Enable clock divisor /5')
@@ -138,7 +142,7 @@ def _cmd_disable_clk_3phase(self):
         return True
 
     def _cmd_send_immediate(self):
-        self.log.info('Send immediate')
+        self.log.debug('Send immediate')
         self._trace_tx[:] = self._trace_tx[1:]
         return True