Add reset_active_level parameters

This commit is contained in:
Alex Forencich
2021-03-06 17:30:05 -08:00
parent a7fe5d9674
commit 35ed1472d6
7 changed files with 67 additions and 58 deletions

View File

@@ -34,7 +34,7 @@ from .reset import Reset
class AxiRamWrite(Memory, Reset):
def __init__(self, bus, clock, reset=None, size=1024, mem=None, *args, **kwargs):
def __init__(self, bus, clock, reset=None, reset_active_level=True, size=1024, mem=None, *args, **kwargs):
self.log = logging.getLogger(f"cocotb.{bus.aw._entity._name}.{bus.aw._name}")
self.log.info("AXI RAM model (write)")
@@ -44,9 +44,9 @@ class AxiRamWrite(Memory, Reset):
super().__init__(size, mem, *args, **kwargs)
self.aw_channel = AxiAWSink(bus.aw, clock, reset)
self.w_channel = AxiWSink(bus.w, clock, reset)
self.b_channel = AxiBSource(bus.b, clock, reset)
self.aw_channel = AxiAWSink(bus.aw, clock, reset, reset_active_level)
self.w_channel = AxiWSink(bus.w, clock, reset, reset_active_level)
self.b_channel = AxiBSource(bus.b, clock, reset, reset_active_level)
self.width = len(self.w_channel.bus.wdata)
self.byte_size = 8
@@ -67,7 +67,7 @@ class AxiRamWrite(Memory, Reset):
self._process_write_cr = None
self._init_reset(reset)
self._init_reset(reset, reset_active_level)
def _handle_reset(self, state):
if state:
@@ -157,7 +157,7 @@ class AxiRamWrite(Memory, Reset):
class AxiRamRead(Memory, Reset):
def __init__(self, bus, clock, reset=None, size=1024, mem=None, *args, **kwargs):
def __init__(self, bus, clock, reset=None, reset_active_level=True, size=1024, mem=None, *args, **kwargs):
self.log = logging.getLogger(f"cocotb.{bus.ar._entity._name}.{bus.ar._name}")
self.log.info("AXI RAM model (read)")
@@ -167,8 +167,8 @@ class AxiRamRead(Memory, Reset):
super().__init__(size, mem, *args, **kwargs)
self.ar_channel = AxiARSink(bus.ar, clock, reset)
self.r_channel = AxiRSource(bus.r, clock, reset)
self.ar_channel = AxiARSink(bus.ar, clock, reset, reset_active_level)
self.r_channel = AxiRSource(bus.r, clock, reset, reset_active_level)
self.width = len(self.r_channel.bus.rdata)
self.byte_size = 8
@@ -187,7 +187,7 @@ class AxiRamRead(Memory, Reset):
self._process_read_cr = None
self._init_reset(reset)
self._init_reset(reset, reset_active_level)
def _handle_reset(self, state):
if state:
@@ -262,11 +262,11 @@ class AxiRamRead(Memory, Reset):
class AxiRam(Memory):
def __init__(self, bus, clock, reset=None, size=1024, mem=None, *args, **kwargs):
def __init__(self, bus, clock, reset=None, reset_active_level=True, size=1024, mem=None, *args, **kwargs):
self.write_if = None
self.read_if = None
super().__init__(size, mem, *args, **kwargs)
self.write_if = AxiRamWrite(bus.write, clock, reset, mem=self.mem)
self.read_if = AxiRamRead(bus.read, clock, reset, mem=self.mem)
self.write_if = AxiRamWrite(bus.write, clock, reset, reset_active_level, mem=self.mem)
self.read_if = AxiRamRead(bus.read, clock, reset, reset_active_level, mem=self.mem)