From 91a6abf7a700b750c4a9ba1f4c801a41f0bdd4b1 Mon Sep 17 00:00:00 2001 From: Jacob Potter Date: Fri, 19 Sep 2008 15:52:22 -0400 Subject: [PATCH] split vga and logging code out into vga-overlay.[ch] --- aseg/Makefile | 2 +- aseg/counter.c | 72 +++------------------------------------------- aseg/vga-overlay.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ aseg/vga-overlay.h | 9 ++++++ 4 files changed, 86 insertions(+), 69 deletions(-) create mode 100644 aseg/vga-overlay.c create mode 100644 aseg/vga-overlay.h diff --git a/aseg/Makefile b/aseg/Makefile index 1c2867d..6d22af1 100644 --- a/aseg/Makefile +++ b/aseg/Makefile @@ -1,6 +1,6 @@ CC=gcc CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ -Wall -Werror -pedantic -ansi -std=gnu99 -OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o +OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o vga-overlay.o all: aseg.elf diff --git a/aseg/counter.c b/aseg/counter.c index ccfff72..2b1d6ea 100644 --- a/aseg/counter.c +++ b/aseg/counter.c @@ -3,77 +3,13 @@ #include #include -unsigned int counter = 0; -unsigned long pcisave; -unsigned char vgasave; char thestr[512]; -char logents[4][41] = {{0}}; - -#define VRAM_BASE 0xA0000UL -#define TEXT_CONSOLE_OFFSET 0x18000UL - -#define TEXT_CONSOLE_BASE (VRAM_BASE + TEXT_CONSOLE_OFFSET) - -#define COLOR 0x1F - -unsigned char vga_read(unsigned char idx) -{ - outb(CRTC_IDX_REG, idx); - return inb(CRTC_DATA_REG); -} - -char * vga_base() -{ - return (char *) ( - TEXT_CONSOLE_BASE - | (((unsigned int) vga_read(CRTC_START_ADDR_LSB_IDX)) << 9) - | (((unsigned int) vga_read(CRTC_START_ADDR_MSB_IDX)) << 1) - ); -} - -void strblit(char *src, int row, int col) -{ - char *destp = vga_base() + row * 80 * 2 + col * 2; - smram_state_t old_state = smram_save_state(); - - smram_aseg_set_state(SMRAM_ASEG_SMMCODE); - - while (*src) - { - *(destp++) = *(src++); - *(destp++) = COLOR; - } - - smram_restore_state(old_state); -} - -void outlog() -{ - int y, x; - char *basep = vga_base(); - smram_state_t old_state = smram_save_state(); - - smram_aseg_set_state(SMRAM_ASEG_SMMCODE); - - for (y = 0; y < 4; y++) - for (x = 40; x < 80; x++) - { - basep[y*80*2+x*2] = ' '; - basep[y*80*2+x*2+1] = 0x1F; - } +#include "vga-overlay.h" - smram_restore_state(old_state); - - for (y = 0; y < 4; y++) - strblit(logents[y], y, 40); -} - -void dolog(char *s) -{ - memmove(logents[0], logents[1], sizeof(logents[0])*3); - strcpy(logents[3], s); -} +unsigned int counter = 0; +unsigned long pcisave; +unsigned char vgasave; void pci_dump() { char s[40]; diff --git a/aseg/vga-overlay.c b/aseg/vga-overlay.c new file mode 100644 index 0000000..e5414ca --- /dev/null +++ b/aseg/vga-overlay.c @@ -0,0 +1,72 @@ +#include +#include +#include +#include + +static char logents[4][41] = {{0}}; + +#define VRAM_BASE 0xA0000UL +#define TEXT_CONSOLE_OFFSET 0x18000UL + +#define TEXT_CONSOLE_BASE (VRAM_BASE + TEXT_CONSOLE_OFFSET) + +#define COLOR 0x1F + +static unsigned char vga_read(unsigned char idx) +{ + outb(CRTC_IDX_REG, idx); + return inb(CRTC_DATA_REG); +} + +static char * vga_base() +{ + return (char *) ( + TEXT_CONSOLE_BASE + | (((unsigned int) vga_read(CRTC_START_ADDR_LSB_IDX)) << 9) + | (((unsigned int) vga_read(CRTC_START_ADDR_MSB_IDX)) << 1) + ); +} + +void strblit(char *src, int row, int col) +{ + char *destp = vga_base() + row * 80 * 2 + col * 2; + smram_state_t old_state = smram_save_state(); + + smram_aseg_set_state(SMRAM_ASEG_SMMCODE); + + while (*src) + { + *(destp++) = *(src++); + *(destp++) = COLOR; + } + + smram_restore_state(old_state); +} + +void outlog() +{ + int y, x; + char *basep = vga_base(); + + smram_state_t old_state = smram_save_state(); + + smram_aseg_set_state(SMRAM_ASEG_SMMCODE); + + for (y = 0; y < 4; y++) + for (x = 40; x < 80; x++) + { + basep[y*80*2+x*2] = ' '; + basep[y*80*2+x*2+1] = 0x1F; + } + + smram_restore_state(old_state); + + for (y = 0; y < 4; y++) + strblit(logents[y], y, 40); +} + +void dolog(char *s) +{ + memmove(logents[0], logents[1], sizeof(logents[0])*3); + strcpy(logents[3], s); +} diff --git a/aseg/vga-overlay.h b/aseg/vga-overlay.h new file mode 100644 index 0000000..f79e6da --- /dev/null +++ b/aseg/vga-overlay.h @@ -0,0 +1,9 @@ +#ifndef VGA_OVERLAY_H +#define VGA_OVERLAY_H + +void strblit(char *src, int row, int col); + +void dolog(char *s); +void outlog(); + +#endif -- 2.43.0