Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
norflash: use new timeline API
  • Loading branch information
Sebastien Bourdeauducq committed Mar 15, 2012
1 parent 7b14e0b commit e3ef121
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions milkymist/norflash/__init__.py
@@ -1,28 +1,31 @@
from migen.fhdl.structure import *
from migen.bus import wishbone
from migen.corelogic import timeline
from migen.corelogic.misc import timeline

class NorFlash:
def __init__(self, adr_width, rd_timing):
self.adr_width = adr_width
self.rd_timing = rd_timing

self.bus = wishbone.Interface()
self.adr = Signal(BV(adr_width-1))
self.d = Signal(BV(16))
self.oe_n = Signal()
self.we_n = Signal()
self.ce_n = Signal()
self.timeline = timeline.Timeline(self.bus.cyc & self.bus.stb,
[(0, [self.adr.eq(Cat(0, self.bus.adr[:adr_width-2]))]),
(rd_timing, [
self.bus.dat_r[16:].eq(self.d),
self.adr.eq(Cat(1, self.bus.adr[:adr_width-2]))]),
(2*rd_timing, [
self.bus.dat_r[:16].eq(self.d),
self.bus.ack.eq(1)]),
(2*rd_timing+1, [
self.bus.ack.eq(0)])])

def get_fragment(self):
comb = [self.oe_n.eq(0), self.we_n.eq(1),
self.ce_n.eq(0)]
return Fragment(comb, pads={self.adr, self.d, self.oe_n, self.we_n, self.ce_n}) \
+ self.timeline.get_fragment()
sync = timeline(self.bus.cyc & self.bus.stb, [
(0, [self.adr.eq(Cat(0, self.bus.adr[:self.adr_width-2]))]),
(self.rd_timing, [
self.bus.dat_r[16:].eq(self.d),
self.adr.eq(Cat(1, self.bus.adr[:self.adr_width-2]))]),
(2*self.rd_timing, [
self.bus.dat_r[:16].eq(self.d),
self.bus.ack.eq(1)]),
(2*self.rd_timing + 1, [
self.bus.ack.eq(0)])
])
return Fragment(comb, sync, pads={self.adr, self.d, self.oe_n, self.we_n, self.ce_n})

0 comments on commit e3ef121

Please sign in to comment.