Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/migen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e5ddd1263cfa
Choose a base ref
...
head repository: m-labs/migen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce0ff1e3412f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 2, 2015

  1. Copy the full SHA
    d67f24d View commit details
  2. Copy the full SHA
    ce0ff1e View commit details
Showing with 26 additions and 28 deletions.
  1. +16 −16 migen/actorlib/spi.py
  2. +0 −2 migen/bank/description.py
  3. +10 −10 migen/flow/isd.py
32 changes: 16 additions & 16 deletions migen/actorlib/spi.py
Original file line number Diff line number Diff line change
@@ -33,11 +33,11 @@ def __init__(self, layout, mode):
self.trigger = Signal()
trigger = self.trigger
elif mode == MODE_SINGLE_SHOT:
self._r_shoot = CSR()
trigger = self._r_shoot.re
self._shoot = CSR()
trigger = self._shoot.re
elif mode == MODE_CONTINUOUS:
self._r_enable = CSRStorage()
trigger = self._r_enable.storage
self._enable = CSRStorage()
trigger = self._enable.storage
else:
raise ValueError
self.sync += If(self.source.ack | ~self.source.stb, self.source.stb.eq(trigger))
@@ -74,10 +74,10 @@ def __init__(self, layout, depth=1024):
self.busy = Signal()
dw = sum(len(s) for s in self.sink.payload.flatten())

self._r_wa = CSRStorage(bits_for(depth-1), write_from_dev=True)
self._r_wc = CSRStorage(bits_for(depth), write_from_dev=True, atomic_write=True)
self._r_ra = CSRStorage(bits_for(depth-1))
self._r_rd = CSRStatus(dw)
self._wa = CSRStorage(bits_for(depth-1), write_from_dev=True)
self._wc = CSRStorage(bits_for(depth), write_from_dev=True, atomic_write=True)
self._ra = CSRStorage(bits_for(depth-1))
self._rd = CSRStatus(dw)

###

@@ -90,22 +90,22 @@ def __init__(self, layout, depth=1024):
self.comb += [
self.busy.eq(0),

If(self._r_wc.r != 0,
If(self._wc.r != 0,
self.sink.ack.eq(1),
If(self.sink.stb,
self._r_wa.we.eq(1),
self._r_wc.we.eq(1),
self._wa.we.eq(1),
self._wc.we.eq(1),
wp.we.eq(1)
)
),
self._r_wa.dat_w.eq(self._r_wa.storage + 1),
self._r_wc.dat_w.eq(self._r_wc.storage - 1),
self._wa.dat_w.eq(self._wa.storage + 1),
self._wc.dat_w.eq(self._wc.storage - 1),

wp.adr.eq(self._r_wa.storage),
wp.adr.eq(self._wa.storage),
wp.dat_w.eq(self.sink.payload.raw_bits()),

rp.adr.eq(self._r_ra.storage),
self._r_rd.status.eq(rp.dat_r)
rp.adr.eq(self._ra.storage),
self._rd.status.eq(rp.dat_r)
]

class _DMAController(Module):
2 changes: 0 additions & 2 deletions migen/bank/description.py
Original file line number Diff line number Diff line change
@@ -8,8 +8,6 @@ def __init__(self, size, name):
self.name = get_obj_var_name(name)
if self.name is None:
raise ValueError("Cannot extract CSR name from code, need to specify.")
if len(self.name) > 2 and self.name[:2] == "r_":
self.name = self.name[2:]
self.size = size

class CSR(_CSRBase):
20 changes: 10 additions & 10 deletions migen/flow/isd.py
Original file line number Diff line number Diff line change
@@ -45,11 +45,11 @@ def __init__(self, endpoint, nbits):

class DFGReporter(DFGHook, AutoCSR):
def __init__(self, dfg, nbits):
self._r_magic = CSRStatus(16)
self._r_neps = CSRStatus(8)
self._r_nbits = CSRStatus(8)
self._r_freeze = CSRStorage()
self._r_reset = CSR()
self._magic = CSRStatus(16)
self._neps = CSRStatus(8)
self._nbits = CSRStatus(8)
self._freeze = CSRStorage()
self._reset = CSR()

###

@@ -58,12 +58,12 @@ def __init__(self, dfg, nbits):
hooks = list(self.hooks_iter())

self.comb += [
self._r_magic.status.eq(ISD_MAGIC),
self._r_neps.status.eq(len(hooks)),
self._r_nbits.status.eq(nbits)
self._magic.status.eq(ISD_MAGIC),
self._neps.status.eq(len(hooks)),
self._nbits.status.eq(nbits)
]
for h in hooks:
self.comb += [
h.freeze.eq(self._r_freeze.storage),
h.reset.eq(self._r_reset.re)
h.freeze.eq(self._freeze.storage),
h.reset.eq(self._reset.re)
]