From 2027e62d18d971eb8b1392c2283f5744e750c327 Mon Sep 17 00:00:00 2001
From: Andrew Alderwick <andrew@alderwick.co.uk>
Date: Thu, 9 Sep 2021 19:30:43 +0100
Subject: [PATCH] Update to latest Uxn.

---
 Makefile |  2 +-
 lib/uxn  |  2 +-
 main.c   | 15 +++++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index c139524..279a3bc 100644
--- a/Makefile
+++ b/Makefile
@@ -35,5 +35,5 @@ distclean: clean
 	git submodule deinit --all
 
 update:
-	git submodule foreach 'git fetch && git reset --hard origin/master'
+	git submodule foreach 'git fetch && { git reset --hard origin/master || git reset --hard origin/main; }'
 
diff --git a/lib/uxn b/lib/uxn
index b6239ad..a3502f1 160000
--- a/lib/uxn
+++ b/lib/uxn
@@ -1 +1 @@
-Subproject commit b6239ad549a046ff8541032d4ff482619a7dfc1a
+Subproject commit a3502f163774ae2d863a10f10dd83e8c6aa44e35
diff --git a/main.c b/main.c
index 98b30a8..49940ab 100644
--- a/main.c
+++ b/main.c
@@ -11,9 +11,10 @@
 
 UXN_INIT_DEFINITIONS
 
-static void
+static int
 nil_talk(Device *d, Uint8 b0, Uint8 w)
 {
+	return 1;
 }
 
 static void
@@ -40,6 +41,12 @@ trigger_main_loop_callback(int b)
 	waiting_callbacks |= 0x80000000 >> b;
 }
 
+int
+uxn_halt(Uxn *u, Uint8 error, char *name, int id)
+{
+	return 0;
+}
+
 int
 main(void)
 {
@@ -48,16 +55,16 @@ main(void)
 
 	Uxn u;
 
-	bootuxn(&u);
+	uxn_boot(&u);
 	memcpy(u.ram.dat + 0x100, uxn_boot_rom, sizeof(uxn_boot_rom));
 
 	UXN_INIT_CALLS;
 
 	for(int i = 0; i < 16; ++i)
 		if(u.dev[i].talk == NULL)
-			portuxn(&u, i, "empty", nil_talk);
+			uxn_port(&u, i, nil_talk);
 
-	if(!evaluxn(&u, 0x100))
+	if(!uxn_eval(&u, 0x100))
 		reset_usb_boot(0, 0);
 
 	for(;;) {
-- 
2.34.2