Uart and GPIO IRQ

2 files changed, 7 insertions, 2 deletions

diff --git a/usr/main.c b/usr/main.c
index 955b328..85491e1 100644
--- a/usr/main.c
+++ b/usr/main.c
@@ -35,7 +35,7 @@ static struct UartInfo UART_INFO = {
 };
 
 static struct GPIOInfo gpinfo = {
-	.pin = (1<<16),
+	.pin = (1<<16 | 1<<12),
 	.priority = 0,
 };
 
@@ -59,4 +59,5 @@ void main(void)
 	subscribe_irq(GPIO_BANK_1_IRQ, gptest, &gpinfo);
 	add_thread(loop, 0, 8);
 	add_thread(consumer, 0, 3);
+	uart_string("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
 }
diff --git a/usr/timed.c b/usr/timed.c
index fd4f923..5f3b52e 100644
--- a/usr/timed.c
+++ b/usr/timed.c
@@ -28,6 +28,8 @@ void consumer(void)
 
 void loop(void)
 {
+	unsigned long long ti, tf;
+	sys0_64(SYS_TIME, &ti);
 	static char str[13];
 	static unsigned long previous = 0;
 	char* start;
@@ -49,8 +51,10 @@ void loop(void)
 	//	draw_hex32(0, 17, count++);
 	//	add_thread(producer, 0, 4);
 	//}
+	sys0_64(SYS_TIME, &tf);
+	draw_hex32(0, 13, tf-ti);
 	wait_msec(30000);
-	add_thread(loop, 0, 3);
+	//add_thread(loop, 0, 3);
 }
 
 void loopt(void)