From c677ab245c2a2643b07b7aae03bab1e8510761a9 Mon Sep 17 00:00:00 2001
From: Alex Forencich <alex@alexforencich.com>
Date: Mon, 22 Mar 2021 22:02:06 -0700
Subject: [PATCH] Reset more internal state

---
 cocotbext/axi/axi_master.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cocotbext/axi/axi_master.py b/cocotbext/axi/axi_master.py
index a6470d1..a0b4ac9 100644
--- a/cocotbext/axi/axi_master.py
+++ b/cocotbext/axi/axi_master.py
@@ -234,6 +234,13 @@ class AxiMasterWrite(Reset):
                 if cmd.event:
                     cmd.event.set(None)
 
+            for q in self.int_write_resp_queue_list:
+                while not q.empty():
+                    q.get_nowait()
+
+            self.cur_id = 0
+            self.active_id = Counter()
+
             self.in_flight_operations = 0
             self._idle.set()
         else:
@@ -578,6 +585,13 @@ class AxiMasterRead(Reset):
                 if cmd.event:
                     cmd.event.set(None)
 
+            for q in self.int_read_resp_queue_list:
+                while not q.empty():
+                    q.get_nowait()
+
+            self.cur_id = 0
+            self.active_id = Counter()
+
             self.in_flight_operations = 0
             self._idle.set()
         else: