From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Fri, 19 Sep 2008 20:16:02 +0000 (-0400)
Subject: merge
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/5ae81164883c737f0204dc26beb7bb7488693a1d?ds=inline;hp=-c

merge
---

5ae81164883c737f0204dc26beb7bb7488693a1d
diff --combined aseg/Makefile
index e2edc87,6d22af1..5806bd1
--- 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__ -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 ../ich2/smi.o
 -OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o vga-overlay.o
++OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o vga-overlay.o
  
  all: aseg.elf
  
diff --combined aseg/counter.c
index 3484b95,2b1d6ea..d523168
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@@ -3,77 -3,13 +3,13 @@@
  #include <video_defines.h>
  #include <minilib.h>
  
- 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];
@@@ -83,7 -19,7 +19,7 @@@
  	cts = inl(0x84C);
  	
  	outl(0x848, 0x0);
 -	
 +	outl(0x840, 0x0);
  	switch(cts&0xF0000)
  	{
  	case 0x20000:
@@@ -116,9 -52,6 +52,9 @@@
  	default:
  		dolog("Unhandled PCI cycle");
  	}
 +	
 +	outl(0x848, 0x1000);
 +	outl(0x840, 0x0100);
  }
  
  void __start (void)
@@@ -149,13 -82,15 +85,13 @@@
  		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);