From 6ebe514137fa41ac015122da4dcaba56af84e531 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sat, 19 Nov 2022 21:19:18 -0600
Subject: Implement JTAG-UART input

---
 tb/top/conspiracion.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'tb/top')

diff --git a/tb/top/conspiracion.cpp b/tb/top/conspiracion.cpp
index d710bde..bf0ee89 100644
--- a/tb/top/conspiracion.cpp
+++ b/tb/top/conspiracion.cpp
@@ -192,6 +192,11 @@ int main(int argc, char **argv)
 		parser, "headless", "Disable video output", {"headless"}
 	);
 
+	args::Flag no_tty
+	(
+		parser, "no-tty", "Disable TTY takeoveer", {"no-tty"}
+	);
+
 	args::ValueFlag<unsigned> cycles
 	(
 		parser, "cycles", "Number of core cycles to run", {"cycles"}, 256
@@ -251,7 +256,7 @@ int main(int argc, char **argv)
 	interconnect<Vconspiracion_vga_domain> avl_vga(*top.conspiracion->plat->vga);
 
 	mem<std::uint32_t> hps_ddr3(0x0000'0000, 512 << 20);
-	jtag_uart ttyj0(0x3000'0000);
+	jtag_uart ttyJ0(0x3000'0000);
 	interval_timer timer(0x3002'0000);
 	mem<std::uint32_t> vram(0x3800'0000, 64 << 20);
 	null vram_null(0x3800'0000, 64 << 20, 2);
@@ -267,7 +272,7 @@ int main(int argc, char **argv)
 	bool enable_video = !headless;
 
 	avl.attach(hps_ddr3);
-	avl.attach(ttyj0);
+	avl.attach(ttyJ0);
 	avl.attach(timer);
 
 	for(auto &slave : consts)
@@ -334,6 +339,7 @@ int main(int argc, char **argv)
 
 		if(top.clk_clk)
 		{
+			ttyJ0.tick();
 			timer.tick();
 		}
 
@@ -364,6 +370,11 @@ int main(int argc, char **argv)
 		tick();
 	};
 
+	if(!no_tty)
+	{
+		ttyJ0.takeover();
+	}
+
 	top.halt = 0;
 	top.rst_n = 0;
 	cycle();
@@ -378,6 +389,11 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if(!no_tty)
+	{
+		ttyJ0.release();
+	}
+
 	if(enable_trace)
 	{
 		trace.close();
-- 
cgit v1.2.3