From e4f92360d1130a32ab940fdfd1ca6ff6f89b166e Mon Sep 17 00:00:00 2001
From: aramya <22577625+thamugadi@users.noreply.github.com>
Date: Sun, 10 Oct 2021 19:34:51 +0100
Subject: [PATCH] 24-bit vga

---
 Makefile        | 6 ++++--
 loader/load.fth | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7dc764e..3607bd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 MACHINE=mac99
 PPC=powerpc-linux-gnu
 QEMU=qemu-system-ppc
+RES=1280x768x32
+
 DISK.APM: kernel.elf bootinfo.txt scripts/kpartx.sh
 	dd bs=512K count=2 if=/dev/zero of=DISK.APM
 	parted DISK.APM --script mklabel mac mkpart primary hfs+ 32.8KB 100%
@@ -25,8 +27,8 @@ start.elf: entry/start.s
 clean:
 	rm *.APM *elf *txt 
 run:
-	$(QEMU) *.APM -g 1280x768x32 -machine $(MACHINE)
+	$(QEMU) -hda *.APM -g $(RES) -machine $(MACHINE)
 debug:
-	$(QEMU) *.APM -d in_asm -g 1280x768x32 -machine $(MACHINE)
+	$(QEMU) -hda *.APM -d in_asm -g $(RES) -machine $(MACHINE)
 all:
 	make clean && make && make run
diff --git a/loader/load.fth b/loader/load.fth
index 9c9e0e6..dd4ff18 100644
--- a/loader/load.fth
+++ b/loader/load.fth
@@ -8,14 +8,14 @@
 : fba frame-buffer-adr ;
 : beige-vram 80000000 ; : mac99-vram 81000000 ;
 
-: beige-error ." G3 Beige machine isn't supported yet. Please run it with a post-1999 PowerPC Mac." ;
-
+: beige-error ." G3 Beige machine is not supported yet. Please run it with a post-1999 PowerPC Mac." ;
+: hardware-error ." Hardware not supported." ;
 variable run 
 -1 run !
 
 fba beige-vram = if beige-error cr 100 0 do 0BE i beige-vram + c! loop then 
 fba mac99-vram = if ." mac99"   cr 100 0 do 05A i mac99-vram + c! loop then
-fba beige-vram diff fba mac99-vram diff and if  ." Hardware not supported." cr 0 run ! then
+fba beige-vram diff fba mac99-vram diff and if hardware-error cr 0 run ! then
 
 run @ 0 = if 1 0 do 0 +loop then