Separated font and kernel image builds.

This commit is contained in:
Kyle J Cardoza 2024-07-12 17:06:50 -04:00
parent 904ab244be
commit 9c087e6490
7 changed files with 19 additions and 19 deletions

View File

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

View File

@ -63,10 +63,10 @@ endif
@echo "Assembling $@..." @echo "Assembling $@..."
@$(AS) $(ASFLAGS) -o $@ $< @$(AS) $(ASFLAGS) -o $@ $<
.SUFFIXES: .png .bin .ase .SUFFIXES: .png .fnt .ase
%.png: %.ase %.png: %.ase
aseprite -b $< -save-as $@ aseprite -b $< -save-as $@
%.bin: %.png %.fnt: %.png
bin/makechrom -f $< bin/makechrom -f $<
mv $<.bin $@ mv $<.bin $@

View File

@ -15,10 +15,13 @@ FONT_SOURCES := $(wildcard src/kernel/hardware/vera/vera_font_*.ase)
KERNEL_OBJ := $(KERNEL_ASM_SRC:.s=.o) KERNEL_OBJ := $(KERNEL_ASM_SRC:.s=.o)
KERNEL_OBJ += $(KERNEL_C_SRC:.c=.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 KERNEL_LDFLAGS := --list-file build/kernel.lst
.PHONY: fonts
fonts: $(FONTS)
build/kernel.bin: $(KERNEL_OBJ) build/kernel.bin: $(KERNEL_OBJ)
echo "Linking $@..." echo "Linking $@..."
echo "$(FONTS)" echo "$(FONTS)"

View File

@ -7,6 +7,12 @@
#pragma once #pragma once
typedef enum {
LED_RED,
LED_GREEN,
LED_BLUE
} LED;
void led_init(void); void led_init(void);
void led_red_off(void); void led_red_off(void);
@ -20,3 +26,5 @@ void led_green_on(void);
void led_blue_off(void); void led_blue_off(void);
void led_blue_on(void); void led_blue_on(void);

View File

@ -131,21 +131,9 @@
// The assembler can't handle this stuff. // The assembler can't handle this stuff.
#ifdef __CALYPSI_CC__ #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); void vera_reg_set(uint8_t reg, uint8_t value);
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_reset(void); void vera_reset(void);

View File

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

Binary file not shown.