From: Joshua Wise Date: Fri, 19 Sep 2008 20:15:26 +0000 (-0400) Subject: Merge X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/c54a4356fd904634dae9b942fb3a587cdcb860b9?ds=sidebyside;hp=-c Merge --- c54a4356fd904634dae9b942fb3a587cdcb860b9 diff --combined aseg/Makefile index a43a1f2,1c2867d..e2edc87 --- a/aseg/Makefile +++ b/aseg/Makefile @@@ -1,6 -1,6 +1,6 @@@ CC=gcc - CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ - OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smi.o + 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 ../ich2/smi.o all: aseg.elf diff --combined aseg/counter.c index f77d256,ccfff72..3484b95 --- a/aseg/counter.c +++ b/aseg/counter.c @@@ -1,51 -1,72 +1,72 @@@ #include + #include + #include + #include unsigned int counter = 0; unsigned long pcisave; unsigned char vgasave; - unsigned char thestr[512]; - unsigned char logents[4][41] = {0}; + char thestr[512]; + char logents[4][41] = {{0}}; - unsigned char vgaread(unsigned char idx) + #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() { - outb(0x3D4, idx); - inb(0x3D5); + 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 r, int c) + void strblit(char *src, int row, int col) { - char *destp = (char*)(0xB8000UL | (((unsigned int)vgaread(0xC)) << 9) | (((unsigned int)vgaread(0xD)) << 1)) + r*80*2 + c*2; - unsigned char smramc; + char *destp = vga_base() + row * 80 * 2 + col * 2; + smram_state_t old_state = smram_save_state(); + + smram_aseg_set_state(SMRAM_ASEG_SMMCODE); - smramc = pci_read8(0, 0, 0, 0x70); - pci_write8(0, 0, 0, 0x70, (smramc & 0xF3) | 0x08); while (*src) { *(destp++) = *(src++); - *(destp++) = 0x1F; + *(destp++) = COLOR; } - pci_write8(0, 0, 0, 0x70, smramc); + + smram_restore_state(old_state); } void outlog() { int y, x; - unsigned char smramc; - unsigned char *basep = (char*)(0xB8000UL | (((unsigned int)vgaread(0xC)) << 9) | (((unsigned int)vgaread(0xD)) << 1)); - - smramc = pci_read8(0, 0, 0, 0x70); - pci_write8(0, 0, 0, 0x70, (smramc & 0xF3) | 0x08); + 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; } - pci_write8(0, 0, 0, 0x70, smramc); - + + smram_restore_state(old_state); + for (y = 0; y < 4; y++) strblit(logents[y], y, 40); - } void dolog(char *s) @@@ -55,14 -76,14 +76,14 @@@ } void pci_dump() { - unsigned char s[40]; + char s[40]; unsigned long cts; static int curdev = 0; /* 0 if kbd, 1 if mouse */ cts = inl(0x84C); outl(0x848, 0x0); - + outl(0x840, 0x0); switch(cts&0xF0000) { case 0x20000: @@@ -95,14 -116,10 +116,13 @@@ default: dolog("Unhandled PCI cycle"); } + + outl(0x848, 0x1000); + outl(0x840, 0x0100); } void __start (void) { - unsigned char smramc; static int first = 1; pcisave = inl(0xCF8); @@@ -129,20 -146,22 +149,20 @@@ if (inl(0x844) & 0x1000) /* devact_sts */ { pci_dump(); - outl(0x848, 0x1000); - outl(0x844, 0x1000); + outl(0x844, 0x1000); /* ack it */ } } if (inl(0x834) & 0x4000) dolog("Long periodic timer"); if (inl(0x840) & 0x1000) { - dolog("Caught device monitor trap"); pci_dump(); outl(0x840, 0x1100); outl(0x840, 0x0100); } if (inl(0x834) & ~(0x4160)) { - unsigned char s[40]; + char s[40]; strcpy(s, "Unknown: xxxxxxxx"); tohex(s + 9, inl(0x834) & ~(0x140)); dolog(s); diff --combined aseg/firstrun.c index 9977d14,355fb9a..ca892ea --- a/aseg/firstrun.c +++ b/aseg/firstrun.c @@@ -1,5 -1,5 +1,6 @@@ #include +#include + #include void __firstrun_start() { /* @@@ -23,7 -23,6 +24,7 @@@ pci_write16(0, 31, 4, 0xC0, 0); /* Turn on the SMIs we want */ - outb(0x830, inb(0x830) | 0x41); + outb(0x830, inb(0x830) | 0x40); + smi_enable(); }