fhdl/structure: remove deprecated MemoryPort

This commit is contained in:
Sebastien Bourdeauducq 2012-11-26 19:36:43 +01:00
parent 5183774ec8
commit 1460f069f6
1 changed files with 4 additions and 6 deletions

View File

@ -308,8 +308,7 @@ class Instance(HUID):
(READ_FIRST, WRITE_FIRST, NO_CHANGE) = range(3) (READ_FIRST, WRITE_FIRST, NO_CHANGE) = range(3)
# NOTE: Direct use of MemoryPort is deprecated. Use Memory.get_port() instead. class _MemoryPort:
class MemoryPort:
def __init__(self, adr, dat_r, we=None, dat_w=None, def __init__(self, adr, dat_r, we=None, dat_w=None,
async_read=False, re=None, we_granularity=0, mode=WRITE_FIRST, async_read=False, re=None, we_granularity=0, mode=WRITE_FIRST,
clock_domain="sys"): clock_domain="sys"):
@ -323,13 +322,12 @@ class MemoryPort:
self.mode = mode self.mode = mode
self.clock_domain = clock_domain self.clock_domain = clock_domain
# NOTE: ports parameter will be removed
class Memory(HUID): class Memory(HUID):
def __init__(self, width, depth, *ports, init=None): def __init__(self, width, depth, init=None):
super().__init__() super().__init__()
self.width = width self.width = width
self.depth = depth self.depth = depth
self.ports = list(ports) self.ports = []
self.init = init self.init = init
def get_port(self, write_capable=False, async_read=False, def get_port(self, write_capable=False, async_read=False,
@ -352,7 +350,7 @@ class Memory(HUID):
re = Signal() re = Signal()
else: else:
re = None re = None
mp = MemoryPort(adr, dat_r, we, dat_w, mp = _MemoryPort(adr, dat_r, we, dat_w,
async_read, re, we_granularity, mode, async_read, re, we_granularity, mode,
clock_domain) clock_domain)
self.ports.append(mp) self.ports.append(mp)