Separated font and kernel image builds.

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-	"C_Cpp.errorSquiggles": "disabled"
+	"C_Cpp.errorSquiggles": "disabled",
+	"C_Cpp.dimInactiveRegions": false
 }

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 $@

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)"

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);
+
+

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);
 

src/kernel/hardware/vera/vera_font.s

@@ -7,4 +7,4 @@
 
 	.section cfar,rodata
 vera_font_0:
-	.incbin "vera_font_0.bin"
+	.incbin "vera_font_0.fnt"