From 9c087e64906d8ede6fe4f8c3d0f03a7dd572b476 Mon Sep 17 00:00:00 2001
From: Kyle J Cardoza <Kyle.Cardoza@icloud.com>
Date: Fri, 12 Jul 2024 17:06:50 -0400
Subject: [PATCH] Separated font and kernel image builds.

---
 .vscode/settings.json                    |   3 ++-
 config/config.mk                         |   4 ++--
 config/kernel.mk                         |   5 ++++-
 include/kernel/hardware/led.h            |   8 ++++++++
 include/kernel/hardware/vera.h           |  16 ++--------------
 src/kernel/hardware/vera/vera_font.s     |   2 +-
 src/kernel/hardware/vera/vera_font_0.fnt | Bin 0 -> 4096 bytes
 7 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 src/kernel/hardware/vera/vera_font_0.fnt

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 679f05a..2b616a7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-	"C_Cpp.errorSquiggles": "disabled"
+	"C_Cpp.errorSquiggles": "disabled",
+	"C_Cpp.dimInactiveRegions": false
 }
\ No newline at end of file
diff --git a/config/config.mk b/config/config.mk
index fa4be15..645b7aa 100755
--- a/config/config.mk
+++ b/config/config.mk
@@ -63,10 +63,10 @@ endif
 	@echo "Assembling $@..."
 	@$(AS) $(ASFLAGS) -o $@ $<
 	
-.SUFFIXES: .png .bin .ase
+.SUFFIXES: .png .fnt .ase
 %.png: %.ase
 	aseprite -b $< -save-as $@
 
-%.bin: %.png
+%.fnt: %.png
 	bin/makechrom -f $<
 	mv $<.bin $@
diff --git a/config/kernel.mk b/config/kernel.mk
index bca26a9..9703082 100755
--- a/config/kernel.mk
+++ b/config/kernel.mk
@@ -15,10 +15,13 @@ FONT_SOURCES := $(wildcard src/kernel/hardware/vera/vera_font_*.ase)
 KERNEL_OBJ := $(KERNEL_ASM_SRC:.s=.o) 
 KERNEL_OBJ += $(KERNEL_C_SRC:.c=.o)
 
-FONTS := $(FONT_SOURCES:.ase=.bin)
+FONTS := $(FONT_SOURCES:.ase=.fnt)
 
 KERNEL_LDFLAGS := --list-file build/kernel.lst
 
+.PHONY: fonts
+fonts: $(FONTS)
+
 build/kernel.bin: $(KERNEL_OBJ)
 	echo "Linking $@..."
 	echo "$(FONTS)"
diff --git a/include/kernel/hardware/led.h b/include/kernel/hardware/led.h
index 944aeb6..7be12d1 100644
--- a/include/kernel/hardware/led.h
+++ b/include/kernel/hardware/led.h
@@ -7,6 +7,12 @@
 
 #pragma once
 
+typedef enum {
+	LED_RED,
+	LED_GREEN,
+	LED_BLUE
+} LED;
+
 void led_init(void);
 
 void led_red_off(void);
@@ -20,3 +26,5 @@ void led_green_on(void);
 void led_blue_off(void);
 
 void led_blue_on(void);
+
+
diff --git a/include/kernel/hardware/vera.h b/include/kernel/hardware/vera.h
index 2411ffd..a9d3f57 100755
--- a/include/kernel/hardware/vera.h
+++ b/include/kernel/hardware/vera.h
@@ -131,21 +131,9 @@
 // The assembler can't handle this stuff.
 #ifdef __CALYPSI_CC__
 
-void vera_set_address_0(uint32_t addr);
+uint8_t vera_reg_get(uint8_t reg);
 
-void vera_set_address_1(uint32_t addr);
-
-uint8_t vera_read_data_reg_0(void);
-
-uint8_t vera_read_data_reg_1(void);
-
-uint16_t vera_read_data_reg(void);
-
-void vera_write_data_reg_0(uint8_t new_value);
-
-void vera_write_data_reg_1(uint8_t new_value);
-
-void vera_write_data_reg(uint16_t new_value);
+void vera_reg_set(uint8_t reg, uint8_t value);
 
 void vera_reset(void);
 
diff --git a/src/kernel/hardware/vera/vera_font.s b/src/kernel/hardware/vera/vera_font.s
index c405b2f..ea9de95 100644
--- a/src/kernel/hardware/vera/vera_font.s
+++ b/src/kernel/hardware/vera/vera_font.s
@@ -7,4 +7,4 @@
 
 	.section cfar,rodata
 vera_font_0:
-	.incbin "vera_font_0.bin"
\ No newline at end of file
+	.incbin "vera_font_0.fnt"
\ No newline at end of file
diff --git a/src/kernel/hardware/vera/vera_font_0.fnt b/src/kernel/hardware/vera/vera_font_0.fnt
new file mode 100644
index 0000000000000000000000000000000000000000..77819db989a3a5720498ebc523ee5444b4f3facd
GIT binary patch
literal 4096
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

literal 0
HcmV?d00001