From 74249214db770c83e22a9a49795ea3dc4235274e Mon Sep 17 00:00:00 2001 From: John Hodge Date: Mon, 28 Sep 2009 21:37:01 +0800 Subject: [PATCH] Started work on VTerm Fonts, slight changes to BochsVBE driver --- Kernel/Makefile | 2 +- Kernel/drv/bochsvbe.c | 1 + Kernel/drv/vterm.c | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Kernel/Makefile b/Kernel/Makefile index 68b84b8b..bbafbba7 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -22,7 +22,7 @@ OBJ += heap.o messages.o debug.o modules.o lib.o syscalls.o system.o threads.o OBJ += binary.o bin/elf.o OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/dir.o vfs/io.o vfs/mount.o vfs/memfile.o vfs/nodecache.o OBJ += vfs/fs/root.o vfs/fs/devfs.o vfs/fs/fat.o -OBJ += drv/pci.o drv/ata_x86.o drv/vterm.o drv/vga.o drv/kb.o +OBJ += drv/fifo.o drv/pci.o drv/ata_x86.o drv/vterm.o drv/vga.o drv/kb.o OBJ := $(addsuffix .$(ARCH), $(OBJ)) BIN = ../Acess2.$(ARCH).bin diff --git a/Kernel/drv/bochsvbe.c b/Kernel/drv/bochsvbe.c index 2aed670a..bbf0bbcb 100644 --- a/Kernel/drv/bochsvbe.c +++ b/Kernel/drv/bochsvbe.c @@ -51,6 +51,7 @@ Uint64 BGA_Write(tVFS_Node *node, Uint64 off, Uint64 len, void *buffer); // === CONSTANTS === const t_bga_mode BGA_MODES[] = { + {}, {640,480,8, 0, 640*480}, {640,480,32, 0, 640*480*4}, {800,600,8, 0, 800*600}, diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c index 304de691..b1d5181a 100644 --- a/Kernel/drv/vterm.c +++ b/Kernel/drv/vterm.c @@ -601,10 +601,15 @@ int VT_Font_GetHeight(Uint32 Codepoint) return FONT_HEIGHT; } +/** + * \fn void VT_Font_Render(Uint32 Codepoint, void *Buffer, Uint32 BGC, Uint32 FGC) + * \brief Render a font character + */ void VT_Font_Render(Uint32 Codepoint, void *Buffer, Uint32 BGC, Uint32 FGC) { -// Uint8 *font; - + //Uint8 *font; + //Uint32 *buf = Buffer; + //font = VT_Font_GetChar(Codepoint); } /** -- 2.20.1