From: Joshua Wise Date: Thu, 25 Sep 2008 23:05:08 +0000 (-0400) Subject: Remove some remaining tohex. X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/34205a17f715de78b7b88f8c44d0cd00885b91b6?ds=inline;hp=-c Remove some remaining tohex. --- 34205a17f715de78b7b88f8c44d0cd00885b91b6 diff --git a/aseg/counter.c b/aseg/counter.c index 895974d..1138e53 100644 --- a/aseg/counter.c +++ b/aseg/counter.c @@ -3,9 +3,6 @@ #include #include #include - -char thestr[512]; - #include "vga-overlay.h" unsigned int counter = 0; @@ -13,7 +10,6 @@ unsigned long pcisave; unsigned char vgasave; void pci_dump() { - char s[40]; unsigned long cts; static int curdev = 0; /* 0 if kbd, 1 if mouse */ @@ -39,11 +35,8 @@ void pci_dump() { { unsigned char b; - strcpy(s, "WRITxxxxxxxxxxxxxxxx"); b = *(unsigned char*)0xAFFD0 /* EAX */; - tohex(s+4, cts); - tohex(s+12, b); - dolog(s); + dologf("WRITE: %08x (%02x)", cts, b); outb(cts & 0xFFFF, b); break; } @@ -57,14 +50,16 @@ void pci_dump() { void smi_entry(void) { + char statstr[512]; + pcisave = inl(0xCF8); vgasave = inb(0x3D4); counter++; outb(0x80, (counter & 0xFF)); - sprintf(thestr, "15-412! %08x %08x", smi_status(), counter); - strblit(thestr, 0, 0); + sprintf(statstr, "15-412! %08x %08x", smi_status(), counter); + strblit(statstr, 0, 0); if (inl(0x834) & 0x1000) {