From 35391ca247e7720e29ef3653afcb269890c69e9f Mon Sep 17 00:00:00 2001
From: neauoire <aliceffekt@gmail.com>
Date: Tue, 5 Apr 2022 11:06:47 -0700
Subject: [PATCH] Migrated DEIs to device page

---
 build.sh    |  2 +-
 src/uxn11.c | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/build.sh b/build.sh
index dc9a63c..322c20f 100755
--- a/build.sh
+++ b/build.sh
@@ -23,4 +23,4 @@ fi
 echo "Done."
 
 # echo "Running.."
-bin/uxn11 ~/roms/left.rom README.md
+bin/uxn11 ~/roms/catclock.rom README.md
diff --git a/src/uxn11.c b/src/uxn11.c
index b013066..994575f 100644
--- a/src/uxn11.c
+++ b/src/uxn11.c
@@ -59,17 +59,14 @@ console_deo(Uint8 *d, Uint8 port)
 static Uint8
 uxn11_dei(struct Uxn *u, Uint8 addr)
 {
-	Uint8 p = addr & 0x0f;
-	Device *d = &u->dev[addr >> 4];
+	Uint8 p = addr & 0x0f, *d = &u->dpg[addr >> 4];
 	switch(addr & 0xf0) {
-	case 0x20: return screen_dei(d->dat, p); break;
-	case 0x80: return u->dpg[0x80 + p]; break;
-	case 0x90: return u->dpg[0x90 + p]; break;
-	case 0xa0: return file_dei(0, d->dat, p); break;
-	case 0xb0: return file_dei(1, d->dat, p); break;
-	case 0xc0: return datetime_dei(d->dat, p); break;
+	case 0x20: return screen_dei(d, p); break;
+	case 0xa0: return file_dei(0, d, p); break;
+	case 0xb0: return file_dei(1, d, p); break;
+	case 0xc0: return datetime_dei(d, p); break;
 	}
-	return d->dat[p];
+	return u->dpg[addr];
 }
 
 static void