From e3ef12144035a269e8104d45e41eadd8a78c0b4e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sebastien@milkymist.org>
Date: Thu, 15 Mar 2012 20:26:04 +0100
Subject: [PATCH] norflash: use new timeline API

---
 milkymist/norflash/__init__.py | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/milkymist/norflash/__init__.py b/milkymist/norflash/__init__.py
index df9a31196..47d9e3f87 100644
--- a/milkymist/norflash/__init__.py
+++ b/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})