From 4ca24f9693e749b8b727c7f96cfee625abc94c0e Mon Sep 17 00:00:00 2001
From: Adam Greenwood-Byrne <adam@isometim.es>
Date: Sat, 20 Mar 2021 16:36:08 +0000
Subject: [PATCH] Added wgt45.c to load space.spr sprites and display them

---
 part12-wgt/Makefile         |   7 +++-
 part12-wgt/bin/space.spr    | Bin 0 -> 7558 bytes
 part12-wgt/examples/wgt45.c |  80 ++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 part12-wgt/bin/space.spr
 create mode 100644 part12-wgt/examples/wgt45.c

diff --git a/part12-wgt/Makefile b/part12-wgt/Makefile
index 6633d38..d0d9137 100644
--- a/part12-wgt/Makefile
+++ b/part12-wgt/Makefile
@@ -20,11 +20,14 @@ bin/wgt2blk.o: bin/wgt2.blk
 bin/lettersspr.o: bin/letters.spr
 	$(LLVMPATH)/llvm-objcopy -I binary -O elf64-littleaarch64 -B aarch64 $< $@
 
+bin/spacespr.o: bin/space.spr
+	$(LLVMPATH)/llvm-objcopy -I binary -O elf64-littleaarch64 -B aarch64 $< $@
+
 %.o: %.c
 	$(LLVMPATH)/clang --target=aarch64-elf $(CLANGFLAGS) -c $< -o $@
 
-kernel8.img: boot/boot.o $(OFILES) bin/wgt1pal.o bin/wgt1blk.o bin/wgt2blk.o bin/lettersspr.o
-	$(LLVMPATH)/ld.lld -m aarch64elf -nostdlib boot/boot.o $(OFILES) bin/wgt1pal.o bin/wgt1blk.o bin/wgt2blk.o bin/lettersspr.o -T boot/link.ld -o kernel8.elf
+kernel8.img: boot/boot.o $(OFILES) bin/wgt1pal.o bin/wgt1blk.o bin/wgt2blk.o bin/lettersspr.o bin/spacespr.o
+	$(LLVMPATH)/ld.lld -m aarch64elf -nostdlib boot/boot.o $(OFILES) bin/wgt1pal.o bin/wgt1blk.o bin/wgt2blk.o bin/lettersspr.o bin/spacespr.o -T boot/link.ld -o kernel8.elf
 	$(LLVMPATH)/llvm-objcopy -O binary kernel8.elf kernel8.img
 
 clean:
diff --git a/part12-wgt/bin/space.spr b/part12-wgt/bin/space.spr
new file mode 100644
index 0000000000000000000000000000000000000000..fd81bbc77cfa50a93bf905b8a9bd9613cb65e402
GIT binary patch
literal 7558
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

literal 0
HcmV?d00001

diff --git a/part12-wgt/examples/wgt45.c b/part12-wgt/examples/wgt45.c
new file mode 100644
index 0000000..20279fd
--- /dev/null
+++ b/part12-wgt/examples/wgt45.c
@@ -0,0 +1,80 @@
+#include "wgt.h"
+#include "include/mem.h"
+
+// ######## REQUIRED FUNCTIONS ########
+
+unsigned long state0 = 1000;
+unsigned long state1 = 2000;
+
+unsigned long rand(void)
+{
+    unsigned long s1 = state0;
+    unsigned long s0 = state1;
+
+    state0 = s0;
+    s1 ^= s1 << 23;
+    s1 ^= s1 >> 17;
+    s1 ^= s0;
+    s1 ^= s0 >> 26;
+    state1 = s1;
+
+    return state0 + state1;
+}
+
+void wait_msec(unsigned int n)
+{
+    register unsigned long f, t, r;
+
+    // Get the current counter frequency
+    asm volatile ("mrs %0, cntfrq_el0" : "=r"(f));
+    // Read the current counter
+    asm volatile ("mrs %0, cntpct_el0" : "=r"(t));
+    // Calculate expire value for counter
+    t+=((f/1000)*n)/1000;
+    do{asm volatile ("mrs %0, cntpct_el0" : "=r"(r));}while(r<t);
+}
+
+// ######## STUB FUNCTIONS ########
+
+unsigned int kb = 0;
+
+unsigned int kbhit(void) {
+    kb++;
+    return kb / 500;
+}
+
+void getch(void) {
+    wait_msec(0x500000);
+    kb = 0;
+}
+
+// ######## WGT EXAMPLES ########
+
+void wgt45()
+{
+  block sprites[10];      /* An array of blocks to load the sprites into.
+                           Version 5.0 allows for any number to be 
+                           loaded in, as long as you pass the same size
+                           of the array to the wloadsprites and wfreesprites
+                           commands. */
+  short i;
+  color palette[256];
+
+  set_clock_rate(get_max_clock());
+  mem_init();
+  vga256 ();                    /* Initializes WGT system       */
+
+  extern unsigned char _binary_bin_space_spr_start[];
+  wloadsprites (palette, &_binary_bin_space_spr_start[0], sprites, 0, 9);
+  /* loads the first 10 sprites */
+  wsetpalette (0, 255, palette);
+
+  for (i = 0; i < 10; i++)                      /* Display them */
+    wputblock (i * 30, 0, sprites[i], NORMAL);
+}
+
+void main()
+{
+    wgt45();
+    while (1);
+}