From a3dae5fc5c6336a18b76fea7a45233cba4324214 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Sun, 25 Jan 2015 16:13:06 +0100
Subject: [PATCH] host/driver: simplify

---
 litescope/host/driver.py | 51 ++++++++++++++++++----------------------
 test/test_la.py          | 19 ++++++++-------
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/litescope/host/driver.py b/litescope/host/driver.py
index 0fed4294..3e5711d3 100644
--- a/litescope/host/driver.py
+++ b/litescope/host/driver.py
@@ -112,10 +112,11 @@ class LiteScopeIODriver():
 		return self.i.read()
 
 class LiteScopeLADriver():
-	def __init__(self, regs, name, config_csv=None, use_rle=False):
+	def __init__(self, regs, name, config_csv=None, use_rle=False, debug=False):
 		self.regs = regs
 		self.name = name
 		self.use_rle = use_rle
+		self.debug = debug
 		if config_csv is None:
 			self.config_csv = name + ".csv"
 		self.get_config()
@@ -152,11 +153,7 @@ class LiteScopeLADriver():
 			setattr(self, name + "_m", (2**length-1) << value)
 			value += length
 
-	def show_state(self, s):
-		print(s, end="|")
-		sys.stdout.flush()
-
-	def prog_term(self, port, trigger=0, mask=0, cond=None):
+	def configure_term(self, port, trigger=0, mask=0, cond=None):
 		if cond is not None:
 			for k, v in cond.items():
 				trigger |= getattr(self, k + "_o")*v
@@ -166,13 +163,13 @@ class LiteScopeLADriver():
 		t.write(trigger)
 		m.write(mask)
 
-	def prog_range_detector(self, port, low, high):
+	def configure_range_detector(self, port, low, high):
 		l = getattr(self, "trigger_port{d}_low".format(d=int(port)))
 		h = getattr(self, "trigger_port{d}_high".format(d=int(port)))
 		l.write(low)
 		h.write(high)
 
-	def prog_edge_detector(self, port, rising_mask, falling_mask, both_mask):
+	def configure_edge_detector(self, port, rising_mask, falling_mask, both_mask):
 		rm = getattr(self, "trigger_port{d}_rising_mask".format(d=int(port)))
 		fm = getattr(self, "trigger_port{d}_falling_mask".format(d=int(port)))
 		bm = getattr(self, "trigger_port{d}_both_mask".format(d=int(port)))
@@ -180,34 +177,31 @@ class LiteScopeLADriver():
 		fm.write(falling_mask)
 		bm.write(both_mask)
 
-	def prog_sum(self, equation):
+	def configure_sum(self, equation):
 		datas = gen_truth_table(equation)
 		for adr, dat in enumerate(datas):
 			self.trigger_sum_prog_adr.write(adr)
 			self.trigger_sum_prog_dat.write(dat)
 			self.trigger_sum_prog_we.write(1)
 
-	def config_rle(self, v):
+	def set_rle(self, v):
 		self.rle_enable.write(v)
 
-	def is_done(self):
+	def done(self):
 		return self.recorder_done.read()
 
-	def wait_done(self):
-		self.show_state("WAIT HIT")
-		while(not self.is_done()):
-			time.sleep(0.1)
-
-	def trigger(self, offset, length):
-		self.show_state("TRIG")
+	def run(self, offset, length):
+		if self.debug:
+			print("run")
 		if self.with_rle:
 			self.config_rle(self.use_rle)
 		self.recorder_offset.write(offset)
 		self.recorder_length.write(length)
 		self.recorder_trigger.write(1)
 
-	def read(self):
-		self.show_state("READ")
+	def upload(self):
+		if self.debug:
+			print("upload")
 		while self.recorder_source_stb.read():
 			self.dat.append(self.recorder_source_data.read())
 			self.recorder_source_ack.write(1)
@@ -216,15 +210,16 @@ class LiteScopeLADriver():
 				self.dat = self.dat.decode_rle()
 		return self.dat
 
-	def export(self, export_fn=None):
-		self.show_state("EXPORT")
+	def save(self, filename):
+		if self.debug:
+			print("save to " + filename)
 		dump = Dump()
 		dump.add_from_layout(self.layout, self.dat)
-		if ".vcd" in export_fn:
-			VCDExport(dump).write(export_fn)
-		elif ".csv" in export_fn:
-			CSVExport(dump).write(export_fn)
-		elif ".py" in export_fn:
-			PYExport(dump).write(export_fn)
+		if ".vcd" in filename:
+			VCDExport(dump).write(filename)
+		elif ".csv" in filename:
+			CSVExport(dump).write(filename)
+		elif ".py" in filename:
+			PYExport(dump).write(filename)
 		else:
 			raise NotImplementedError
diff --git a/test/test_la.py b/test/test_la.py
index 6e1fb943..4cfa78ea 100644
--- a/test/test_la.py
+++ b/test/test_la.py
@@ -3,18 +3,19 @@ from litescope.host.driver import LiteScopeLADriver
 
 wb.open()
 ###
-la = LiteScopeLADriver(wb.regs, "la")
+la = LiteScopeLADriver(wb.regs, "la", debug=True)
 
 cond = {"cnt0"	:	128} # trigger on cnt0 = 128
-la.prog_term(port=0, cond=cond)
-la.prog_sum("term")
-la.trigger(offset=128, length=256)
+la.configure_term(port=0, cond=cond)
+la.configure_sum("term")
+la.run(offset=128, length=256)
 
-la.wait_done()
-la.read()
+while not la.done():
+	pass
+la.upload()
 
-la.export("dump.vcd")
-la.export("dump.csv")
-la.export("dump.py")
+la.save("dump.vcd")
+la.save("dump.csv")
+la.save("dump.py")
 ###
 wb.close()
-- 
2.30.2