Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

csr/CSRStorage: remove storage_full (was only needed by alignment_bits)

This commit is contained in:
Florent Kermarrec 2019-09-16 08:38:26 +02:00
parent 5dc440e80d
commit 74e756aa30
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
litex/soc/interconnect/csr.py
View File

@ -314,9 +314,6 @@ class CSRStorage(_CompoundCSR):
Attributes Attributes
---------- ----------
storage_full : Signal(size), out
???
storage : Signal(size), out storage : Signal(size), out
Signal providing the value of the ``CSRStorage`` object. Signal providing the value of the ``CSRStorage`` object.
@ -339,15 +336,13 @@ class CSRStorage(_CompoundCSR):
size = self.fields.get_size() size = self.fields.get_size()
reset = self.fields.get_reset() reset = self.fields.get_reset()
_CompoundCSR.__init__(self, size, name) _CompoundCSR.__init__(self, size, name)
self.storage_full = Signal(self.size, reset=reset)
self.storage = Signal(self.size, reset=reset) self.storage = Signal(self.size, reset=reset)
self.comb += self.storage.eq(self.storage_full)
self.atomic_write = atomic_write self.atomic_write = atomic_write
self.re = Signal() self.re = Signal()
if write_from_dev: if write_from_dev:
self.we = Signal() self.we = Signal()
self.dat_w = Signal(self.size) self.dat_w = Signal(self.size)
self.sync += If(self.we, self.storage_full.eq(self.dat_w)) self.sync += If(self.we, self.storage.eq(self.dat_w))
for field in [*fields]: for field in [*fields]:
field_assign = getattr(self.fields, field.name).eq(self.storage[field.offset:field.offset + field.size]) field_assign = getattr(self.fields, field.name).eq(self.storage[field.offset:field.offset + field.size])
if field.pulse: if field.pulse:
@ -366,15 +361,15 @@ class CSRStorage(_CompoundCSR):
lo = i*busword lo = i*busword
hi = lo+nbits hi = lo+nbits
# read # read
self.comb += sc.w.eq(self.storage_full[lo:hi]) self.comb += sc.w.eq(self.storage[lo:hi])
# write # write
if nwords > 1 and self.atomic_write: if nwords > 1 and self.atomic_write:
if i: if i:
self.sync += If(sc.re, backstore[lo-busword:hi-busword].eq(sc.r)) self.sync += If(sc.re, backstore[lo-busword:hi-busword].eq(sc.r))
else: else:
self.sync += If(sc.re, self.storage_full.eq(Cat(sc.r, backstore))) self.sync += If(sc.re, self.storage.eq(Cat(sc.r, backstore)))
else: else:
self.sync += If(sc.re, self.storage_full[lo:hi].eq(sc.r)) self.sync += If(sc.re, self.storage[lo:hi].eq(sc.r))
self.sync += self.re.eq(sc.re) self.sync += self.re.eq(sc.re)
def read(self): def read(self):